diff --git a/html/includes/table/alert-schedule.inc.php b/html/includes/table/alert-schedule.inc.php index c8b1db6be5..6190579974 100644 --- a/html/includes/table/alert-schedule.inc.php +++ b/html/includes/table/alert-schedule.inc.php @@ -31,7 +31,13 @@ if (empty($total)) { $total = 0; } -if (!isset($sort) || empty($sort)) { +if (isset($sort) && !empty($sort)) { + list($sort_column, $sort_order) = explode(' ', trim($sort)); + if ($sort_column == 'status') { + $sort_by_status = true; + $sort = "`S`.`start` $sort_order"; + } +} else { $sort = '`S`.`start` DESC '; } @@ -108,6 +114,18 @@ foreach (dbFetchRows($sql, $param) as $schedule) { ); } +if (isset($sort_by_status) && $sort_by_status) { + if ($sort_order == 'asc') { + usort($response, function ($a, $b) { + return $a['status'] - $b['status']; + }); + } else { + usort($response, function ($a, $b) { + return $b['status'] - $a['status']; + }); + } +} + $output = array( 'current' => $current, 'rowCount' => $rowCount, diff --git a/html/pages/alert-schedule.inc.php b/html/pages/alert-schedule.inc.php index 73163a723c..ec81572122 100644 --- a/html/pages/alert-schedule.inc.php +++ b/html/pages/alert-schedule.inc.php @@ -43,7 +43,7 @@ if (LegacyAuth::user()->hasGlobalAdmin()) { End recurring hr Recurring on days Actions - Status + Status