Changeset 609 in tmcsimulator for branches

Timestamp:

03/31/2020 07:54:57 PM (6 years ago)

Author:

liquan

Message:

Complete searching filter for search page with different combination of search requirement (ticket #246)

Location:

branches/LCSv1

Files:

• controllers/default.py (modified) (1 diff)
• databases/storage.sqlite (modified) (previous)

branches/LCSv1/controllers/default.py

@@ -55 +55 @@
 # Show the item that was found in the search
 def results():
+    # query object is equivalent to the where clause in query 
+    query = True
+    msg = ""
     if (len(session.closureid) != 0):
-        hwy = db(db.closures.closureid == session.closureid).select() 
-        msg = "Closure ID = " + session.closureid
-    elif (len(session.route) != 0):
-        hwy = db(db.closures.route == session.route).select() 
-        msg = "route = " + session.route
-    elif (len(session.startdate) == 10):
-        hwy = db(db.closures.startdate >= session.startdate).select()
-        msg = "Start Date >= " + session.startdate
-    else:
+        query = (db.closures.closureid == session.closureid)
+        msg += " Closure ID = " + session.closureid    
+    if (len(session.lognum) != 0):
+        query = query & (db.closures.lognum == session.lognum)
+        msg += " Log number = " + session.lognum    
+    if (len(session.route) != 0):
+        query = query & (db.closures.route == session.route)
+        msg += " Route = " + session.route
+    if (len(session.direction) != 0):
+        query = query & (db.closures.direction == session.direction)
+        msg += " Route = " + session.route
+    if (len(session.startdate) != 0):
+        query = query & (db.closures.startdate == session.startdate)
+        msg += "Start date = " + session.startdate
+    if (len(session.enddate) != 0):
+        query = query & (db.closures.enddate == session.enddate)
+        msg += "Start date = " + session.enddate
+    
+    # if no restrictions entered then get all entries 
+    if query == True :
         hwy = db().select(db.closures.ALL)
         msg = "ALL"
+    else:
+        # get entries with the matching requirements
+        hwy = db(query).select()
+
     count = len(hwy)
     # Show the results in table format.  Get the radio call number from supervisor name lookup