Changeset 620 in tmcsimulator for branches/LCSv2/controllers/default.py.bak

Timestamp:

07/13/2020 12:23:49 PM (6 years ago)

Author:

jdalbey

Message:

Implement #248 to enhance LCS Request page

File:

• branches/LCSv2/controllers/default.py.bak (modified) (4 diffs)

branches/LCSv2/controllers/default.py.bak

@@ -45 +45 @@
     if form.process(onvalidation=special_validation).accepted:
         # Put the form fields into the session variables
-        session.closureid = form.vars.closureid.strip()
+        session.closureid = form.vars.closureid.strip().upper()
         session.lognum = form.vars.lognum.strip()
         session.startdate = form.vars.startdate.strip()
@@ -177 +177 @@
     # Obtain all the supervisor names from the database
     for row in db().select(db.supervisors.ALL):
-        supervisors.append(row.name)
+        supervisors.append(row.radiocallnum + ' ' + row.name)
+    crew = ['']  # List of names for the dropdown box
+    # Obtain all the crew names from the database
+    for row in db().select(db.crew.ALL):
+        crew.append(row.radiocallnum + ' ' + row.name)
     # Build the list of street locations and a hidden cross street lookup table
     streets = ['']
@@ -206 +210 @@
                  TR(TD(SELECT(closuretypes,_name='closuretype',requires=IS_LENGTH(minsize=1,error_message='type of closure cannot be empty'))), 
                     TD(SELECT(worktypes,_name='worktype', requires=IS_LENGTH(minsize=1,error_message='type of work cannot be empty'))), 
-                    TD(INPUT(_name='estdelay',_size='4'),'minutes'), 
+                    TD(INPUT(_name='estdelay',_size='4',requires=IS_INT_IN_RANGE(1, 1440)),'minutes'), 
                     TD(INPUT(_type='checkbox',_name='cozeep'),'CoZeep MaZeep/CHP',BR(), 
                        INPUT(_type='checkbox', _name='detour'),'Detour Available')), 
@@ -213 +217 @@
             TD(LABEL('Field Rep'))), 
                   TR(TD(SELECT(supervisors,_name='supervisor', requires=IS_LENGTH(minsize=1,error_message='supervisor cannot be empty'))),
-                     TD(SELECT(supervisors,_name='fieldrep')))),
+                     TD(SELECT(crew,_name='fieldrep')))),
     TABLE(TR(TD( LABEL('Meeting Place/CHP Contact')),
             TD(LABEL('Reason for Closure')),