Changeset 602 in tmcsimulator for branches


Ignore:
Timestamp:
03/26/2020 12:25:28 PM (6 years ago)
Author:
liquan
Message:

Styled status and request page for ticket #245.

Location:
branches/LCSv1
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

  • branches/LCSv1/controllers/default.py

    r601 r602  
    102102 
    103103        form = FORM(BR(),  
    104                 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'))), 
     104                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'))), 
    105105                    [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], 
    106106                    _border='1', _cellpadding='5'),INPUT(_type='submit',_value="submit status form",_class="submit-button"),) 
    … …  
    167167           LABEL('*Direction',_for='direction'), SELECT(hwyDirections,_name='direction', requires=IS_LENGTH(minsize=1,error_message='direction cannot be empty')), XML('   '),  
    168168           LABEL('*Facility',_for='facility'), SELECT(facilities,_name='facility', requires=IS_LENGTH(minsize=1,error_message='facility cannot be empty')), BR(),BR(),  
    169            TABLE(TR(TD(),TD('*County'),TD('*Location')),TR(TD('BEGIN='),TD(SELECT('ORA',_name='startcounty')),TD(SELECT(streets,_name='startlocation',_id='startlocation')), 
    170            TR(TD('END='),TD(SELECT('ORA',_name='endcounty')),TD(SELECT(streets,_name='endlocation',_id='endlocation'))))),BR(), 
    171            'Date Range:',BR(), 
     169           TABLE(TR(TD(),TD(LABEL('*County')),TD(LABEL('*Location'))), 
     170                TR(TD(LABEL('BEGIN=')),TD(SELECT('ORA',_name='startcounty')), 
     171                TD(SELECT(streets,_name='startlocation',_id='startlocation')), 
     172           TR(TD(LABEL('END=')),TD(SELECT('ORA',_name='endcounty')),TD(SELECT(streets,_name='endlocation',_id='endlocation'))))),BR(), 
     173           LABEL('Date Range:'),BR(), 
    172174           LABEL('From',_for='startdate'),INPUT(_name='startdate',_size='8',_class='date'), XML('   '),  
    173175           LABEL('to:',_for='enddate'), INPUT(_name='enddate',_size='8',_class='date'),XML('      '),  
    … …  
    176178           LABEL('to:',_for='endtime'),SELECT(hournames,_name='endtime'),  
    177179           LABEL(':',_for='endtimemin'),SELECT('','00','15','30','45','59',_name='endtimemin'), BR(),BR(),  
    178            TABLE(TR(TD('*Type of Closure'),TD('*Type of Work'),TD('Estimated Delay'),TD('TMP Details')),  
     180           TABLE(TR(TD(LABEL('*Type of Closure') ), 
     181                    TD(LABEL('*Type of Work')), 
     182                    TD(LABEL('Estimated Delay')), 
     183                    TD(LABEL('TMP Details'))),  
    179184                 TR(TD(SELECT(closuretypes,_name='closuretype',requires=IS_LENGTH(minsize=1,error_message='type of closure cannot be empty'))),  
    180185                    TD(SELECT(worktypes,_name='worktype', requires=IS_LENGTH(minsize=1,error_message='type of work cannot be empty'))),  
    … …  
    183188                       INPUT(_type='checkbox', _name='detour'),'Detour Available')),  
    184189                 _width='100%' ), 
    185     TABLE(TR(TD('*Supervisor'),TD('Field Rep')),  
     190    TABLE(TR(TD(LABEL('*Supervisor'), _style="margin-right: 5%;"), 
     191            TD(LABEL('Field Rep'))),  
    186192                  TR(TD(SELECT(supervisors,_name='supervisor', requires=IS_LENGTH(minsize=1,error_message='supervisor cannot be empty'))), 
    187193                     TD(SELECT(supervisors,_name='fieldrep')))), 
    188     TABLE(TR(TD('Meeting Place/CHP Contact'),TD('Reason for Closure'),TD('Additional Remarks / Detour ')),  
    189                   TR(TD(INPUT(_name='meeting')),TD(INPUT(_name='reason',_size='40')),TD(INPUT(_name='remarks',_size='40'))) ), BR(),  
    190             INPUT(_type='submit',_value='Submit Closure'),XML('\n'),SELECT(streetlookup,_name='stlookup', _id='stlookup', _class='hideme'))  
     194    TABLE(TR(TD( LABEL('Meeting Place/CHP Contact')), 
     195            TD(LABEL('Reason for Closure')), 
     196            TD(LABEL('Additional Remarks / Detour '))),  
     197                  TR(TD(INPUT(_name='meeting', _size='30')),TD(INPUT(_name='reason',_size='40')),TD(INPUT(_name='remarks',_size='40'))) ), BR(),  
     198            INPUT(_type='submit',_value='Submit Closure', _class="btn btn-primary btn-default", _style="margin:  7% 45% 2% 40%;"), 
     199            XML('\n'),SELECT(streetlookup,_name='stlookup', _id='stlookup', _class='hideme'))  
     200 
    191201    if form.process().accepted: 
    192202        newID = calcNextClosure(form.vars.route) 

  • branches/LCSv1/databases/sql.log

    r601 r602  
    1843618436DELETE FROM sqlite_sequence WHERE name='streets' 
    1843718437success! 
     18438DELETE FROM "supervisors"; 
     18439DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18440success! 
     18441DELETE FROM "streets"; 
     18442DELETE FROM sqlite_sequence WHERE name='streets' 
     18443success! 
     18444DELETE FROM "supervisors"; 
     18445DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18446success! 
     18447DELETE FROM "streets"; 
     18448DELETE FROM sqlite_sequence WHERE name='streets' 
     18449success! 
     18450DELETE FROM "supervisors"; 
     18451DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18452success! 
     18453DELETE FROM "streets"; 
     18454DELETE FROM sqlite_sequence WHERE name='streets' 
     18455success! 
     18456DELETE FROM "supervisors"; 
     18457DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18458success! 
     18459DELETE FROM "streets"; 
     18460DELETE FROM sqlite_sequence WHERE name='streets' 
     18461success! 
     18462DELETE FROM "supervisors"; 
     18463DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18464success! 
     18465DELETE FROM "streets"; 
     18466DELETE FROM sqlite_sequence WHERE name='streets' 
     18467success! 
     18468DELETE FROM "supervisors"; 
     18469DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18470success! 
     18471DELETE FROM "streets"; 
     18472DELETE FROM sqlite_sequence WHERE name='streets' 
     18473success! 
     18474DELETE FROM "supervisors"; 
     18475DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18476success! 
     18477DELETE FROM "streets"; 
     18478DELETE FROM sqlite_sequence WHERE name='streets' 
     18479success! 
     18480DELETE FROM "supervisors"; 
     18481DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18482success! 
     18483DELETE FROM "streets"; 
     18484DELETE FROM sqlite_sequence WHERE name='streets' 
     18485success! 
     18486DELETE FROM "supervisors"; 
     18487DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18488success! 
     18489DELETE FROM "streets"; 
     18490DELETE FROM sqlite_sequence WHERE name='streets' 
     18491success! 
     18492DELETE FROM "supervisors"; 
     18493DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18494success! 
     18495DELETE FROM "streets"; 
     18496DELETE FROM sqlite_sequence WHERE name='streets' 
     18497success! 
     18498DELETE FROM "supervisors"; 
     18499DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18500success! 
     18501DELETE FROM "streets"; 
     18502DELETE FROM sqlite_sequence WHERE name='streets' 
     18503success! 
     18504DELETE FROM "supervisors"; 
     18505DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18506success! 
     18507DELETE FROM "streets"; 
     18508DELETE FROM sqlite_sequence WHERE name='streets' 
     18509success! 
     18510DELETE FROM "supervisors"; 
     18511DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18512success! 
     18513DELETE FROM "streets"; 
     18514DELETE FROM sqlite_sequence WHERE name='streets' 
     18515success! 
     18516DELETE FROM "supervisors"; 
     18517DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18518success! 
     18519DELETE FROM "streets"; 
     18520DELETE FROM sqlite_sequence WHERE name='streets' 
     18521success! 
     18522DELETE FROM "supervisors"; 
     18523DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18524success! 
     18525DELETE FROM "streets"; 
     18526DELETE FROM sqlite_sequence WHERE name='streets' 
     18527success! 
     18528DELETE FROM "supervisors"; 
     18529DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18530success! 
     18531DELETE FROM "streets"; 
     18532DELETE FROM sqlite_sequence WHERE name='streets' 
     18533success! 
     18534DELETE FROM "supervisors"; 
     18535DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18536success! 
     18537DELETE FROM "streets"; 
     18538DELETE FROM sqlite_sequence WHERE name='streets' 
     18539success! 
     18540DELETE FROM "supervisors"; 
     18541DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18542success! 
     18543DELETE FROM "streets"; 
     18544DELETE FROM sqlite_sequence WHERE name='streets' 
     18545success! 
     18546DELETE FROM "supervisors"; 
     18547DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18548success! 
     18549DELETE FROM "streets"; 
     18550DELETE FROM sqlite_sequence WHERE name='streets' 
     18551success! 
     18552DELETE FROM "supervisors"; 
     18553DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18554success! 
     18555DELETE FROM "streets"; 
     18556DELETE FROM sqlite_sequence WHERE name='streets' 
     18557success! 
     18558DELETE FROM "supervisors"; 
     18559DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18560success! 
     18561DELETE FROM "streets"; 
     18562DELETE FROM sqlite_sequence WHERE name='streets' 
     18563success! 
     18564DELETE FROM "supervisors"; 
     18565DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18566success! 
     18567DELETE FROM "streets"; 
     18568DELETE FROM sqlite_sequence WHERE name='streets' 
     18569success! 
     18570DELETE FROM "supervisors"; 
     18571DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18572success! 
     18573DELETE FROM "streets"; 
     18574DELETE FROM sqlite_sequence WHERE name='streets' 
     18575success! 
     18576DELETE FROM "supervisors"; 
     18577DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18578success! 
     18579DELETE FROM "streets"; 
     18580DELETE FROM sqlite_sequence WHERE name='streets' 
     18581success! 
     18582DELETE FROM "supervisors"; 
     18583DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18584success! 
     18585DELETE FROM "streets"; 
     18586DELETE FROM sqlite_sequence WHERE name='streets' 
     18587success! 
     18588DELETE FROM "supervisors"; 
     18589DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18590success! 
     18591DELETE FROM "streets"; 
     18592DELETE FROM sqlite_sequence WHERE name='streets' 
     18593success! 
     18594DELETE FROM "supervisors"; 
     18595DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18596success! 
     18597DELETE FROM "streets"; 
     18598DELETE FROM sqlite_sequence WHERE name='streets' 
     18599success! 
     18600DELETE FROM "supervisors"; 
     18601DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18602success! 
     18603DELETE FROM "streets"; 
     18604DELETE FROM sqlite_sequence WHERE name='streets' 
     18605success! 
     18606DELETE FROM "supervisors"; 
     18607DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18608success! 
     18609DELETE FROM "streets"; 
     18610DELETE FROM sqlite_sequence WHERE name='streets' 
     18611success! 
     18612DELETE FROM "supervisors"; 
     18613DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18614success! 
     18615DELETE FROM "streets"; 
     18616DELETE FROM sqlite_sequence WHERE name='streets' 
     18617success! 
     18618DELETE FROM "supervisors"; 
     18619DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18620success! 
     18621DELETE FROM "streets"; 
     18622DELETE FROM sqlite_sequence WHERE name='streets' 
     18623success! 
     18624DELETE FROM "supervisors"; 
     18625DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18626success! 
     18627DELETE FROM "streets"; 
     18628DELETE FROM sqlite_sequence WHERE name='streets' 
     18629success! 
     18630DELETE FROM "supervisors"; 
     18631DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18632success! 
     18633DELETE FROM "streets"; 
     18634DELETE FROM sqlite_sequence WHERE name='streets' 
     18635success! 
     18636DELETE FROM "supervisors"; 
     18637DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18638success! 
     18639DELETE FROM "streets"; 
     18640DELETE FROM sqlite_sequence WHERE name='streets' 
     18641success! 
     18642DELETE FROM "supervisors"; 
     18643DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18644success! 
     18645DELETE FROM "streets"; 
     18646DELETE FROM sqlite_sequence WHERE name='streets' 
     18647success! 
     18648DELETE FROM "supervisors"; 
     18649DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18650success! 
     18651DELETE FROM "streets"; 
     18652DELETE FROM sqlite_sequence WHERE name='streets' 
     18653success! 
     18654DELETE FROM "supervisors"; 
     18655DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18656success! 
     18657DELETE FROM "streets"; 
     18658DELETE FROM sqlite_sequence WHERE name='streets' 
     18659success! 
     18660DELETE FROM "supervisors"; 
     18661DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18662success! 
     18663DELETE FROM "streets"; 
     18664DELETE FROM sqlite_sequence WHERE name='streets' 
     18665success! 
     18666DELETE FROM "supervisors"; 
     18667DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18668success! 
     18669DELETE FROM "streets"; 
     18670DELETE FROM sqlite_sequence WHERE name='streets' 
     18671success! 
     18672DELETE FROM "supervisors"; 
     18673DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18674success! 
     18675DELETE FROM "streets"; 
     18676DELETE FROM sqlite_sequence WHERE name='streets' 
     18677success! 
     18678DELETE FROM "supervisors"; 
     18679DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18680success! 
     18681DELETE FROM "streets"; 
     18682DELETE FROM sqlite_sequence WHERE name='streets' 
     18683success! 
     18684DELETE FROM "supervisors"; 
     18685DELETE FROM sqlite_sequence WHERE name='supervisors' 
     18686success! 
     18687DELETE FROM "streets"; 
     18688DELETE FROM sqlite_sequence WHERE name='streets' 
     18689success! 

  • branches/LCSv1/static/css/lcstrain.css

    r601 r602  
    283283} 
    284284 
     285label { 
     286        font-family: geneva, sans-serif;  
     287        font-size: 18px;  
     288        color: #003366;  
     289        font-weight: bold;  
     290    text-align: right;  
     291    margin: 0% 1% 0% 3%; 
     292} 
    285293.label90 { 
    286294    width: 90px; 
    … …  
    509517    background: lightblue; 
    510518} 
     519th { 
     520    font-size: 14px; 
     521} 
    511522tr:nth-child(odd).statusHistory { 
    512523    background: lightgray; 
    … …  
    17351746    margin: 4% 0% 4% 0%; 
    17361747    justify-content: center; 
    1737     width: 650px; 
    1738 } 
     1748    width: 800px; 
     1749} 

  • branches/LCSv1/views/default/submit.html

    r593 r602  
    6666} 
    6767</script> 
    68 <h2>Request Emergency Closure</h2> 
    69 {{=form}} 
     68 
     69<div id="main" role="main" class="mainflex"> 
     70    <div id="pageTitle" class="header">Request Emergency Closure</div> 
     71 
     72    <div class="searchform"> 
     73        {{=form}} 
     74    </div> 
     75</div> 
Note: See TracChangeset for help on using the changeset viewer.