Skip to content

Commit

Permalink
fix notification date
Browse files Browse the repository at this point in the history
  • Loading branch information
dbarzin committed Jul 31, 2023
1 parent d3134ee commit 5ad2393
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion app/Console/Commands/SendNotifications.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public function handle()
// Date
$txt .= '<a href="' . url('/control/show/'. $control->id) . '">';
$txt .= '<b>';
if (strtotime($control->plan_date) >= strtotime('now')) {
if (strtotime($control->plan_date) > strtotime('now')) {
$txt .= "<font color='green'>" . $control->plan_date .' </font>';
} else {
$txt .= "<font color='red'>" . $control->plan_date . '</font>';
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/MeasureController.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public function index(Request $request)
->whereNull('controls.realisation_date');
}, null, null, 'left outer');

if (($domain !== null)) {
if ($domain !== null) {
$measures->where('measures.domain_id', $domain);
$request->session()->put('domain', $domain);
}
Expand Down
4 changes: 2 additions & 2 deletions app/Http/Controllers/UserController.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ public function store(Request $request)
->withErrors(['password1' => 'No password'])
->withInput();
}
elseif (strlen(request('password1'))<8) {
if (strlen(request('password1'))<8) {
return redirect('/users/create')
->withErrors(['password1' => 'Password too short'])
->withInput();
}
elseif (request('password1') !== request('password2')) {
if (request('password1') !== request('password2')) {
return redirect('/users/create')
->withErrors(['password1' => 'Passwords does not match'])
->withInput();
Expand Down

0 comments on commit 5ad2393

Please sign in to comment.