Changeset 602 in tmcsimulator for branches/LCSv1/controllers/default.py

Timestamp:

03/26/2020 12:25:28 PM (6 years ago)

Author:

liquan

Message:

Styled status and request page for ticket #245.

File:

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

branches/LCSv1/controllers/default.py

@@ -102 +102 @@
 
         form = FORM(BR(), 
-                TABLE(THEAD(TR(TH('Closure ID/',BR(),'Log No.'),TH('Route & Dir',BR(),'Type of Closure'),TH('Start Date/',BR(),'End Date/',BR(),'Est. Delay'),TH('Requestor/',BR(),'Radio Call No.'),TH('Status'))),
+                TABLE(THEAD(TR(TH('Closure ID/',BR(),'Log No.'), TH('Route & Dir',BR(),'Type of Closure'),TH('Start Date/',BR(),'End Date/',BR(),'Est. Delay'),TH('Requestor/',BR(),'Radio Call No.'),TH('Status'))),
                     [TR(TD(row.closureid,HR(),row.lognum),TD(row.route,' ',row.direction,HR(),row.closuretype),TD(row.startdate,HR(),row.enddate,HR(),row.estdelay),TD(row.supervisor,BR(),db(db.supervisors.name == row.supervisor).select().first().radiocallnum),TD(LABEL('1097'), INPUT(_type='checkbox', _name='statustype', _value='1097'+row.closureid),LABEL('1098'), INPUT(_type='checkbox', _name='statustype', _value='1098'+row.closureid),LABEL('1022'), INPUT(_type='checkbox', _name='statustype', _value='1022'+row.closureid),BR(), LABEL('Statuser:'),INPUT(_name='statuser',_size='9'))) for row in closedItems],
                     _border='1', _cellpadding='5'),INPUT(_type='submit',_value="submit status form",_class="submit-button"),)
@@ -167 +167 @@
            LABEL('*Direction',_for='direction'), SELECT(hwyDirections,_name='direction', requires=IS_LENGTH(minsize=1,error_message='direction cannot be empty')), XML('   '), 
            LABEL('*Facility',_for='facility'), SELECT(facilities,_name='facility', requires=IS_LENGTH(minsize=1,error_message='facility cannot be empty')), BR(),BR(), 
-           TABLE(TR(TD(),TD('*County'),TD('*Location')),TR(TD('BEGIN='),TD(SELECT('ORA',_name='startcounty')),TD(SELECT(streets,_name='startlocation',_id='startlocation')),
-           TR(TD('END='),TD(SELECT('ORA',_name='endcounty')),TD(SELECT(streets,_name='endlocation',_id='endlocation'))))),BR(),
-           'Date Range:',BR(),
+           TABLE(TR(TD(),TD(LABEL('*County')),TD(LABEL('*Location'))),
+                TR(TD(LABEL('BEGIN=')),TD(SELECT('ORA',_name='startcounty')),
+                TD(SELECT(streets,_name='startlocation',_id='startlocation')),
+           TR(TD(LABEL('END=')),TD(SELECT('ORA',_name='endcounty')),TD(SELECT(streets,_name='endlocation',_id='endlocation'))))),BR(),
+           LABEL('Date Range:'),BR(),
            LABEL('From',_for='startdate'),INPUT(_name='startdate',_size='8',_class='date'), XML('   '), 
            LABEL('to:',_for='enddate'), INPUT(_name='enddate',_size='8',_class='date'),XML('      '), 
@@ -176 +178 @@
            LABEL('to:',_for='endtime'),SELECT(hournames,_name='endtime'), 
            LABEL(':',_for='endtimemin'),SELECT('','00','15','30','45','59',_name='endtimemin'), BR(),BR(), 
-           TABLE(TR(TD('*Type of Closure'),TD('*Type of Work'),TD('Estimated Delay'),TD('TMP Details')), 
+           TABLE(TR(TD(LABEL('*Type of Closure') ),
+                    TD(LABEL('*Type of Work')),
+                    TD(LABEL('Estimated Delay')),
+                    TD(LABEL('TMP Details'))), 
                  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'))), 
@@ -183 +188 @@
                        INPUT(_type='checkbox', _name='detour'),'Detour Available')), 
                  _width='100%' ),
-    TABLE(TR(TD('*Supervisor'),TD('Field Rep')), 
+    TABLE(TR(TD(LABEL('*Supervisor'), _style="margin-right: 5%;"),
+            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')))),
-    TABLE(TR(TD('Meeting Place/CHP Contact'),TD('Reason for Closure'),TD('Additional Remarks / Detour ')), 
-                  TR(TD(INPUT(_name='meeting')),TD(INPUT(_name='reason',_size='40')),TD(INPUT(_name='remarks',_size='40'))) ), BR(), 
-            INPUT(_type='submit',_value='Submit Closure'),XML('\n'),SELECT(streetlookup,_name='stlookup', _id='stlookup', _class='hideme')) 
+    TABLE(TR(TD( LABEL('Meeting Place/CHP Contact')),
+            TD(LABEL('Reason for Closure')),
+            TD(LABEL('Additional Remarks / Detour '))), 
+                  TR(TD(INPUT(_name='meeting', _size='30')),TD(INPUT(_name='reason',_size='40')),TD(INPUT(_name='remarks',_size='40'))) ), BR(), 
+            INPUT(_type='submit',_value='Submit Closure', _class="btn btn-primary btn-default", _style="margin:  7% 45% 2% 40%;"),
+            XML('\n'),SELECT(streetlookup,_name='stlookup', _id='stlookup', _class='hideme')) 
+
     if form.process().accepted:
         newID = calcNextClosure(form.vars.route)