Changeset 515 in tmcsimulator for trunk/webapps

Timestamp:

11/08/2019 11:49:12 AM (6 years ago)

Author:

jdalbey

Message:

Event.js, Incident.js, Incidents.js, LoadEvents?.js modified to implement ticket #158: color coding incidents.

Location:

trunk/webapps/einotebook/scripts

Files:

• Event.js (modified) (3 diffs)
• Incident.js (modified) (2 diffs)
• Incidents.js (modified) (2 diffs)
• LoadEvents.js (modified) (1 diff)

trunk/webapps/einotebook/scripts/Event.js

@@ -146 +146 @@
         function html()
         {
-        //console.log("building html for event: ", this.eventHeaderID, incidentColor[this.incident.number]);
+        //console.log("building html for event: ", this.eventHeaderID, this.incident.color); //incidentColor[this.incident.number]);
 
                 return "<table class='event'>" +
                            "<tr>" +
-                           "<td class='eventHeader' style='background-color:" + incidentColor[this.incident.number] + "'" +
+                           "<td class='eventHeader' style='background-color:" + this.incident.color + "'" +
                "id='" + this.eventHeaderID + "'>" + 
                               this.headerHTML() + "</td>" +
                            "</tr>" +
                            "<tr>" + 
-                           "<td class='eventData' style='background-color:" + incidentColor[this.incident.number] + "' id='" + this.dataID + "'>" + 
+                           "<td class='eventData' style='background-color:" + this.incident.color + "' id='" + this.dataID + "'>" + 
                            (this.expanded ? this.dataHTML() : "") + 
                            "</td>" +
@@ -187 +187 @@
                 events.doc.getElementById(this.eventHeaderID).style.color = "black";
                 events.doc.getElementById(this.dataID).style.color = "black";
-        events.doc.getElementById(this.dataID).style.backgroundColor = incidentColor[this.incident.number];
+        events.doc.getElementById(this.dataID).style.backgroundColor = this.incident.color;
                 
                 // IF this event is expanded THEN
@@ -220 +220 @@
         function normalize()
         {
-        var myColor = incidentColor[this.incident.number];
+        var myColor = this.incident.color;
                 events.doc.getElementById(this.eventHeaderID).style.backgroundColor = "white";
                 events.doc.getElementById(this.eventHeaderID).style.borderColor = "black";

trunk/webapps/einotebook/scripts/Incident.js

@@ -6 +6 @@
  * @param summary {String}
  */
-function Incident(time, number, title, summary)
+function Incident(time, number, title, summary, color)
 {       
         //========== public read-only members ==========//
@@ -13 +13 @@
         this.title = title;
         this.summary = summary;
-        this.expanded = true;
+    this.color = color;  /* hex color code for background of this incident */
         
         //========== public methods ==========//

trunk/webapps/einotebook/scripts/Incidents.js

@@ -7 +7 @@
 //========== public members ==========/
 incidents.doc = null;
+incidents.colorpallette = [
+"#d8f0f3",        // PowderBlue
+"#dfecdf",        // DarkSeaGreen
+"#fff5cc",        // CornSilk
+"#ffe8e6",        // MistyRose
+"#ffffcc",       // Dark Orange
+"#d8f0f3" ];
 
 //========== public methods ==========//
 incidents.get = incidents_get;
+incidents.collapseAll = incidents_collapseAll;
+incidents.expandAll = incidents_expandAll;
 incidents.add = incidents_add;
+incidents.size = incidents_size;
 
 //=========== method definitions ==========//
@@ -34 +44 @@
         return incident;
 }
+/**
+ * Accessor to the number of incidents
+*/
+function incidents_size()
+{
+    return this.length;
+}
+
+/**
+ * Collapses each Incident.
+ */
+function incidents_collapseAll()
+{
+        // FOR each incident
+        for (var i = 0; i < this.length; i++)
+        {
+                // IF the incident is expanded THEN
+                if (this[i].expanded)
+                {
+                        // collapse incident
+                        this[i].expandAction();
+                }
+        }
+}
+
+/**
+ * Expands each incident.
+ */
+function incidents_expandAll()
+{
+        // FOR each incident
+        for (var i = 0; i < this.length; i++)
+        {
+                // IF incident is collapsed THEN
+                if (!this[i].expanded)
+                {
+                        // expand incident
+                        this[i].expandAction();
+                }
+        }
+}
 
 /**

trunk/webapps/einotebook/scripts/LoadEvents.js

@@ -42 +42 @@
                         if (incidents.get(incidentNum) == undefined)
                         {
+                            // prepare title field
                             incidentTitle =  currEvt.childNodes[child].textContent;
+                            // select a color from the pallette
+                            var palletteSize = incidents.colorpallette.length;
+                            var currColor = incidents.colorpallette[incidents.size()]; // modulo palleteSize
                             // Construct the incident
-                            var theIncident = new Incident(evtTime, incidentNum, incidentTitle, "");
+                            var theIncident = new Incident(evtTime, incidentNum, incidentTitle, "", currColor);                        
                             // Add the incident to the list of incidents
                             incidents.add(theIncident);