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

125
app/Models/AlertSchedule.php
View File

@@ -28,15 +28,20 @@ namespace App\Models;
use Carbon\Carbon;
use Carbon\CarbonImmutable;
use Date;
use DB;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
class AlertSchedule extends Model
{
const SCHEDULE_SET = 0;
const SCHEDULE_ACTIVE = 2;
const SCHEDULE_LAPSED = 1;
public $timestamps = false;
protected $table = 'alert_schedule';
protected $primaryKey = 'schedule_id';
protected $appends = ['start_recurring_dt', 'end_recurring_dt', 'start_recurring_hr', 'end_recurring_hr'];
protected $appends = ['start_recurring_dt', 'end_recurring_dt', 'start_recurring_hr', 'end_recurring_hr', 'status'];
private $timezone;
private $days = [
@@ -57,11 +62,13 @@ class AlertSchedule extends Model
// ---- Accessors/Mutators ----
public function getRecurringDayAttribute() {
public function getRecurringDayAttribute()
{
return explode(',', str_replace(array_values($this->days), array_keys($this->days), $this->attributes['recurring_day']));
}
public function setRecurringDayAttribute($days) {
public function setRecurringDayAttribute($days)
{
$days = is_array($days) ? $days : explode(',', $days);
$new_days = [];
@@ -74,19 +81,23 @@ class AlertSchedule extends Model
$this->attributes['recurring_day'] = implode(',', $new_days);
}
public function getStartAttribute() {
public function getStartAttribute()
{
return Date::parse($this->attributes['start'], 'UTC')->tz($this->timezone);
}
public function setStartAttribute($start) {
$this->attributes['start'] = $this->fromDateTime(Date::parse($start)->tz('UTC'));
public function setStartAttribute($start)
{
$this->attributes['start'] = $this->fromDateTime(Date::parse($start)->tz('UTC'));
}
public function getEndAttribute() {
public function getEndAttribute()
{
return Date::parse($this->attributes['end'], 'UTC')->tz($this->timezone);
}
public function setEndAttribute($end) {
public function setEndAttribute($end)
{
$this->attributes['end'] = $this->fromDateTime(Date::parse($end)->tz('UTC'));
}
@@ -95,62 +106,106 @@ class AlertSchedule extends Model
return $this->start->toDateString();
}
public function getStartRecurringHrAttribute() {
public function getStartRecurringHrAttribute()
{
return $this->start->toTimeString('minute');
}
public function getEndRecurringDtAttribute() {
public function getEndRecurringDtAttribute()
{
$end = $this->end;
return $end->year == '9000' ? null : $end->toDateString();
}
public function getEndRecurringHrAttribute() {
public function getEndRecurringHrAttribute()
{
return $this->end->toTimeString('minute');
}
public function setStartRecurringDtAttribute($date) {
public function setStartRecurringDtAttribute($date)
{
$this->start = $this->start->setDateFrom(Date::parse($date, $this->timezone));
}
public function setStartRecurringHrAttribute($time) {
public function setStartRecurringHrAttribute($time)
{
$this->start = $this->start->setTimeFrom(Date::parse($time, $this->timezone));
}
public function setEndRecurringDtAttribute($date) {
public function setEndRecurringDtAttribute($date)
{
$this->end = $this->end->setDateFrom(Date::parse($date ?: '9000-09-09', $this->timezone));
}
public function setEndRecurringHrAttribute($time) {
public function setEndRecurringHrAttribute($time)
{
$this->end = $this->end->setTimeFrom(Date::parse($time, $this->timezone));
}
/**
* @return int Status 0: SCHEDULE_SET, 1: SCHEDULE_LAPSED, 2: SCHEDULE_ACTIVE
*/
public function getStatusAttribute()
{
$now = Carbon::now();
if ($now > $this->end) {
return self::SCHEDULE_LAPSED;
}
if (!$this->recurring) {
return $now > $this->start ? self::SCHEDULE_ACTIVE : self::SCHEDULE_SET;
}
// recurring
$now_time = $now->secondsSinceMidnight();
$start_time = $this->start->secondsSinceMidnight();
$end_time = $this->end->secondsSinceMidnight();
$after_start = $now > $this->start;
$spans_days = $start_time > $end_time;
// check inside start and end times or outside start and end times (if we span a day)
$active = $spans_days ? ($after_start && ($now_time < $end_time || $now_time >= $start_time)) : ($now_time >= $start_time && $now_time < $end_time);
return $active && str_contains($this->attributes['recurring_day'], $now->format('N')) ? self::SCHEDULE_ACTIVE : self::SCHEDULE_SET;
}
// ---- Query scopes ----
public function scopeIsActive($query)
{
return $query->where(function ($query) {
$now = CarbonImmutable::now('UTC');
$query->where(function ($query) use ($now) {
// Non recurring simply between start and end
$query->where('recurring', 0)
->where('start', '<=', $now)
->where('end', '>=', $now);
})->orWhere(function ($query) use ($now) {
$query->where('recurring', 1)
// Check the time is after the start date and before the end date, or end date is not set
->where('start', '<=', $now)
->where('end', '>=', $now)
->whereTime('start', '<=', $now->toTimeString())
->whereTime('end', '>=', $now->toTimeString())
// Check we are on the correct day of the week
->where(function ($query) use ($now) {
/** @var Builder $query */
$query->where('recurring_day', 'like', $now->format('%N%'))
->orWhereNull('recurring_day')
->orWhere('recurring_day', '');
$query->where('start', '<=', $now)
->where('end', '>=', $now)
->where(function ($query) use ($now) {
$query->where('recurring', 0) // Non recurring simply between start and end
->orWhere(function ($query) use ($now) {
$query->where('recurring', 1)
// Check the time is after the start date and before the end date, or end date is not set
->where(function ($query) use ($now) {
$query->where(function ($query) use ($now) {
// normal, inside one day
$query->whereTime('start', '<', DB::raw("time(`end`)"))
->whereTime('start', '<=', $now->toTimeString())
->whereTime('end', '>', $now->toTimeString());
})->orWhere(function ($query) use ($now) {
// outside, spans days
$query->whereTime('start', '>', DB::raw("time(`end`)"))
->where(function ($query) use ($now) {
$query->whereTime('end', '<=', $now->toTimeString())
->orWhereTime('start', '>', $now->toTimeString());
});
});
})
// Check we are on the correct day of the week
->where(function ($query) use ($now) {
$query->where('recurring_day', 'like', $now->format('%N%'))
->orWhereNull('recurring_day')
->orWhere('recurring_day', '');
});
});
});
});
});
}

2
includes/html/forms/schedule-maintenance.inc.php
View File

@@ -34,7 +34,7 @@ if ($sub_type == 'new-maintenance') {
$title = mres($_POST['title']);
$notes = mres($_POST['notes']);
$recurring = mres($_POST['recurring']);
$recurring = $_POST['recurring'] ? 1 : 0;
$start_recurring_dt = mres($_POST['start_recurring_dt']);
$end_recurring_dt = mres($_POST['end_recurring_dt']);
$start_recurring_hr = mres($_POST['start_recurring_hr']);

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;
});