Changeset 540 in tmcsimulator for trunk

Timestamp:

12/06/2019 03:05:37 PM (6 years ago)

Author:

jdalbey

Message:

Add roles page to EINotebook, version 1. Modified index.html, Event.js, LoadEvents?.js, notebook.js

Location:

trunk/webapps/einotebook

Files:

• index.html (modified) (2 diffs)
• notebook.js (modified) (3 diffs)
• roles (added)
• roles/index.html (added)
• roles/roles.css (added)
• roles/roles.js (added)
• scripts/Event.js (modified) (6 diffs)
• scripts/LoadEvents.js (modified) (2 diffs)

trunk/webapps/einotebook/index.html

@@ -52 +52 @@
              Maps
             </li>
+            <li class="notActive" id="rolesTab" 
+                onClick="changeTab(this.id); showContent('rolePageContent')">
+             Roles
+            </li>
           </ul><br>
               <div class="simulationTime" id="simulationTime">0:00:00</div>
@@ -80 +84 @@
                     </iframe>
           </td>
+          <td class='tabPageContent' id='rolePageContent' style="display:none;">
+            <iframe id='rolePage' src='roles/index.html' frameborder='0' 
+            scrolling='yes' height='100%' width='100%'>
+                    </iframe>
+                  </td>
             </td>
       </tr>

trunk/webapps/einotebook/notebook.js

@@ -32 +32 @@
    window.frames[1].loadScript(events, incidents);
    window.frames[2].loadScript(events, incidents);
+   window.frames[4].loadRoles(events, incidents);
 }
 
@@ -89 +90 @@
     document.getElementById("currentTab").className = "notActive";
     document.getElementById("mapsTab").className = "notActive";
+    document.getElementById("rolesTab").className = "notActive";
 
     /* Set the selected tab to being active */
@@ -127 +129 @@
     hideContent('currentEventPageContent');
     hideContent('mapsPageContent');    
+    hideContent('rolePageContent');    
     document.getElementById(d).style.display = "block"; 
 }

trunk/webapps/einotebook/scripts/Event.js

@@ -35 +35 @@
     this.normalize = normalize;
         this.focus = focus;
+    this.get_html_headerRow = get_html_headerRow;
         
         //========== private methods ==========//
@@ -159 +160 @@
                            "</table>";
         }
-        
+        /**
+         * @return The html representation of only the header for this event.
+     * Used by Roles page.
+         */
+        function get_html_headerRow()
+        {
+                return "<tr>" +
+                           "<td class='eventHeader' style='background-color:" + this.incident.color + "'" +
+               "id='" + this.eventHeaderID + "'>" + 
+                              this.headerHTML() + "</td>" +
+                           "</tr>";
+        }       
         /**
          * Scrolls the window to this Event.
@@ -181 +193 @@
         {
                 this.highlighted = true;
+        if (events.doc.getElementById(this.eventHeaderID) != null)
+        {
                 events.doc.getElementById(this.eventHeaderID).style.borderColor = "blue";
                 events.doc.getElementById(this.eventHeaderID).style.backgroundColor = "yellow";
@@ -196 +210 @@
                         events.doc.getElementById(this.dataID).style.border = "none";
                 }
-        
+        }
         }
         
@@ -206 +220 @@
         {
                 this.highlighted = false;
-                events.doc.getElementById(this.eventHeaderID).style.backgroundColor = "white";
-                events.doc.getElementById(this.eventHeaderID).style.borderColor = "gainsboro";
-                events.doc.getElementById(this.eventHeaderID).style.color = "gray";
-                events.doc.getElementById(this.dataID).style.border = "0px solid red";
-                events.doc.getElementById(this.dataID).style.backgroundColor = "white";
-                events.doc.getElementById(this.dataID).style.color = "gray";
+        if (events.doc.getElementById(this.eventHeaderID) != null)
+        {
+            events.doc.getElementById(this.eventHeaderID).style.backgroundColor = "white";
+            events.doc.getElementById(this.eventHeaderID).style.borderColor = "gainsboro";
+            events.doc.getElementById(this.eventHeaderID).style.color = "gray";
+            events.doc.getElementById(this.dataID).style.border = "0px solid red";
+            events.doc.getElementById(this.dataID).style.backgroundColor = "white";
+            events.doc.getElementById(this.dataID).style.color = "gray";
+        }
         }
         /**
@@ -219 +236 @@
         {
         var myColor = this.incident.color;
-                events.doc.getElementById(this.eventHeaderID).style.backgroundColor = "white";
-                events.doc.getElementById(this.eventHeaderID).style.borderColor = "black";
-                events.doc.getElementById(this.eventHeaderID).style.color = "black";
-                events.doc.getElementById(this.dataID).style.color = "black";
-        events.doc.getElementById(this.dataID).style.backgroundColor = myColor;
-                events.doc.getElementById(this.eventHeaderID).style.backgroundColor = myColor;
+        // On the Roles page, we don't list every event, so some will be null
+        // This check will make sure we don't try to normalize non-existing events
+        if (events.doc.getElementById(this.eventHeaderID) != null)
+        {
+            events.doc.getElementById(this.eventHeaderID).style.backgroundColor = "white";
+            events.doc.getElementById(this.eventHeaderID).style.borderColor = "black";
+            events.doc.getElementById(this.eventHeaderID).style.color = "black";
+            events.doc.getElementById(this.dataID).style.color = "black";
+            events.doc.getElementById(this.dataID).style.backgroundColor = myColor;
+            events.doc.getElementById(this.eventHeaderID).style.backgroundColor = myColor;
+        }
     }           
 

trunk/webapps/einotebook/scripts/LoadEvents.js

@@ -74 +74 @@
                         break;
                     case "TELEPHONE": 
-                        telProp = new Evaluation("TELEPHONE CONVERSATION", 
+                        telProp = new Property("TELEPHONE CONVERSATION", 
                                  parseTelephone(currEvt.childNodes[child]) );  
-                        evalarray.push(telProp);
+                        proparray.push(telProp);
                         break;
                     case "CHP_RADIO": 
@@ -156 +156 @@
         if (element.childNodes[child].localName != undefined)
         {
+            // IF line is INSTRUCTOR THEN display only the Role field
             if (element.childNodes[child].localName == "INSTRUCTOR")
             {
                 result.push(element.childNodes[child].attributes["Role"].value);
             }
-            else
+            else  // Display the name (e.g., STUDENT)
             {
                 result.push(element.childNodes[child].localName);