feat(bus): mark a bus as delayed in afternoon menu

closes tjcsl#1414 feat(bus): option to mark bus as delayed closes tjcsl#1414 feat(bus): mark a bus as delayed in afternoon menu closes tjcsl#1414
IshanA2007 · May 14, 2023 · 1a323e3 · 1a323e3
1 parent 443647a
commit 1a323e3
Showing 1 changed file with 30 additions and 0 deletions.
diff --git a/intranet/static/js/bus-afternoon.js b/intranet/static/js/bus-afternoon.js
@@ -99,6 +99,10 @@ $(function () {
                     .map(bus => bus.attributes);
             } else if (action === 'Mark a bus as arrived or on time') {
 <<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 443647ab (feat(bus): option to mark bus as delayed)
                 busList = routeList.map(bus => {
                     if ((bus.attributes.status === 'a' || bus.attributes.status === 'd') && !bus.attributes.route_name.includes('JT')) {
                         let attr = JSON.parse(JSON.stringify(bus.attributes));
@@ -124,6 +128,11 @@ $(function () {
                     }
                 }).flat().filter((element) => element != null);
 =======
+<<<<<<< HEAD
+=======
+>>>>>>> dcacb3b1 (feat(bus): mark a bus as delayed in afternoon menu)
+=======
+>>>>>>> 443647ab (feat(bus): option to mark bus as delayed)
                 busList = routeList.filter(bus => bus.attributes.route_name.includes(''))
                     .map(bus => {
                         if (bus.attributes.status === 'a' || bus.attributes.status === 'd') {
@@ -144,6 +153,12 @@ $(function () {
                             return bus.attributes;
                         }
                     }).flat();
+<<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> dcacb3b1 (feat(bus): mark a bus as delayed in afternoon menu)
+=======
+=======
+>>>>>>> 443647ab (feat(bus): option to mark bus as delayed)
 >>>>>>> dcacb3b1 (feat(bus): mark a bus as delayed in afternoon menu)
             } else if (action === 'Assign a bus to this space') {
                 busList = routeList.filter(bus => bus.attributes.status !== 'a')
@@ -205,18 +220,33 @@ $(function () {
                 if (e.target.value.includes('on time')) {
                     route_name = e.target.value.split(' ')[1];
                     alert(route_name);
+<<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> dcacb3b1 (feat(bus): mark a bus as delayed in afternoon menu)
+=======
+=======
+>>>>>>> 443647ab (feat(bus): option to mark bus as delayed)
 >>>>>>> dcacb3b1 (feat(bus): mark a bus as delayed in afternoon menu)
                     st = 'o';
                 }
                 else if (e.target.value.includes('delayed')) {
                     route_name = e.target.value.split(' ')[1];
 <<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 443647ab (feat(bus): option to mark bus as delayed)
 
                     st = 'd';
                 }
                 else {
                     route_name = e.target.value.split(' ')[1];
 =======
+<<<<<<< HEAD
+=======
+>>>>>>> dcacb3b1 (feat(bus): mark a bus as delayed in afternoon menu)
+=======
+>>>>>>> 443647ab (feat(bus): option to mark bus as delayed)
                     alert(route_name);
                     st = 'd';
                 }