Changeset 551 in tmcsimulator for trunk/webapps/dynamicdata


Ignore:
Timestamp:
12/26/2019 03:14:52 PM (6 years ago)
Author:
jdalbey
Message:

Multi-file commit to implement saving evaluation ratings from einotebook to a log file and merging with unified log. Also fix defect #212. cgi-bin/saveEvals.py cgi-bin/saveRatingsToLog.py common/js/displayutils.js common/js/fileutils.js common/js/revision_number.dat common/unifiedlog.css dynamicdata/CADcomments.log dynamicdata/caddetails.csv dynamicdata cms_messages.json dynamicdata/har_messages.json dynamicdata highway_status.json dynamicdata/ratings.csv dynamicdata/unifiedlog.csv dynamicdata/unifiedlog_final.csv einotebook/roles/index.html einotebook roles/roles.js einotebook/script/index.html einotebook/script scrollframe.js einotebook/scripts/Evaluation.js einotebook/scripts/Event.js mergelogs.bash unifiedlogdisplay.html unifiedlogmonitor.html

Location:
trunk/webapps/dynamicdata
Files:
3 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/webapps/dynamicdata/CADcomments.log

    r547 r551  
    1 CAD log, Simulation Started at 7 Dec 2019 09:20:08 with incidents 100 187 188 189 190 191  
     1CAD Log, Simulation Started at 26 Dec 2019 16:40:07 with incidents 100 187 188 189 190 191  
     2CAD Log, Incident #187, Jose Trainee: HELLO TMC WORLD 
     3CAD Log, Incident #187, Jose Trainee: SEND ICE CREAM 
     4CAD Log, Simulation Paused. 

  • trunk/webapps/dynamicdata/cms_messages.json

    r463 r551  
    4949{"cms":{"index":"84","message":{"displayTime":"","phase1":{"Line1":"","Line2":"","Line3":""},"phase2":{"Line1":"","Line2":"","Line3":""}}}}, 
    5050{"cms":{"index":"85","message":{"displayTime":"","phase1":{"Line1":"","Line2":"","Line3":""},"phase2":{"Line1":"","Line2":"","Line3":""}}}}, 
    51 {"cms":{"index":"86","message":{"displayTime":"","phase1":{"Line1":"AAAAAA","Line2":"","Line3":""},"phase2":{"Line1":"","Line2":"","Line3":""}}}}, 
     51{"cms":{"index":"86","message":{"displayTime":"","phase1":{"Line1":"","Line2":"","Line3":""},"phase2":{"Line1":"","Line2":"","Line3":""}}}}, 
    5252{"cms":{"index":"87","message":{"displayTime":"","phase1":{"Line1":"","Line2":"","Line3":""},"phase2":{"Line1":"","Line2":"","Line3":""}}}}, 
    5353{"cms":{"index":"88","message":{"displayTime":"","phase1":{"Line1":"","Line2":"","Line3":""},"phase2":{"Line1":"","Line2":"","Line3":""}}}}, 

  • trunk/webapps/dynamicdata/har_messages.json

    r463 r551  
    11{"data":[ 
    22{"har":{"index":"WPMW407 1620 AM","message":{"displayTime":"","phase1":{"Line1":"GOOD NIGHT"}}}}, 
    3 {"har":{"index":"KNNN868 1620 AM","message":{"displayTime":"","phase1":{"Line1":"HELLO WORLD"}}}} 
     3{"har":{"index":"KNNN868 1620 AM","message":{"displayTime":"","phase1":{"Line1":"SAMPLE HAR MESSAGE"}}}} 
    44]} 

  • trunk/webapps/dynamicdata/highway_status.json

    r547 r551  
    47554755       }, 
    47564756   "properties":  
    4757        {"street": "MACARTHU1", "color": "lime", "perpx": "-0.710326", "perpy": "0.703873"} 
     4757       {"street": "MACARTHU1", "color": "red", "perpx": "-0.710326", "perpy": "0.703873"} 
    47584758},   
    47594759{ 
    … …  
    47664766       }, 
    47674767   "properties":  
    4768        {"street": "MACARTHU2", "color": "lime", "perpx": "-0.710326", "perpy": "0.703873"} 
     4768       {"street": "MACARTHU2", "color": "red", "perpx": "-0.710326", "perpy": "0.703873"} 
    47694769},   
    47704770{ 
    … …  
    47774777       }, 
    47784778   "properties":  
    4779        {"street": "DYER 1", "color": "lime", "perpx": "0", "perpy": "0"} 
     4779       {"street": "DYER 1", "color": "red", "perpx": "0", "perpy": "0"} 
    47804780},   
    47814781{ 
    … …  
    1204612046       }, 
    1204712047   "properties":  
    12048        {"street": "AIRPORT", "color": "lime", "perpx": "0.321527", "perpy": "0.9469"} 
     12048       {"street": "AIRPORT", "color": "yellow", "perpx": "0.321527", "perpy": "0.9469"} 
    1204912049},   
    1205012050{ 
    … …  
    1205712057       }, 
    1205812058   "properties":  
    12059        {"street": "HOV AT 55N FLYOVER**", "color": "lime", "perpx": "0.271933", "perpy": "0.962316"} 
     12059       {"street": "HOV AT 55N FLYOVER**", "color": "yellow", "perpx": "0.271933", "perpy": "0.962316"} 
    1206012060},   
    1206112061{ 
    … …  
    1206812068       }, 
    1206912069   "properties":  
    12070        {"street": "RED HILL", "color": "lime", "perpx": "0.126754", "perpy": "0.991934"} 
     12070       {"street": "RED HILL", "color": "yellow", "perpx": "0.126754", "perpy": "0.991934"} 
    1207112071},   
    1207212072{ 

  • trunk/webapps/dynamicdata/unifiedlog.csv

    r547 r551  
    1 0:01:17, CMS Activated.,N SR-55  5.38 Baker Street, 'BBBBB:::::' 
    2 0:01:17, CMS Activated.,N I-405 15.18 MAGNOLIA ST, 'SLOW FOR THE::CONE ZONE:ROAD WORK:AHEAD:' 
    3 0:01:17, CMS Activated.,S I-405 12.04 NEW HAMPSHIRE, 'AAAAAA:::::' 
    4 0:01:17, CAD log, Simulation Started,  loaded incidents 100 187 188 189 190 191 
    5 0:01:17, Activity Log.,Ha Khanh Duy,001  Per 32-1 NB rte 405 blocked 
    6 0:01:17, Activity Log.,Gross Angelo,001  HCC NOTIFIED 
    7 0:01:17, Activity Log.,Gross Angelo,001  32-1 Vehicle Disabled S 55@ 405 1308 hours 
    8 0:01:17, Activity Log.,,021 10-98 Assignment Completed 75-1 
    9 0:01:17, Activity Log.,,021 10-98 Let's get pizza. 75-1 
    10 0:01:17, Activity Log.,Bailey Mary,001  Incident Created 
    11 0:01:17, Activity Log.,Hockaday Neil,002  Incident Created 
    12 0:01:17, Activity Log.,Ally Neil,002  Incident Created 
    13 0:01:17, CAD log, Simulation Started,  loaded incidents 100 187 
    14 0:00:05, CAD log, Simulation Started,  loaded incidents 100 187 188 189 190 191 
    15 0:00:10, CAD log, Simulation Paused. 
    16 0:00:12, CAD log, Simulation Started,  loaded incidents 100 187 188 189 190 191 
    17 0:00:05, CAD log, Simulation Started,  loaded incidents 100 187 188 189 190 191 
    18 0:00:25, CAD log, Incident #187, A: HELLO WORLD 
    19 0:00:36, CAD log, Simulation Paused. 
     100:01:18, CMS Activated,N SR-55  5.38 Baker Street, 'BBBBB:::::' 
     200:01:18, CMS Activated,N I-405 15.18 MAGNOLIA ST, 'SLOW FOR THE::CONE ZONE:ROAD WORK:AHEAD:' 
     300:01:18, CAD Log, Simulation Started at 26 Dec 2019 16:40:07 with incidents 100 187 188 189 190 191 
     400:01:18, CAD Log, Incident #187, Jose Trainee: HELLO TMC WORLD 
     500:01:18, Activity Log,Ha Khanh Duy,001  Per 32-1 NB rte 405 blocked 
     600:01:18, Activity Log,Gross Angelo,001  HCC NOTIFIED 
     700:01:18, Activity Log,Gross Angelo,001  32-1 Vehicle Disabled S 55@ 405 1308 hours 
     800:01:18, Activity Log,,021 10-98 Assignment Completed 75-1 
     900:01:18, Activity Log,,021 10-98 Let's get pizza. 75-1 
     1000:01:18, Activity Log,Bailey Mary,001  Incident Created 
     1100:01:18, Activity Log,Hockaday Neil,002  Incident Created 
     1200:01:18, Activity Log,Quan Ally,002  Incident Created 
     1300:01:53, CMS Activated,N SR-73 24.91 North of Jamboree, 'LINES ON ROAD:::::' 
     1400:02:28, CMS Updated, N SR-73 24.91 North of Jamboree, 'SNOW ON ROAD:::::' 
     1500:03:13, CAD Log, Incident #187, Jose Trainee: SEND ICE CREAM 
     1600:03:33, CMS Deactivated, N SR-73 24.91 North of Jamboree 
     1700:04:04, CAD Log, Simulation Paused. 
Note: See TracChangeset for help on using the changeset viewer.