Changeset 373 in tmcsimulator for trunk/webapps

Timestamp:

04/16/2019 10:11:47 AM (7 years ago)

Author:

jdalbey

Message:

Update filenames in code to match dir reorg

Location:

trunk/webapps

Files:

• cgi-bin/saveCMSmessage.py (modified) (1 diff)
• cgi-bin/saveHARmessage.py (modified) (1 diff)
• common/js/displayutils.js (added)
• cptms/js/cmsLayer.js (modified) (1 diff)
• cptms/js/harLayer.js (modified) (1 diff)
• dynamicdata/sim_elapsedtime.json (modified) (1 diff)
• dynamicdata/sim_scriptname.json (deleted)
• einotebook/notebook.js (modified) (1 diff)
• runTimer.py (moved) (moved from trunk/webapps/cptms/runTimer.py) (2 diffs)

trunk/webapps/cgi-bin/saveCMSmessage.py

@@ -11 +11 @@
    
 # write message to file
-text_file = open("cms_messages.json", "w")
+text_file = open("dynamicdata/cms_messages.json", "w")
 text_file.write(outMessage)
 text_file.close()

trunk/webapps/cgi-bin/saveHARmessage.py

@@ -11 +11 @@
    
 # write message to file
-text_file = open("har_messages.json", "w")
+text_file = open("dynamicdata/har_messages.json", "w")
 text_file.write(outMessage)
 text_file.close()

trunk/webapps/cptms/js/cmsLayer.js

@@ -160 +160 @@
         console.log("outString = " + outString);
         var xhttp = new XMLHttpRequest();
-        xhttp.open("GET", "cgi-bin/saveCMSmessage.py?msg=" + outString, true);
+        xhttp.open("GET", "../cgi-bin/saveCMSmessage.py?msg=" + outString, true);
         xhttp.send();
+        console.log("status code: " + xhttp.status);
         // Using POST might be a better idea ... haven't tried this yet
         //      var xhr = new XMLHttpRequest();

trunk/webapps/cptms/js/harLayer.js

@@ -117 +117 @@
 
         var xhttp = new XMLHttpRequest();
-        xhttp.open("GET", "cgi-bin/saveHARmessage.py?msg=" + outString, true);
+        xhttp.open("GET", "../cgi-bin/saveHARmessage.py?msg=" + outString, true);
         xhttp.send();
         // Using POST might be a better idea ... haven't tried this yet

trunk/webapps/dynamicdata/sim_elapsedtime.json

@@ -1 @@
-{"elapsedtime":"24"}
+{"elapsedtime":"519"}

trunk/webapps/einotebook/notebook.js

@@ -118 +118 @@
 {
     /** Load the sim time file and extract the seconds */
-    loadJSON("../sim_elapsedtime.json", function(response)
+    loadJSON("../dynamicdata/sim_elapsedtime.json", function(response)
     {
         try {

trunk/webapps/runTimer.py

@@ -1 +1 @@
 #!/usr/bin/python
 # Run a timer and save it to a file
+# This allows for isolation testing of einotebook without
+# Sim Mgr having to run.
 import time
 from datetime import timedelta
+print "Starting elapsed timer ..."
 count = 0
 while True:
@@ -8 +11 @@
     time.sleep(1)
     count += 1
-    elapsedTime = timedelta(seconds=count)
+    # elapsedTime = timedelta(seconds=count)
     # convert integer into hh:mm:ss format
-    lineout =  "{\"clock\":\"" + str(elapsedTime) + "\"}"
+    lineout =  "{\"elapsedtime\":\"" + str(count) + "\"}"
     
     # write message to file
-    text_file = open("sim_clock.json", "w")
+    text_file = open("dynamicdata/sim_elapsedtime.json", "w")
     text_file.write(lineout)
     text_file.close()
 
-    print count
+    # print count