Changeset 551 in tmcsimulator for trunk/webapps/common

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

Files:

• js/displayutils.js (modified) (1 diff)
• js/fileutils.js (modified) (1 diff)
• js/revision_number.dat (modified) (1 diff)
• unifiedlog.css (added)

trunk/webapps/common/js/displayutils.js

@@ -14 +14 @@
 }
 
+// Load a CSV file and convert to a string of formatted HTML
+// @param filename the file containing the CSV input
+// @param targetDiv the div element in which the HTML should be placed.
+function loadLog(filename, targetDiv)
+{
+    // Asynchronous file read of unified log data
+    loadJSON("dynamicdata/" + filename, function(response)
+    {
+        // Format the csv data into an HTML table
+        var allRows = response.split(/\r?\n|\r/);
+        var table = '<table>';
+        // Put the last log entry at the TOP of the table
+        for (var singleRow = allRows.length-1; singleRow >= 0; singleRow--)
+        {
+            var rowCells = allRows[singleRow].split(',');
+            var msg_type = ""; // color white is default
+
+            // trimming white space in the type field 
+            // ingore the empty line 
+            if (rowCells.length > 1) 
+            {
+                rowCells[1] = rowCells[1].trim();
+            }
+            var label = String(rowCells[1]);
+            var info = String(rowCells[3]).trim();
+            // Implement ticket #190 
+            // Checking for the type of logging information 
+            if (label.startsWith("CAD")) {
+                msg_type = "class=\"CAD\"";
+                if (info.startsWith("Detail")) {
+                    msg_type = "class=\"CADdetail\"";
+                }
+            } else if (label.startsWith("Activity")) {
+                msg_type = "class=\"Activity\"";
+            //} else if (rowCells[1] == "CMS Activated.") {
+            } else if (label.startsWith("CMS")) {
+                msg_type = "class=\"CMS\"";
+            } else if (label.startsWith("Eval")) {
+                msg_type = "class=\"Evaluation\"";
+            } 
+
+            // add the message type class to that row 
+            table += '<tr ' + msg_type + '>';
+            for (var rowCell = 0; rowCell < rowCells.length; rowCell++)
+            {
+                table += '<td>';
+                table += rowCells[rowCell];
+                table += '</td>';
+            }
+            table += '</tr>';
+        }
+        table += '</table>';
+        targetDiv.innerHTML = table;
+    }
+    );
+}

trunk/webapps/common/js/fileutils.js

@@ -1 @@
-    // Load the dynamic json file for highways, etc.
-    // Ref: https://codepen.io/KryptoniteDove/post/load-json-file-locally-using-pure-javascript
-    function loadJSON(inFile, callback)
+// Load the dynamic json file for highways, etc.
+// Ref: https://codepen.io/KryptoniteDove/post/load-json-file-locally-using-pure-javascript
+function loadJSON(inFile, callback)
+{
+    var xobj = new XMLHttpRequest();
+    // Assume XML unless filename ends with .json
+    if (inFile.endsWith(".json"))
     {
-        var xobj = new XMLHttpRequest();
-        // Assume XML unless filename ends with .json
-        if (inFile.endsWith(".json"))
+        xobj.overrideMimeType("application/json");
+    }
+    if (inFile.endsWith(".csv"))
+    {
+        xobj.overrideMimeType("text/csv");
+    }
+    xobj.open('GET', inFile, true);
+    xobj.onreadystatechange = function()
+    {
+        if (xobj.readyState == 4 && xobj.status == "200")
         {
-            xobj.overrideMimeType("application/json");
+            callback(xobj.responseText);
         }
-        if (inFile.endsWith(".csv"))
-        {
-            xobj.overrideMimeType("text/csv");
-        }
-        xobj.open('GET', inFile, true);
-        xobj.onreadystatechange = function()
-        {
-            if (xobj.readyState == 4 && xobj.status == "200")
-            {
-                callback(xobj.responseText);
-            }
-        };
-        // We want ajax to ignore any cached responses
-        xobj.setRequestHeader('If-Modified-Since', 'Sat, 01 Jan 2000 01:01:01 GMT')
-        xobj.send(null);
+    };
+    // We want ajax to ignore any cached responses
+    xobj.setRequestHeader('If-Modified-Since', 'Sat, 01 Jan 2000 01:01:01 GMT')
+    xobj.send(null);
+}
+
+/* Retrieve URL parameters passed to a web page
+   @return a dictionary of key/value pairs
+*/
+function getQueryParms()
+{
+    var items = {};
+    var query = window.location.search.substring(1);
+    var parms = query.split("&");
+    // Examine each parameter
+    for (var i = 0, max = parms.length; i < max; i++)
+    {
+        // check for trailing & with no param
+        if (parms[i] === "") 
+            continue; // skip it
+
+        var param = parms[i].split("=");
+        // If it's valid add it to dictionary
+        items[decodeURIComponent(param[0])] = decodeURIComponent(param[1] || "");
     }
-
+    return items
+}

trunk/webapps/common/js/revision_number.dat

@@ -1 +1 @@
 
-    var revisionNumber = "540";
+    var revisionNumber = "549";