Added service periods to route names
[bus.git] / busui / schedule_viewer.py
blob:a/busui/schedule_viewer.py -> blob:b/busui/schedule_viewer.py
--- a/busui/schedule_viewer.py
+++ b/busui/schedule_viewer.py
@@ -256,7 +256,12 @@
     schedule = self.server.schedule
     result = []
     for r in schedule.GetRouteList():
-      result.append( (r.route_id, r.route_short_name, r.route_long_name) )
+      servicep = None
+      for t in schedule.GetTripList():
+        if t.route_id == r.route_id:
+          servicep = t.service_period
+          break
+      result.append( (r.route_id, r.route_short_name, r.route_long_name, servicep.service_id) )
     result.sort(key = lambda x: x[1:3])
     return result
 
@@ -273,8 +278,6 @@
     for t in schedule.GetTripList():
       if t.route_id == query:
         result.append ( (t.GetStartTime(), t.trip_id) )
-        """ UGH fails for 300s """
-    """return result"""
     return sorted(result, key=lambda trip: trip[0])
   
   def handle_json_GET_triprows(self, params):