Changeset 634 in tmcsimulator for branches/LCSv2/controllers

Timestamp:

02/25/2021 10:00:55 AM (5 years ago)

Author:

jdalbey

Message:

LCS implement #252 Add logging for new closures and status updates

Location:

branches/LCSv2/controllers

Files:

• default.py (modified) (4 diffs)
• default.py.bak (modified) (6 diffs)

branches/LCSv2/controllers/default.py

@@ -1 +1 @@
 # added comments for testing
 # Constants
+kLogfile = "samplelogfile.txt"
+kSimtimefile = "sim_elapsedtime.json"
 hwys = ['','1','5', '22', '55', '57', '73', '74', '91', '133', '142', '241', '261', '405', '605']
 hwyDirections = ['','NB', 'SB', 'NB/SB','EB','WB','EB/WB']
-# Names to appeaer in the username dropdown box
+# Names to appear in the username dropdown box
 users = []
 # Show the login page
@@ -189 +191 @@
             fieldname = "s"+session.statustype[0:4]+"time"
             db(db.closures.closureid == session.statustype[4:]).update(**{fieldname:now.strftime("%H%M")})
+            # Log the update to external file
+            logmessage = getSimTime() + " LCS status update: " + session.username + ", " + session.statustype[4:] + ", " + session.statustype[0:4] + ", " + session.statuser + " " + "\n"
+            text_file = open(kLogfile, "a")
+            text_file.write(logmessage)
+            text_file.close()
         else:
             msg = "error because only checking one box is allowed."
@@ -201 +208 @@
     else:
         return ""
+
+# Fetch simulation time and format it into a timestamp
+def getSimTime():
+    import json,datetime
+    try:
+        jsontime = json.load(open(kSimtimefile,'r'))
+        currentSimTime = jsontime["elapsedtime"]
+        timestamp = str(datetime.timedelta(seconds = int(currentSimTime)))
+        return timestamp
+    except:
+        # Fallback if missing file, use current time 
+        now = datetime.datetime.today()
+        return now.strftime("%H:%M:%S")
 
 # Create a new record
@@ -296 +316 @@
         newrec = db.closures.insert(closureid=newID, lognum=newLognum, route=form.vars.route, direction=form.vars.direction, facility=form.vars.facility, startcounty=form.vars.startcounty, endcounty=form.vars.endcounty, startlocation=form.vars.startlocation, endlocation=form.vars.endlocation, startdate=form.vars.startdate, enddate=form.vars.enddate, starttime=form.vars.starttime+form.vars.starttimemin, endtime=form.vars.endtime+form.vars.endtimemin, closuretype=form.vars.closuretype, closedlanes=selectedlanes, worktype=form.vars.worktype, estdelay=form.vars.estdelay, tmpcozeep=getCheckbox(form.vars.cozeep), tmpdetour=getCheckbox(form.vars.detour), supervisor=supervisor_name, fieldrep=fieldrep_name, s1097date='', s1098date='', s1022date='' )
         session.flash = 'New lane closure added: ' + newID + ' ' + newLognum + ': ' + selectedlanes
+        # Log the new closure to external file. Username, closureID, route, dir, type of closure, type of work
+        logmessage = getSimTime() + " LCS new closure: " + session.username + ", " + newID + '.' + newLognum + ', ' + form.vars.route + form.vars.direction + ', ' + form.vars.closuretype + ', ' + form.vars.worktype + "\n"
+        text_file = open(kLogfile, "a")
+        text_file.write(logmessage)
+        text_file.close()
         redirect(URL('search.html'))
     return dict(form=form)

branches/LCSv2/controllers/default.py.bak

@@ -1 +1 @@
 # added comments for testing
 # Constants
+kLogfile = "samplelogfile.txt"
+kSimtimefile = "sim_elapsedtime.json"
 hwys = ['','1','5', '22', '55', '57', '73', '74', '91', '133', '142', '241', '261', '405', '605']
 hwyDirections = ['','NB', 'SB', 'NB/SB','EB','WB','EB/WB']
-# Names to appeaer in the username dropdown box
+# Names to appear in the username dropdown box
 users = []
 # Show the login page
@@ -189 +191 @@
             fieldname = "s"+session.statustype[0:4]+"time"
             db(db.closures.closureid == session.statustype[4:]).update(**{fieldname:now.strftime("%H%M")})
+            # Log the update to external file
+            logmessage = getSimTime() + " LCS status update: " + session.statustype[4:] + ", " + session.statustype[0:4] + ", " + session.statuser + " " + "\n"
+            text_file = open(kLogfile, "a")
+            text_file.write(logmessage)
+            text_file.close()
         else:
             msg = "error because only checking one box is allowed."
@@ -201 +208 @@
     else:
         return ""
+
+# Fetch simulation time and format it into a timestamp
+def getSimTime():
+    import json,datetime
+    try:
+        jsontime = json.load(open(kSimtimefile,'r'))
+        currentSimTime = jsontime["elapsedtime"]
+        timestamp = str(datetime.timedelta(seconds = int(currentSimTime)))
+        return timestamp
+    except:
+        # Fallback if missing file, use current time 
+        now = datetime.datetime.today()
+        return now.strftime("%H:%M:%S")
 
 # Create a new record
@@ -296 +316 @@
         newrec = db.closures.insert(closureid=newID, lognum=newLognum, route=form.vars.route, direction=form.vars.direction, facility=form.vars.facility, startcounty=form.vars.startcounty, endcounty=form.vars.endcounty, startlocation=form.vars.startlocation, endlocation=form.vars.endlocation, startdate=form.vars.startdate, enddate=form.vars.enddate, starttime=form.vars.starttime+form.vars.starttimemin, endtime=form.vars.endtime+form.vars.endtimemin, closuretype=form.vars.closuretype, closedlanes=selectedlanes, worktype=form.vars.worktype, estdelay=form.vars.estdelay, tmpcozeep=getCheckbox(form.vars.cozeep), tmpdetour=getCheckbox(form.vars.detour), supervisor=supervisor_name, fieldrep=fieldrep_name, s1097date='', s1098date='', s1022date='' )
         session.flash = 'New lane closure added: ' + newID + ' ' + newLognum + ': ' + selectedlanes
+        # Log the new closure to external file. Username, closureID, route, dir, type of closure, type of work
+        logmessage = getSimTime() + " LCS new closure: " + session.username + newID + '.' + newLognum + ', ' + form.vars.route + form.vars.direction + ', ' + form.vars.closuretype + ', ' + form.vars.worktype + "\n"
+        text_file = open(kLogfile, "a")
+        text_file.write(logmessage)
+        text_file.close()
         redirect(URL('search.html'))
     return dict(form=form)
@@ -303 +328 @@
     form = FORM("Press this button to reset the closure database to its original state at the start of a simulation.",BR(),
                 "Warning: this will delete all the current closures.",BR(),
+                "Import filename is 'db_closures_start.csv'.",BR(),
                 INPUT(_value="Reset Database", _type='submit', _class="btn btn-primary btn-default"))
     if form.process().accepted:
@@ -308 +334 @@
         with open('db_closures_start.csv', 'rb') as dumpfile:
             db.closures.import_from_csv_file(dumpfile)  # import from starting state
+        session.flash = 'Closure database has been reset'
         redirect(URL('search.html'))
     return dict(form=form)