From 4fef4da48bdb9731377109acaad2aa5c6ea15ee3 Mon Sep 17 00:00:00 2001
From: Wei Wu <128621069+weiw-w@users.noreply.github.com>
Date: Tue, 5 Dec 2023 02:43:18 -0600
Subject: [PATCH] fixed schedule

---
 ConnectionDB.py                          |  35 ++++++++++++++++-------
 __pycache__/ConnectionDB.cpython-311.pyc | Bin 6028 -> 6610 bytes
 app.py                                   |  17 +++++------
 templates/index.html                     |  33 ++++++++++-----------
 4 files changed, 47 insertions(+), 38 deletions(-)

diff --git a/ConnectionDB.py b/ConnectionDB.py
index 9245fff..5905e95 100644
--- a/ConnectionDB.py
+++ b/ConnectionDB.py
@@ -1,6 +1,7 @@
 import mysql.connector
 import math
 from datetime import datetime
+from datetime import timedelta
 import numpy as np
 from sqlalchemy import text
 
@@ -103,8 +104,6 @@ def get_schedule(trip_id):
   result = mycursor.callproc('stopNum',[trip_id, 0])
   stop_num = result[1]
 
-  f_count = -1
-
   s_count = 0
 
   # To get the list of stop names in order
@@ -125,25 +124,41 @@ def get_schedule(trip_id):
 
   schedule = np.zeros([freq_num,stop_num])
   schedule = schedule.astype('str') 
+  day = timedelta(hours=24)
 
   for result in mycursor.stored_results():
     details = result.fetchall()
 
   for det in details:
-    if (det[1] == 1):
-      f_count += 1
-    schedule[f_count,det[1]-1] = str(det[0])
+    t =  timedelta(seconds=0)
+    if det[0] > day:
+      t = det[0] - day
+      schedule[det[3]][det[1]-1] = str(t)
+    else:
+      schedule[det[3]][det[1]-1] = str(det[0])
+
+  schedule_list = {}
+  stop_list = {}
 
-  schedule_list = []
-  for freq in schedule:
-    schedule_list.append(dict(zip(stops,freq)))
+  for i in range(len(schedule)):
+    l = schedule[i].tolist()
+    schedule_list[str(i)] = l
+
+  for i in range(len(stops)):
+    stop_list[str(i)] = stops[i]
 
   mycursor.close()
   db.close()
 
-  return schedule_list
+  result = [stop_list,schedule_list]
 
+  return result
 
 # get_close_by_routes(-23.439609, -46.807039)
-# get_schedule('1012-10-0')
+# get_schedule('5141-10-1')
+# day = timedelta(hours=24)
+# t = timedelta(days=1, seconds=360)
+# new_t = t - day
+# print(new_t)
+
 # print(get_schedule('1012-10-1')[0])
