rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Merge branch '533-add-7-am-10-pm-option-to-shift-schedule' into 'master'

Browse source 
Resolve "Add 7 AM - 10 PM option to shift schedule"

Closes #533

See merge request jankstudio/resq!618
This commit is contained in:
Kendrick Chan 2021-01-26 01:59:42 +00:00
commit bba9060548
3 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Controller/AnalyticsController.php
View file

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

2
src/Ramcar/ShiftSchedule.php
View file

@ -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',
];
}

9
utils/schedule_solver/solver.py
View file

@ -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 = [