v3.2.1 docker-testing

.dockerignore

@@ -1 +1,3 @@
 .git/*
+export/**/*.txt
+logs/*

GTFSManager.py

@@ -1318,6 +1318,35 @@ def post(self):
 		end = time.time()
 		logmessage("tableReadSave POST call for table={} took {} seconds.".format(table,round(end-start,2)))
 
+class tableColumn(tornado.web.RequestHandler):
+	def get(self):
+		# API/tableColumn?table=table&column=column&key=key&value=value
+		start = time.time()
+		logmessage('\nrouteIdList GET call')
+
+		table=self.get_argument('table',default='')
+		column=self.get_argument('column',default='')
+		logmessage('\ntableColumn GET call for table={}, column={}'.format(table,column))
+
+		if (not table) or (not column) :
+			self.set_status(400)
+			self.write("Error: invalid table or column given.")
+			return 
+
+		key=self.get_argument('key',default=None)
+		value=self.get_argument('value',default=None)
+
+		if key and value:
+			returnList = readColumnDB(table, column, key=key, value=value)
+		else:
+			returnList = readColumnDB(table, column)
+
+		returnList.sort()
+		self.write(json.dumps(returnList))
+		end = time.time()
+		logmessage("tableColumn GET call took {} seconds.".format(round(end-start,2)))
+
+
 def make_app():
 	return tornado.web.Application([
 		#(r"/API/data", APIHandler),
@@ -1357,6 +1386,7 @@ def make_app():
 		(r"/API/hydGTFS", hydGTFS),
 		(r"/API/frequencies", frequencies),
 		(r"/API/tableReadSave", tableReadSave),
+		(r"/API/tableColumn", tableColumn),
 		#(r"/API/idList", idList),
 		(r"/(.*)", tornado.web.StaticFileHandler, {"path": root, "default_filename": "index.html"})
 	])

GTFSserverfunctions.py

@@ -28,6 +28,8 @@
 import numpy as np
 import io # used in hyd csv import
 
+# to do: how to get these variables declared in the other file to be recognized here?
+
 global uploadFolder
 global xmlFolder
 global logFolder
@@ -980,11 +982,16 @@ def allShapesListFunc():
 
 def serviceIdsFunc():
 	calendarDF = readTableDB('calendar')
-	if not len(calendarDF):
-		service_id_list = []
-	else:
-		service_id_list = calendarDF['service_id'].tolist()
-	return service_id_list
+	collectorSet = set()
+	if len(calendarDF):
+		collectorSet.update( calendarDF['service_id'].tolist() )
+		# service_id_list = calendarDF['service_id'].tolist()
+
+	calendarDatesDF = readTableDB('calendar_dates')
+	if len(calendarDatesDF):
+		collectorSet.update( calendarDatesDF['service_id'].tolist() )
+
+	return list(collectorSet)
 
 
 #################################################3

README.md

@@ -5,7 +5,7 @@
 
 A browser-based user interface for creating, editing, exporting of static GTFS (General Transit Feed Specification Reference) feeds for a public transit authority.
 
-**Development Status** : V 3.2.0   
+**Development Status** : V 3.2.1   
 Windows binary is available too now. Download from [Releases page](https://github.com/WRI-Cities/static-GTFS-manager/releases/).
 
 ## Intro
@@ -51,9 +51,7 @@ See on the project wiki: [Running on Ubuntu OS](https://github.com/WRI-Cities/st
 See on the project wiki: [Running on Windows OS with Python 3](https://github.com/WRI-Cities/static-GTFS-manager/wiki/Running-on-Windows-OS-with-Python-3)
 
 ### Running in Docker with Compose
-Check out the repo and run 
-
-    docker-compose up
+Work in progress! See [this](https://github.com/WRI-Cities/static-GTFS-manager/issues/69)
 
 ----
 

config/settings.js

@@ -18,7 +18,7 @@ const menu = {
 		"Stops": "stops.html",
 		"Routes": "routes.html",
 		"Calendar": "calendar.html",
-		"Trips and Stop_times": "tripstimings.html",
+		"Trips, Stop_times": "tripstimings.html",
 		"Frequencies": "frequencies.html",
 		"Fares": "fares.html",
 		"Translations": "translations.html"