From e820051d0ebbefb7023642505870962697bf72ed Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Thu, 2 Sep 2021 09:19:10 +0000
Subject: [PATCH] Add 6 AM-10 PM and 6AM - 12 AM shifts. #620

---
 src/Controller/AnalyticsController.php    |  29 ++++++++++++++++++++++
 src/Ramcar/ShiftSchedule.php              |   4 +++
 utils/mqtt_rider/rider_location_cache.pyc | Bin 1929 -> 1929 bytes
 3 files changed, 33 insertions(+)

diff --git a/src/Controller/AnalyticsController.php b/src/Controller/AnalyticsController.php
index f052cfb2..6a71b530 100644
--- a/src/Controller/AnalyticsController.php
+++ b/src/Controller/AnalyticsController.php
@@ -808,6 +808,35 @@ class AnalyticsController extends Controller
             ];
         }
 
+        if ($shift == '6AM_10PM') {
+            $hour_shift = [
+                ['06:00 - 15:00', 6, 7, 8, 9, 10, 11, 12, 13, 14],
+                ['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]                
+            ];
+        }
+
+        if ($shift == '6AM-12AM') {
+            $hour_shift = [
+                ['06:00 - 15:00', 6, 7, 8, 9, 10, 11, 12, 13, 14],
+                ['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],
+                ['14:00 - 23:00', 14, 15, 16, 17, 18, 19, 20, 21, 22],
+                ['15:00 - 00:00', 15, 16, 17, 18, 19, 20, 21, 22, 23],
+                ['16:00 - 01:00', 16, 17, 18, 19, 20, 21, 22, 23, 0]
+            ];
+        }
+
         return $hour_shift;
     }
 } 
diff --git a/src/Ramcar/ShiftSchedule.php b/src/Ramcar/ShiftSchedule.php
index 6473bcf6..adf5d997 100644
--- a/src/Ramcar/ShiftSchedule.php
+++ b/src/Ramcar/ShiftSchedule.php
@@ -8,11 +8,15 @@ class ShiftSchedule extends NameValue
     const SCHED_8_5  = '8AM_5PM';
     const SCHED_7_10 = '7AM_10PM';
     const SCHED_6_7  = '6AM_7PM';
+    const SCHED_6_10 = '6AM_10PM';
+    const SCHED_6_12 = '6AM-12AM';
 
     const COLLECTION = [
         '24_7' => '24/7 Schedule',
         '8AM_5PM' => '8AM-5PM Schedule',
         '7AM_10PM' => '7AM-10PM Schedule',
         '6AM_7PM' => '6AM-7PM Schedule',
+        '6AM_10PM' => '6AM-10PM Schedule',
+        '6AM-12AM' => '6AM-12AM Schedule',
     ];
 }
diff --git a/utils/mqtt_rider/rider_location_cache.pyc b/utils/mqtt_rider/rider_location_cache.pyc
index a5798640299d44a6305d0987feb0c64b2a312daa..dd394440f12413cf33bd3bdbcf8b5690c2881f2b 100644
GIT binary patch
delta 17
YcmeC=@8suT{>;nu;oOgejU0{a05^jMod5s;

delta 17
YcmeC=@8suT{>;mDW@%g8Mvg{y05XmR+yDRo