Changeset 426 in tmcsimulator for trunk/webapps/cptms

Timestamp:

06/26/2019 02:00:51 PM (7 years ago)

Author:

jdalbey

Message:

cmsLayer.js, harLayer.js updated to fix #107.

Location:

trunk/webapps/cptms

Files:

• index.html (modified) (1 diff)
• js/cmsLayer.js (modified) (6 diffs)
• js/harLayer.js (modified) (1 diff)

trunk/webapps/cptms/index.html

@@ -120 +120 @@
     var placePins = [];
     // the cms message local dictionary
-    var messageDict = {}; 
+    var CMSmessageDict = {}; 
     // the har message local dictionary
     var HARmessageDict = {}; 

trunk/webapps/cptms/js/cmsLayer.js

@@ -98 +98 @@
     {
         // recover the user's response
-        var response1 = justifyCMStext(document.getElementById('msgcontent1').value.trim());
-        var response2 = justifyCMStext(document.getElementById('msgcontent2').value.trim());
-        var response3 = justifyCMStext(document.getElementById('msgcontent3').value.trim());
-        var response4 = justifyCMStext(document.getElementById('msgcontent4').value.trim());
-        var response5 = justifyCMStext(document.getElementById('msgcontent5').value.trim());
-        var response6 = justifyCMStext(document.getElementById('msgcontent6').value.trim());
+        var response1 = document.getElementById('msgcontent1').value.trim();
+        var response2 = document.getElementById('msgcontent2').value.trim();
+        var response3 = document.getElementById('msgcontent3').value.trim();
+        var response4 = document.getElementById('msgcontent4').value.trim();
+        var response5 = document.getElementById('msgcontent5').value.trim();
+        var response6 = document.getElementById('msgcontent6').value.trim();
         var newMsg = response1 + response2 + response3 + response4 + response5 + response6;
         if (newMsg.length == 0)
@@ -111 +111 @@
         else
         {
-            document.getElementById('msgdisplay1').value = response1;
-            document.getElementById('msgdisplay2').value = response2;
-            document.getElementById('msgdisplay3').value = response3;
-            document.getElementById('msgdisplay4').value = response4;
-            document.getElementById('msgdisplay5').value = response5;
-            document.getElementById('msgdisplay6').value = response6;
+            document.getElementById('msgdisplay1').value = justifyCMStext(response1);
+            document.getElementById('msgdisplay2').value = justifyCMStext(response2);
+            document.getElementById('msgdisplay3').value = justifyCMStext(response3);
+            document.getElementById('msgdisplay4').value = justifyCMStext(response4);
+            document.getElementById('msgdisplay5').value = justifyCMStext(response5);
+            document.getElementById('msgdisplay6').value = justifyCMStext(response6);
             saveCMSMessage(response1 + "|" + response2 + "|" + response3 + "|" +
                         response4 + "|" + response5 + "|" + response6);
@@ -139 +139 @@
         var cmsID = document.getElementById('cmsID').value;
         msgParts = outMessage.split("|");
-        messageDict[cmsID].cms.message.phase1.Line1 = msgParts[0];
-        messageDict[cmsID].cms.message.phase1.Line2 = msgParts[1];
-        messageDict[cmsID].cms.message.phase1.Line3 = msgParts[2];
-        messageDict[cmsID].cms.message.phase2.Line1 = msgParts[3];
-        messageDict[cmsID].cms.message.phase2.Line2 = msgParts[4];
-        messageDict[cmsID].cms.message.phase2.Line3 = msgParts[5];
+        CMSmessageDict[cmsID].cms.message.phase1.Line1 = msgParts[0];
+        CMSmessageDict[cmsID].cms.message.phase1.Line2 = msgParts[1];
+        CMSmessageDict[cmsID].cms.message.phase1.Line3 = msgParts[2];
+        CMSmessageDict[cmsID].cms.message.phase2.Line1 = msgParts[3];
+        CMSmessageDict[cmsID].cms.message.phase2.Line2 = msgParts[4];
+        CMSmessageDict[cmsID].cms.message.phase2.Line3 = msgParts[5];
         // Check if there was any messages to save and
         // Set icon to reflect message state
@@ -156 +156 @@
         }
         cmsLayer.overrideStyle(cmsLayer.getFeatureById(cmsID), currentIcon);
-        // break the json string into lines for readability
-        jsonstring = JSON.stringify(Object.values(messageDict)); //Can't use these in GET parameter  ,null,4);
-        outString = "{\"data\":" + jsonstring + "}";
-        //console.log("outString = " + outString);
-        //var xhttp = new XMLHttpRequest();
-        //xhttp.open("GET", "../cgi-bin/saveCMSmessage.py?msg=" + outString, true);
-        //xhttp.send();
-        //console.log("status code: " + xhttp.status);
+        // Examine each message in the dict and convert to json format
+        var lineOut = "";
+        for (var id in CMSmessageDict)
+        {
+            // convert and append to output string
+            lineOut += JSON.stringify(CMSmessageDict[id]) + ',\n';
+        }
+        // remove trailing comma
+        lineOut = lineOut.substring(0,lineOut.length-2);
+        outString = "{\"data\":[\n" + lineOut + "\n]}";
+
         // Using POST to send the data 
         var xhr = new XMLHttpRequest();
@@ -177 +180 @@
         loadAllcmsMessages();  // because someone else may have made a recent update
         // lookup the message for this cms ID
-        var message = messageDict[cmsID].cms.message;
+        var message = CMSmessageDict[cmsID].cms.message;
         // show the message in the display
-        document.getElementById('msgdisplay1').value = message.phase1.Line1;
-        document.getElementById('msgdisplay2').value = message.phase1.Line2;
-        document.getElementById('msgdisplay3').value = message.phase1.Line3;
-        document.getElementById('msgdisplay4').value = message.phase2.Line1;
-        document.getElementById('msgdisplay5').value = message.phase2.Line2;
-        document.getElementById('msgdisplay6').value = message.phase2.Line3;
+        document.getElementById('msgdisplay1').value = justifyCMStext(message.phase1.Line1);
+        document.getElementById('msgdisplay2').value = justifyCMStext(message.phase1.Line2);
+        document.getElementById('msgdisplay3').value = justifyCMStext(message.phase1.Line3);
+        document.getElementById('msgdisplay4').value = justifyCMStext(message.phase2.Line1);
+        document.getElementById('msgdisplay5').value = justifyCMStext(message.phase2.Line2);
+        document.getElementById('msgdisplay6').value = justifyCMStext(message.phase2.Line3);
     }
     function loadAllcmsMessages()