diff --git a/__pycache__/ConnectionDB.cpython-311.pyc b/__pycache__/ConnectionDB.cpython-311.pyc
index 753a875ee9151975751c54b641e472c2887a09a4..ca8b26215420f28460afb5498b29247c84effb5b 100644
GIT binary patch
delta 1958
zcma)7U1-}@6qYPox{@sUCw84Cc9S$EskfxT%jkZRu0QJrWm{n@gD$kVs->i+{z<Ro
zFc*0iqYo{3U{5LJVGjv}u4R2Gec0<>_OPef#jqeKltCZL9v0Z!9@d>JC2O2DY{L3{
z?!BMBbI!d-M~$gR)AF~HBv5dj__d^Eqb<3gzSJ5&bdo7BMgN?irc_F$3xPQn{{026
zh~^N?1#VDtyvhO!DhDX42r#JffRaj|qtZgliVM7vFKVh*Fq8*h5BmcNaKk_R-d|zp
zgguF-Ss5m9$eu?ZCia2ph)YT#uV%4QTF~(8FmurU33cfHhnIp^>0>FvK0siIz%YRk
z07uLf%DQ%{dd?^>-b45>Sx6Ijg}|!>ChT{`@wn%Yj57pYBQR~(#r{#(eRM%HvaVM4
zay6@invRbFheV>U*%R_<`!7-13g^O};YeHId{V9$nvUNfUS@~{3oz_n*!9=f;}3iE
z6F@p+kIQ%2ez0=1y~@XY=L7a{@*e@N#+p9+_h5n+?B}5whBG<)WF!$6@6Z(W9o*hk
z<4oTwvPYzGyBR(_g&GMHou)2EYrM&;-2QDEWpXAv3nP<N(RGQUYHXu#OFw8o4<Ba)
zQy}^yyY&Sl{*MTyO7~^^vq-MK?dOXc-?Pr$5ABLCxGN6vs-NiL>D}|!p)_kjgA~rz
zWd?h-OaYz=lbq@vV@G<tie8K$MGzzDHa_kV?AemN#Q%qO+7qwmshR}0Y`pMI8H1hx
zLD<uJG#P^fIZ_Kj_@Ng(do6nCR4r_VO{piuUHj)IF}0^YNAzbwe*pBko%*KypR$8c
zIw2^XgDg#%v}e}Aluc>DS7S^D-tEX)yl3(A^H{r9(Mq{0_Cc~Z3E*(#T{>GSI><GY
zqUJEVfnk`tqN$aF_Kehensx$L$`!1G!RcDATvGLC3@p^s;g`SEMB7(dbOP5kT-F^{
z(T(b&hTnvF{1yRHR`@+a3%E_iVG3HwVU2Pj5B}eVg>=N>44hxg=GC1|fjojpD%nz{
zSoh*4CIptvl`AE~33&a1oQ1=vnt|W<ET!tuh9hlfmL;AXo{&A0&O3BLj{w<g1v}8|
z3PI8pwjakAfyiC}(0{OJV>j#{V?T!<qsWS{jRretu!{z*QQMLy>r!l!VwouytlVQh
zx{_)0sScm&@+s@&1}EIi+*oQdUz(P=AxJls##nRu)`X=z9vxe~wsv&=sCDJ0-pn+X
zy6nEDzLHs9T2We`ci7=JJNy(l`rXX>(%Q`W%*%Oom-r+avnDs>u$6u)hHv*Z&$m*`
zsg5|*6^Aw{A9KJ3OW8o-W~3qhf(9O;feuP`Q4&H-rmT-{k2aOo*z#D%zrXF@?}>cc
z8dx6ah{>*)+@xq`#03!PPpv55AnVLmx#q~N;Cy4g<Bzxf@h3jPJ{}yb2jk6RTRdcq
zJ>f&vBz7xIc0$Ffeywl>imRmMj578Li-Qfuq}1GsaRPACi&gvqOgIA2l>*dhv5EtP
zL7I{KadN*6_yie}Q@TgFKHNk66U|18Wm4Ji;LET^TC@JZe!4FcKG3Fmes(NzA$gn*
KZ&LpTSMYD9y~vON

delta 1320
zcmZWp&2Jk;6yNo(cgJ4urcO5gP=eK<px{HkYS99%2!WCo1d+fHssOT<osBWIz3%K9
z$<bOiQV$WbP@>_`N)%kFYSZRI)hmAk*iofMD^)^VP;WupH~??faZ6#O`RTnkZ+`P;
z-g~p3>&$DnR5i-MFeZ!EZ^w4D6#xFt%=9_FEUt$!hlR3Kk=JFO!{TLb9pNxw1WSNX
zECVVS0md+&=dzJUjA%8>`v@DZ<(4Ye-M!;tI0064uP4?8K0#MdPEx@@G}=OMC&xkb
zl`o8P2^WY_Em|Z8mMQux>hsBajo3wAoCE_kbY1rqvur!oYmK~X*KQ*+!xs9wP7BKP
z+<+4-WP!mVgA)M0j4jtFl^sU{?RYTAIK8W+!e_vcqdzHk{(I6{Up+eMJ-hB&4mru#
zUIuuI1ayC_Xt{;Jx$tSDKnCthuyUThs_jlDK{9!O;fR1B!2ClJ>Ccfj={qBLlxS1J
za#Qv~U6Edo>LIL9{n%*%d5HcVO^o8$O<>r2%+f^kyLf&v(n)%ev)m`6&8P>tNDoio
zJmksjYMzYICOk`1?u<R*R;eCe5)@Bi+#wvJU&qa*A=k-(3q9e&=wgTwldvZpu}Ln=
z+0huBOfzGN1yAuLP@meo38l3WV!?Dy6}e{2Qy}0IP1TEa6?Rqn*JwI|JoP3VvKL}B
z^v5v`@mwbd5o_S`ti*F3KM*w#V^C+>DjC+q>waW|SeNQn)oc(JDVYH9Wd|x`wO)Dj
zHw+&Ino+TQ!Ep(w=4TeJm#yr`;}Uw;4^?Y^c+(=b<4cC)Hfk0*#rR%i@CGB5j9SgA
zVqe51)AfbTQjNR>_N?a1E-BRtCH(Kwqs!yz)<(g!>s1%xITFGw6o;H<d;%0ESz(eo
zjHpm9Ij%3VD>)jh49azgBxsfxtGM9?vIbrs!E~O7+qb!ga_n;Jft=ZwGu@RR=ml+t
zs)@G*tvy3ONc8DdZMLQAhnyhH2GBMSkg~Phk+!G4Qnr)>N!^ZrS#B2}PEB|7yYU-q
z*C%dFw9jvSxShWe|7PvV^3H{x`b=NU^u)|Bqk4PxKua8Qys!{J8y|@A2V!bpOkLBj
znce4h#jEzWc0WCLKRwqM=kJU2J(10M`gtnTiX?iW1YsSLRsE4l!?{$RGwo{CGF_Vl
znIWuY32PTWT&-7X4RVgjQSda%ki<%Zh|Gh1Fu}h;Sg8@#e!;`s<^uZQ-Tp*pDmKgd
eD}=ol&%sXTdzwx!(vQ>YlP~beL+<|&?EeR}>{4(5

diff --git a/app.py b/app.py
index fdb7a5f..865f678 100644
--- a/app.py
+++ b/app.py
@@ -787,20 +787,17 @@ def get_route_and_trip_info():
 
 @app.route('/post_schedule', methods = ['POST'])
 def post_schedule():
-    data = request.get_json()
-    trip_id = data.get('trip_id')
-
-    # Serialize the dictionary to JSON without sorting keys
-    json_str = json.dumps(get_schedule(trip_id), sort_keys=False)
-    # print(json_str)
-    
-    # Use jsonify with the serialized JSON string
-    response = jsonify(json.loads(json_str)) 
-    
+    json_data = request.get_json()
+    trip_id = json_data.get('trip_id')
+    print(trip_id)
+    schedule_data = get_schedule(trip_id)
+    print(schedule_data[0])
+    response = jsonify([{'stops': schedule_data[0], 'schedule': schedule_data[1]}])
     return response
 
 
 
+
 if __name__ == '__main__':
     with app.app_context():
         create_triggers()
diff --git a/templates/index.html b/templates/index.html
index 202fa61..05c8953 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -508,10 +508,8 @@ <h2>Delete Comment</h2>
                     else {
                         // closeByStops: 'stop_name', 'stop_lat', 'stop_lon'
                         closeByStops = data[0].stopInfo;
-                        console.log(closeByStops)
                         // closeByRoutes: 'id'
                         closeByRoutes = data[0].routeInfo;
-                        console.log(closeByRoutes);
                         clearMap();
                         setNewCenter(searchAddress.latitude, searchAddress.longitude);
                         map.setZoom(16);
@@ -1128,7 +1126,7 @@ <h2>Delete Comment</h2>
 
 
             //Create a the schedule table with given data
-            function generateSchedule(schedule){
+            function generateSchedule(name, schedule){
                 // Check if there is an existing table and remove it
                 const tableBody = document.getElementById('schedule-body');
 
@@ -1138,25 +1136,23 @@ <h2>Delete Comment</h2>
 
                 // Get the header row with all the stops
                 const headerRow = document.createElement('tr');
-                Object.keys(schedule[0]).forEach(stop => {
+                for (n in name){
                     const th = document.createElement('th');
-                    th.textContent = stop;
+                    th.textContent = name[n];
                     headerRow.appendChild(th);
-                });
                 tableBody.appendChild(headerRow);
+                }
 
                 // Loop through the JSON data and create table rows
-                schedule.forEach(item => {
+                for (freq in schedule){
                     const row = document.createElement('tr');
-
-                    // Create table cells for each property
-                    Object.keys(item).forEach(key => {
-                        const cell = document.createElement('td');
-                        cell.textContent = item[key];
-                        row.appendChild(cell);
-                    });
+                    for (var key in schedule[freq]) {
+                        const col = document.createElement('td');
+                        col.textContent = schedule[freq][key];
+                        row.appendChild(col);
+                    }
                     tableBody.appendChild(row);
-                });
+                };
 
                 document.getElementById('schedule-body').style.display = 'block';
             }
@@ -1201,9 +1197,10 @@ <h2>Delete Comment</h2>
                         alert(data.error);
                     } 
                     else{
-                        console.log(data) // BUT here it is sorted??????
-                        console.log(Object.keys(data[0])[0]);
-                        generateSchedule(data);
+                        // console.log(data[0].schedule)
+                        // console.log(typeof data[0].schedule)
+                        console.log(data[0].stops)
+                        generateSchedule(data[0].stops, data[0].schedule);
 
                         // also populate the route info as well as the comments