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

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/scripts

Files:

• Evaluation.js (modified) (3 diffs)
• Event.js (modified) (3 diffs)

trunk/webapps/einotebook/scripts/Evaluation.js

@@ -10 +10 @@
     
     //========== public constants ==========//
+    this.ratingQualities = ["", "Worst","Poor","Average","Good","Best"];
     this.id = Evaluation.id;
     this.ratingGroupName = "evaluationGroup" + this.id;    
@@ -75 +76 @@
 
         this.rating = givenRating;
-
-        console.log(this.ratingGroupName + " recordRating of " + this.rating )
+        //console.log(this.ratingGroupName + " recordRating of " + this.rating )
     }
 
@@ -103 +103 @@
                "<table align='right' class='evaluationScale'>" +
                "<tr>" +
-               "<td class='eventRadioButtonSmallScale'>Best</td>" +
-               "<td class='eventRadioButtonSmallScale'>Good</td>" +
-               "<td class='eventRadioButtonSmallScale'>Average</td>" +
-               "<td class='eventRadioButtonSmallScale'>Poor</td>" +
-               "<td class='eventRadioButtonSmallScale'>Worst</td>" +
+               "<td class='eventRadioButtonSmallScale'>"+this.ratingQualities[5]+"</td>" +
+               "<td class='eventRadioButtonSmallScale'>"+this.ratingQualities[4]+"</td>" +
+               "<td class='eventRadioButtonSmallScale'>"+this.ratingQualities[3]+"</td>" +
+               "<td class='eventRadioButtonSmallScale'>"+this.ratingQualities[2]+"</td>" +
+               "<td class='eventRadioButtonSmallScale'>"+this.ratingQualities[1]+"</td>" +
                "</tr>" +
                "<tr>" +

trunk/webapps/einotebook/scripts/Event.js

@@ -178 +178 @@
         function focus()
         {
-                /* This method was discarded because it moved the scroll bar of the parent of
+                /* This next 3 lines were discarded because it moved the scroll bar of the parent of
                  * the given window in addition to the scroll bar of the given window..
                 var positionOfPound = window.location.indexOf("#");
@@ -184 +184 @@
                 window.location = rootLocation + "#" + eventAnchorName;
                 */
-                events.win.scrollTo(0, absoluteTop(events.doc.getElementById(this.eventHeaderID)));
+                events.win.scrollTo(0, absoluteTop(events.doc.getElementById(this.eventHeaderID)));
         }
         
@@ -195 +195 @@
         if (events.doc.getElementById(this.eventHeaderID) != null)
         {
-                events.doc.getElementById(this.eventHeaderID).style.borderColor = "blue";
+                events.doc.getElementById(this.eventHeaderID).style.borderColor = "blue";
                 events.doc.getElementById(this.eventHeaderID).style.backgroundColor = "yellow";
                 events.doc.getElementById(this.eventHeaderID).style.color = "black";