Changeset 551 in tmcsimulator for trunk/webapps/einotebook/roles


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/einotebook/roles
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/webapps/einotebook/roles/index.html

    r548 r551  
    99    <script type="text/javascript" src="roles.js"></script>  
    1010    <script type="text/javascript" src="../scripts/cookies.js"></script> 
    11     <title>Script</title> 
     11    <title>Roles</title> 
    1212  </head> 
    1313  <body> 
    1414    
    15     <button class="jumpToCurrentEvent"  
    16             onclick="jumpToLastExecutedEvent()">Jump to Current Event</button> 
     15    <!--button class="jumpToCurrentEvent"  
     16            onclick="jumpToLastExecutedEvent()">Jump to Current Event</button--> 
    1717    <!-- A combo box for which role is to be displayed on the page --> 
    1818    <select id="desiredRole" onchange="changeRole()"> 
    … …  
    2222      <option value="CHP RADIO">CHP RADIO</option> 
    2323    </select> 
    24     <iframe id='view' src='../script/scrollframe.html' frameborder='0' scrolling='yes' 
     24    <iframe id='rolesview' src='../script/scrollframe.html' frameborder='0' scrolling='yes' 
    2525            width='100%'></iframe> 
    2626 

  • trunk/webapps/einotebook/roles/roles.js

    r540 r551  
    4949function highlightLatestEvent()  
    5050{ 
     51    // workaround for defect #212 is disable this function 
     52    return;  
     53 
    5154    Roles.events.setEmphasis();  // Set text colors on all events 
    5255 
    … …  
    6972        Roles.incidents = theIncidents; 
    7073        Roles.events = theEvents; 
    71         Roles.events.win = document.getElementById("view").contentWindow; 
    72         Roles.events.doc = getDocumentFromFrame('view'); 
     74    // workaround for defect #212 is delete these two lines so they don't conflict 
     75    //   with the Scripts.events.win 
     76        //Roles.events.win = document.getElementById("view").contentWindow; 
     77        //Roles.events.doc = getDocumentFromFrame('view'); 
    7378    // reset SELECT box to default value 
    7479    document.getElementById("desiredRole").value = "TELEPHONE CONVERSATION"; 
    … …  
    108113         
    109114        // display events in iframe 
    110         getDocumentFromFrame('view').body.innerHTML = html;      
     115        getDocumentFromFrame('rolesview').body.innerHTML = html;         
    111116    
    112117        // resize iframe to appropriate height 
    … …  
    150155{ 
    151156    var height = document.documentElement.clientHeight; 
    152     height -= pageY(document.getElementById('view')); 
     157    height -= pageY(document.getElementById('rolesview')); 
    153158    height = (height < 0) ? 0 : height - 10; 
    154     document.getElementById('view').style.height = height + 'px'; 
     159    document.getElementById('rolesview').style.height = height + 'px'; 
    155160} 
    156161 
Note: See TracChangeset for help on using the changeset viewer.