Insert element for jobs not yet started due to unavailable sensor(s)

cwilling · cwilling · commit 6a33e6de7e2f · 2017-10-29T21:18:32.000+10:00
diff --git a/src/scripts/modules/gpioworker.js b/src/scripts/modules/gpioworker.js
@@ -828,7 +828,7 @@ gpioWorker.prototype.load_running_jobs = function (msg) {
     });
   }
   var jdata = JSON.stringify({'type':'running_jobs','data':running_jobs});
-  console.log("load_running_jobs() returning: " + jdata);
+  //console.log("load_running_jobs() returning: " + jdata);
   this.output_queue.enqueue(jdata);
 };
 
diff --git a/src/scripts/status.js b/src/scripts/status.js
@@ -40,6 +40,7 @@ var profileOwner;
 /* Save JobHistory data here */
 var historyData = {};
 var runningData = {};
+var unStartedJobs = [];
 
 /*
   Running, stopped, suspended etc.
@@ -1163,20 +1164,31 @@ window.onload = function () {
 
     var longJobNames = [];
     data.forEach( function (job, index) {
-
       console.log("createRunningJobsList() handling job: " + index);
+
+      var longName;
       if (job['waiting']) {
-        console.log("Job waiting: " + JSON.stringify(job));
-        console.log("Job waiting: " + Object.keys(job));
-        console.log(job['jobData'].jobName + "-" + job['jobData'].jobInstance + " is waiting.");
-        console.log(job['jobData'].jobName + "-" + job['jobData'].jobInstance + " is waiting. Needs " + JSON.stringify(job['jobData'].jobSensorIds));
+        longName = job['jobData'].jobName + "-" + job['jobData'].jobInstance;
+
+        //console.log("Job waiting: " + JSON.stringify(job));
+        //console.log("Job waiting: " + Object.keys(job));
+        //console.log(job['jobData'].jobName + "-" + job['jobData'].jobInstance + " is waiting.");
+        //console.log(job['jobData'].jobName + "-" + job['jobData'].jobInstance + " is waiting. Needs " + JSON.stringify(job['jobData'].jobSensorIds));
+
+        // Add this job to unStartedJobs list
+        unStartedJobs[longName] = job;
+
       } else {
         var header = job['header'];
         var updates = job['updates'];
-        var longName = header['jobName'] + '-' + header['jobInstance'];
         var saveData = {};
 
-        console.log("Creating listing for job: " + index + " (" + longName + ")");
+        longName = header['jobName'] + '-' + header['jobInstance'];
+
+        // If previously unstarted, remove it from list
+        if (unStartedJobs[longName]) delete unStartedJobs[longName];
+
+        console.log("Creating listing for running job: " + index + " (" + longName + ")");
         longJobNames.push(longName);
 
         // Save the data for later use. It should consist of two arrays,
@@ -1185,10 +1197,9 @@ window.onload = function () {
         saveData['header'] = [header];
         saveData['updates'] = updates;
         runningData[longName] = saveData;
-        //console.log("XXX " + JSON.stringify(runningData[longName]));
-        console.log("ZZZ");
-        updateJobsList(longJobNames, 'running_jobsHolder');
       }
+      //console.log("ZZZ");
+      updateJobsList(longJobNames, 'running_jobsHolder');
     });
   }
 
@@ -1975,6 +1986,35 @@ window.onload = function () {
       }
     });
 
+    /*
+      Before drawing the running jobs, look for any non starters 
+      (perhaps due to unavailability of a required sensor)
+      and set up a notification.
+    */
+    var unStartedJobsKeys = Object.keys(unStartedJobs);
+    //console.log("unstarted job(s): " + unStartedJobsKeys);
+
+    unStartedJobsKeys.forEach( function (key) {
+      //console.log("Advising of unstarted job: " + key + " --- " + JSON.stringify(unStartedJobs[key]));
+
+      var sensorIds = unStartedJobs[key]['jobData'].jobSensorIds;
+      //console.log("Needs sensor" + (sensorIds.length>1?"s":"") + ": " + sensorIds);
+
+      var jobElement = document.createElement('DIV');
+      jobElement.id = 'jobElement_' + key;
+      jobElement.className = 'jobCantStart';
+
+      var jobItemName = document.createElement('DIV');
+      jobItemName.id = 'jobItemName_' + i;
+      jobItemName.className = 'jobCantStartName';
+      jobItemName.innerHTML = "<html>Job " + key + " can't start yet. Needs sensor" + (sensorIds.length>1?"s":"") + ": " + sensorIds + "</html>";
+
+      jobElement.appendChild(jobItemName);
+      jobsListHolder.appendChild(jobElement);
+    });
+
+    /* Now the jobs running normally
+    */
     for (var i=0;i<jobFiles.length;i++) {
       //console.log("              " + jobFiles[i]);
       // Extract some identifiers from the filename
diff --git a/styles/brewable.css b/styles/brewable.css
@@ -270,7 +270,7 @@ div#sensor_updateHolder {
 .isp_sensor_update {
     display:    flex;
     flex-direction: column;
-    alilgn-items: center;
+    align-items: center;
     justify-content: center;
 
     display:    -webkit-flex;
@@ -300,7 +300,7 @@ div#sensor_updateHolder {
 /* isp_sensor_overlay_title */
 .isp_sol_title {
     display:    flex;
-    alilgn-items: center;
+    align-items: center;
     justify-content: center;
 
     display:    -webkit-flex;
@@ -314,7 +314,7 @@ div#sensor_updateHolder {
 /* isp_sensor_overlay_detail */
 .isp_sol_detail {
     display:    flex;
-    alilgn-items: center;
+    align-items: center;
     justify-content: center;
 
     display:    -webkit-flex;
@@ -998,6 +998,35 @@ div#jobComposer {
     border-radius: 4px;
     direction:  ltr;
 }
+.jobCantStart {
+    display:    flex;
+    align-items: center;
+    justify-content: center;
+
+    display:            -webkit-flex;
+    -webkit-align-items: center;
+    -webkit-justify-content: center;
+
+    height:     40px;
+    margin:     3px;
+    border:	1px solid #000;
+    border-radius: 4px;
+    direction:  ltr;
+    background:	#dc7676;
+}
+.jobCantStartName {
+    display:    flex;
+    align-items: center;
+    justify-content: center;
+
+    display:    -webkit-flex;
+    -webkit-align-items: center;
+    -webkit-justify-content: center;
+
+    margin-left: 2px;
+    padding:    0 1em;
+    height:     36px;
+}
 .jobElementGraph {
     direction:  ltr;
     border-bottom: 1px solid #000;

Original file line number	Diff line number	Diff line change
`@@ -828,7 +828,7 @@ gpioWorker.prototype.load_running_jobs = function (msg) {`
`828`	`828`	`});`
`829`	`829`	`}`
`830`	`830`	`var jdata = JSON.stringify({'type':'running_jobs','data':running_jobs});`
`831`		`- console.log("load_running_jobs() returning: " + jdata);`
	`831`	`+ //console.log("load_running_jobs() returning: " + jdata);`
`832`	`832`	`this.output_queue.enqueue(jdata);`
`833`	`833`	`};`
`834`	`834`