diff --git a/src/Controller/AnalyticsController.php b/src/Controller/AnalyticsController.php index ccd654ae..d18b10bb 100644 --- a/src/Controller/AnalyticsController.php +++ b/src/Controller/AnalyticsController.php @@ -715,6 +715,18 @@ class AnalyticsController extends Controller ]; } + if ($shift == '7AM_10PM') { + $hour_shift = [ + ['07:00 - 16:00', 7, 8, 9, 10, 11, 12, 13, 14, 15], + ['08:00 - 17:00', 8, 9, 10, 11, 12, 13, 14, 15, 16], + ['09:00 - 18:00', 9, 10, 11, 12, 13, 14, 15, 16, 17], + ['10:00 - 19:00', 10, 11, 12, 13, 14, 15, 16, 17, 18], + ['11:00 - 20:00', 11, 12, 13, 14, 15, 16, 17, 18, 19], + ['12:00 - 21:00', 12, 13, 14, 15, 16, 17, 18, 19, 20], + ['13:00 - 22:00', 13, 14, 15, 16, 17, 18, 19, 20, 21] + ]; + } + return $hour_shift; } } diff --git a/src/Ramcar/ShiftSchedule.php b/src/Ramcar/ShiftSchedule.php index a59f3134..e8fcc701 100644 --- a/src/Ramcar/ShiftSchedule.php +++ b/src/Ramcar/ShiftSchedule.php @@ -6,9 +6,11 @@ class ShiftSchedule extends NameValue { const SCHED_24_7 = '24_7'; const SCHED_8_5 = '8AM_5PM'; + const SCHED_7_10 = '7AM_10PM'; const COLLECTION = [ '24_7' => '24/7 Schedule', '8AM_5PM' => '8AM-5PM Schedule', + '7AM_10PM' => '7AM-10PM Schedule', ]; } diff --git a/utils/schedule_solver/solver.py b/utils/schedule_solver/solver.py index f7d5c03b..abbdf49d 100644 --- a/utils/schedule_solver/solver.py +++ b/utils/schedule_solver/solver.py @@ -80,6 +80,15 @@ def main(): hour_shifts = [ ['07 - 16', 7, 8, 9, 10, 11, 12, 13, 14, 15], ['08 - 17', 8, 9, 10, 11, 12, 13, 14, 15, 16]] + if shift == "7AM_10PM": + hour_shifts = [ + ['07 - 16', 7, 8, 9, 10, 11, 12, 13, 14, 15], + ['08 - 17', 8, 9, 10, 11, 12, 13, 14, 15, 16], + ['09 - 18', 9, 10, 11, 12, 13, 14, 15, 16, 17], + ['10 - 19', 10, 11, 12, 13, 14, 15, 16, 17, 18], + ['11 - 20', 11, 12, 13, 14, 15, 16, 17, 18, 19], + ['12 - 21', 12, 13, 14, 15, 16, 17, 18, 19, 20], + ['13 - 22', 13, 14, 15, 16, 17, 18, 19, 20, 21]] # all possible days riders come in day_shifts = [