@@ -196 +199 @@
             {
                 var item = messagejson.data[i];
-                messageDict[item.cms.index] = item;
+                CMSmessageDict[item.cms.index] = item;
                 // Set the appropriate icon on the cms icon
                 // set a yellow flag if there's currently no message

trunk/webapps/cptms/js/harLayer.js

@@ -113 +113 @@
         }
         harLayer.overrideStyle(harLayer.getFeatureById(harID), currentIcon)
-        // convert messasge to json string 
-        jsonstring = JSON.stringify(Object.values(HARmessageDict));
-        outString = "{\"data\":" + jsonstring + "}";
 
-        //var xhttp = new XMLHttpRequest();
-        //xhttp.open("GET", "../cgi-bin/saveHARmessage.py?msg=" + outString, true);
-        //xhttp.send();
+        // Examine each message in the dict and convert to json format
+        var lineOut = "";
+        for (var id in HARmessageDict)
+        {
+            // convert and append to output string
+            lineOut += JSON.stringify(HARmessageDict[id]) + ',\n';
+        }
+        // remove trailing comma
+        lineOut = lineOut.substring(0,lineOut.length-2);
+        outString = "{\"data\":[\n" + lineOut + "\n]}";
+
         // Using POST to send the data 
         var xhr = new XMLHttpRequest();