- Timestamp:
- 08/29/2020 09:03:00 AM (6 years ago)
- Location:
- branches/LCSv2
- Files:
-
- 4 edited
-
controllers/default.py (modified) (3 diffs)
-
databases/sql.log (modified) (1 diff)
-
databases/storage.sqlite (modified) (previous)
-
views/default/submit.html (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/LCSv2/controllers/default.py
r623 r624 214 214 supervisors.append(row.radiocallnum + ' ' + row.name) 215 215 crew = [''] # List of names for the dropdown box 216 crewlookup = [] 216 217 # Obtain all the crew names from the database 217 218 for row in db().select(db.crew.ALL): 218 219 crew.append(row.radiocallnum + ' ' + row.name) 220 crewlookup.append(row.radiocallnum + ' ' + row.name) 219 221 # Build the list of street locations and a hidden cross street lookup table 220 222 streets = [''] … … 263 265 TD(LABEL('Field Rep')) 264 266 ), 265 TR(TD(SELECT(supervisors,_name='supervisor', requires=IS_LENGTH(minsize=1,error_message='supervisor cannot be empty'))),266 TD(SELECT(crew,_name='fieldrep' )),267 TR(TD(SELECT(supervisors,_name='supervisor', _id='supervisorcombo', _onchange='supervisorchanged()', requires=IS_LENGTH(minsize=1,error_message='supervisor cannot be empty'))), 268 TD(SELECT(crew,_name='fieldrep',_id='fieldrep')), 267 269 TD(XML(" ")), 268 270 TD('Is this an existing incident?', … … 279 281 TR(TD(INPUT(_name='meeting', _size='25')),TD(INPUT(_name='reason',_size='25')),TD(INPUT(_name='remarks',_size='25'))) ), BR(), 280 282 INPUT(_type='submit',_value='Submit Closure', _class="btn btn-primary btn-default", _style="margin: 2% 45% 2% 40%;"), 281 XML('\n'),SELECT(streetlookup,_name='stlookup', _id='stlookup', _class='hideme')) 283 XML('\n'),SELECT(streetlookup,_name='stlookup', _id='stlookup', _class='hideme'), 284 SELECT(crewlookup,_name='crewlookup', _id='crewlookup', _class='hideme')) 282 285 283 286 if form.process(onvalidation=validate_existing_id).accepted: -
branches/LCSv2/databases/sql.log
r623 r624 48101 48101 DELETE FROM sqlite_sequence WHERE name='crew' 48102 48102 success! 48103 DELETE FROM "supervisors"; 48104 DELETE FROM sqlite_sequence WHERE name='supervisors' 48105 success! 48106 DELETE FROM "streets"; 48107 DELETE FROM sqlite_sequence WHERE name='streets' 48108 success! 48109 DELETE FROM "crew"; 48110 DELETE FROM sqlite_sequence WHERE name='crew' 48111 success! 48112 DELETE FROM "supervisors"; 48113 DELETE FROM sqlite_sequence WHERE name='supervisors' 48114 success! 48115 DELETE FROM "streets"; 48116 DELETE FROM sqlite_sequence WHERE name='streets' 48117 success! 48118 DELETE FROM "crew"; 48119 DELETE FROM sqlite_sequence WHERE name='crew' 48120 success! 48121 DELETE FROM "supervisors"; 48122 DELETE FROM sqlite_sequence WHERE name='supervisors' 48123 success! 48124 DELETE FROM "streets"; 48125 DELETE FROM sqlite_sequence WHERE name='streets' 48126 success! 48127 DELETE FROM "crew"; 48128 DELETE FROM sqlite_sequence WHERE name='crew' 48129 success! 48130 DELETE FROM "supervisors"; 48131 DELETE FROM sqlite_sequence WHERE name='supervisors' 48132 success! 48133 DELETE FROM "streets"; 48134 DELETE FROM sqlite_sequence WHERE name='streets' 48135 success! 48136 DELETE FROM "crew"; 48137 DELETE FROM sqlite_sequence WHERE name='crew' 48138 success! 48139 DELETE FROM "supervisors"; 48140 DELETE FROM sqlite_sequence WHERE name='supervisors' 48141 success! 48142 DELETE FROM "streets"; 48143 DELETE FROM sqlite_sequence WHERE name='streets' 48144 success! 48145 DELETE FROM "crew"; 48146 DELETE FROM sqlite_sequence WHERE name='crew' 48147 success! 48148 DELETE FROM "supervisors"; 48149 DELETE FROM sqlite_sequence WHERE name='supervisors' 48150 success! 48151 DELETE FROM "streets"; 48152 DELETE FROM sqlite_sequence WHERE name='streets' 48153 success! 48154 DELETE FROM "crew"; 48155 DELETE FROM sqlite_sequence WHERE name='crew' 48156 success! 48157 DELETE FROM "supervisors"; 48158 DELETE FROM sqlite_sequence WHERE name='supervisors' 48159 success! 48160 DELETE FROM "streets"; 48161 DELETE FROM sqlite_sequence WHERE name='streets' 48162 success! 48163 DELETE FROM "crew"; 48164 DELETE FROM sqlite_sequence WHERE name='crew' 48165 success! 48166 DELETE FROM "supervisors"; 48167 DELETE FROM sqlite_sequence WHERE name='supervisors' 48168 success! 48169 DELETE FROM "streets"; 48170 DELETE FROM sqlite_sequence WHERE name='streets' 48171 success! 48172 DELETE FROM "crew"; 48173 DELETE FROM sqlite_sequence WHERE name='crew' 48174 success! 48175 DELETE FROM "supervisors"; 48176 DELETE FROM sqlite_sequence WHERE name='supervisors' 48177 success! 48178 DELETE FROM "streets"; 48179 DELETE FROM sqlite_sequence WHERE name='streets' 48180 success! 48181 DELETE FROM "crew"; 48182 DELETE FROM sqlite_sequence WHERE name='crew' 48183 success! 48184 DELETE FROM "supervisors"; 48185 DELETE FROM sqlite_sequence WHERE name='supervisors' 48186 success! 48187 DELETE FROM "streets"; 48188 DELETE FROM sqlite_sequence WHERE name='streets' 48189 success! 48190 DELETE FROM "crew"; 48191 DELETE FROM sqlite_sequence WHERE name='crew' 48192 success! 48193 DELETE FROM "supervisors"; 48194 DELETE FROM sqlite_sequence WHERE name='supervisors' 48195 success! 48196 DELETE FROM "streets"; 48197 DELETE FROM sqlite_sequence WHERE name='streets' 48198 success! 48199 DELETE FROM "crew"; 48200 DELETE FROM sqlite_sequence WHERE name='crew' 48201 success! 48202 DELETE FROM "supervisors"; 48203 DELETE FROM sqlite_sequence WHERE name='supervisors' 48204 success! 48205 DELETE FROM "streets"; 48206 DELETE FROM sqlite_sequence WHERE name='streets' 48207 success! 48208 DELETE FROM "crew"; 48209 DELETE FROM sqlite_sequence WHERE name='crew' 48210 success! 48211 DELETE FROM "supervisors"; 48212 DELETE FROM sqlite_sequence WHERE name='supervisors' 48213 success! 48214 DELETE FROM "streets"; 48215 DELETE FROM sqlite_sequence WHERE name='streets' 48216 success! 48217 DELETE FROM "crew"; 48218 DELETE FROM sqlite_sequence WHERE name='crew' 48219 success! 48220 DELETE FROM "supervisors"; 48221 DELETE FROM sqlite_sequence WHERE name='supervisors' 48222 success! 48223 DELETE FROM "streets"; 48224 DELETE FROM sqlite_sequence WHERE name='streets' 48225 success! 48226 DELETE FROM "crew"; 48227 DELETE FROM sqlite_sequence WHERE name='crew' 48228 success! 48229 DELETE FROM "supervisors"; 48230 DELETE FROM sqlite_sequence WHERE name='supervisors' 48231 success! 48232 DELETE FROM "streets"; 48233 DELETE FROM sqlite_sequence WHERE name='streets' 48234 success! 48235 DELETE FROM "crew"; 48236 DELETE FROM sqlite_sequence WHERE name='crew' 48237 success! -
branches/LCSv2/views/default/submit.html
r623 r624 64 64 startloc.selectedIndex = "0"; 65 65 endloc.selectedIndex = "0"; 66 } 67 /* When a supervisor is selected from the combobox, filter the 68 list of fieldrep (crew) for just those of that supervisor. 69 Note: this function is a near duplicate of routechanged() */ 70 function supervisorchanged() { 71 var e = document.getElementById("supervisorcombo"); 72 var currentSuper = e.options[e.selectedIndex].text; 73 // update the list of crew 74 removeOptions(document.getElementById("fieldrep")); 75 fillCrew(currentSuper); 76 } 77 /* Fill the FieldRep selectbox with items that match supervisor 78 I.e., have the same radio call number. 79 Note: this function is a near duplicate of fillOptions() */ 80 function fillCrew(supervisor) 81 { 82 var i; 83 var tbl = document.getElementById("crewlookup"); 84 var dropdown = document.getElementById("fieldrep") 85 var opt1; 86 87 // Examine all items in crew lookup table 88 for(i = tbl.options.length - 1 ; i >= 0 ; i--) 89 { 90 var item = tbl.options[i].text; 91 // Extract the call num from the lookup table item 92 var currentCallnum = item.substring(0,2); 93 // if the supervisor's call num matches crew call num 94 var superCallnum = supervisor.substring(0,2) 95 if (currentCallnum.startsWith(superCallnum)) 96 { 97 // Add an option to the fieldrep combo box 98 opt1 = document.createElement('option'); 99 opt1.text = opt1.value = item; 100 dropdown.add(opt1,0); 101 } 102 } 103 // Add an empty option to the select box 104 opt1 = document.createElement('option'); 105 opt1.text = opt1.value = ''; 106 dropdown.add(opt1,0); 107 // Show the first (empty) option 108 dropdown.selectedIndex = "0"; 66 109 } 67 110 </script>
Note: See TracChangeset
for help on using the changeset viewer.
