mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix SQL to handle outside times

Browse Source
This commit is contained in:
Tony Murray
2020-04-11 10:02:07 -05:00
parent 6b166cd13a
commit cf23336329
3 changed files with 108 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
includes/html/table/alert-schedule.inc.php
View File

@@ -23,15 +23,14 @@ if (!Auth::user()->hasGlobalRead()) {
];
}
$query = \App\Models\AlertSchedule::query();
if (isset($searchPhrase) && !empty($searchPhrase)) {
$query->where(function ($query) use ($searchPhrase) {
$query->where('title', 'like', "%$searchPhrase%")
->orWhere('start', 'like', "%$searchPhrase%")
->orWhere('end', 'like', "%$searchPhrase%");
$query = \App\Models\AlertSchedule::query()
->when($searchPhrase, function ($query, $searchPhrase) {
$query->where(function ($query) use ($searchPhrase) {
$query->where('title', 'like', "%$searchPhrase%")
->orWhere('start', 'like', "%$searchPhrase%")
->orWhere('end', 'like', "%$searchPhrase%");
});
});
}
$total = $query->count();
@@ -64,15 +63,16 @@ $now = Carbon::now();
$schedules = $query->get()->map(function ($schedule) use ($now) {
/** @var \App\Models\AlertSchedule $schedule */
$status = $schedule->start < $now ? 1 : 0; // set or lapsed
// check if current
if ($now->between($schedule->start, $schedule->end) && (!$schedule->recurring || $now->between($schedule->start_recurring_hr, $schedule->end_recurring_hr))) {
$status = 2;
}
$data = $schedule->toArray();
$data['recurring_day'] = implode(',', $data['recurring_day']);
$data['status'] = $status;
$data = $schedule->only(['title', 'notes']);
$data['start'] = $schedule->recurring ? '' : $schedule->start->toDateTimeString('minutes');
$data['end'] = $schedule->recurring ? '' : $schedule->end->toDateTimeString('minutes');
$data['start_recurring_dt'] = $schedule->recurring ? $schedule->start_recurring_dt : '';
$data['start_recurring_hr'] = $schedule->recurring ? $schedule->start_recurring_hr : '';
$data['end_recurring_dt'] = $schedule->recurring ? $schedule->end_recurring_dt : '';
$data['end_recurring_hr'] = $schedule->recurring ? $schedule->end_recurring_hr : '';
$data['recurring'] = $schedule->recurring ? __('Yes') : __('No');
$data['recurring_day'] = $schedule->recurring ? implode(',', $data['recurring_day']) : '';
$data['status'] = $schedule->status;
return $data;
});