Index: /trunk/webapps/dynamicdata/evalratings.csv
===================================================================
--- /trunk/webapps/dynamicdata/evalratings.csv	(revision 633)
+++ /trunk/webapps/dynamicdata/evalratings.csv	(revision 637)
@@ -10,2 +10,10 @@
 00:36:00, Evaluation, FACILITATOR, 'Put cones on heads'
 00:36:00, Evaluation, FACILITATOR, 'Prefer chocolate ice cream in the cone'
+00:24:00, Evaluation, RADIO, Poor
+00:24:00, Evaluation, RADIO, 'Forgot  pizza toppings'
+00:25:00, Evaluation, ACTIVITY_LOG, 'User prefers mushrooms over peppers'
+00:25:00, Evaluation, FACILITATOR, 'When out at night, where white'
+00:35:00, Evaluation, ACTIVITY_LOG, 'every good boy does fine'
+00:24:00, Evaluation, FACILITATOR, 'snoopy says go'
+00:24:00, Evaluation, FACILITATOR, 'anything will do'
+00:24:00, Evaluation, FACILITATOR, 'we all scream for ice cream'
Index: unk/webapps/dynamicdata/ratings.csv
===================================================================
--- /trunk/webapps/dynamicdata/ratings.csv	(revision 551)
+++ 	(revision )
@@ -1,2 +1,0 @@
-00:02:00, Evaluation, CAD, Best
-00:02:00, Evaluation, ATMS, Average
Index: /trunk/webapps/einotebook/scripts/Evaluation.js
===================================================================
--- /trunk/webapps/einotebook/scripts/Evaluation.js	(revision 633)
+++ /trunk/webapps/einotebook/scripts/Evaluation.js	(revision 637)
@@ -101,4 +101,6 @@
         + this.text + "'\n"
         postMessage(logString)
+        // Change the text color as feedback to user
+        // events.doc.getElementById(this.textID).style.color = "lightgrey"; 
     }
     
Index: /trunk/webapps/mergelogs.bash
===================================================================
--- /trunk/webapps/mergelogs.bash	(revision 631)
+++ /trunk/webapps/mergelogs.bash	(revision 637)
@@ -14,5 +14,5 @@
 # then sort them by timestamp (reverse chronological).  
 # Final result placed in "unifiedlog_final.csv"
-cat $dir/unifiedlog.csv $dir/caddetails.csv $dir/ratings.csv | sort > $dir/unifiedlog_final.csv
+cat $dir/unifiedlog.csv $dir/caddetails.csv $dir/evalratings.csv | sort > $dir/unifiedlog_final.csv
 
 # 4. Next, launch the webserver and browse to localhost:8080/unifiedlogdisplay.html 
Index: /trunk/webapps/CAD_logviewer_prototype.html
===================================================================
--- /trunk/webapps/CAD_logviewer_prototype.html	(revision 637)
+++ /trunk/webapps/CAD_logviewer_prototype.html	(revision 637)
@@ -0,0 +1,158 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="UTF-8">
+<title>CAD Log Viewer Prototype</title>
+<style>
+body {
+    font-family: Arial;
+    background-color: ivory;
+}
+/* Style the tab */
+.tab {
+  overflow: hidden;
+  border: 1px solid #ccc;
+  background-color: #f1f1f1;
+}
+
+/* Style the buttons inside the tab */
+.tab button {
+  text-decoration: underline;
+  background-color: inherit;
+  float: left;
+  border: 1px solid #ccc;
+  outline: none;
+  cursor: pointer;
+  padding: 14px 16px;
+  transition: 0.3s;
+  font-size: 17px;
+}
+
+/* Change background color of buttons on hover */
+.tab button:hover {
+  background-color: #ddd;
+}
+
+/* Create an active/current tablink class */
+.tab button.active {
+  background-color: #ccc;
+}
+
+/* Style the tab content */
+.tabcontent {
+  display: none;
+  padding: 6px 12px;
+  border: 1px solid #ccc;
+  border-top: none;
+}
+.timestamp {
+  font-family: monospace;
+  font-size: x-large;
+}
+th {
+  text-align: left;
+  background: #f1f1f1;
+}
+tr.d1 {
+	background: white;
+  color: black;
+}
+tr.d2 {
+  background: #f1f1f1;
+  color: black;
+}</style>
+<script  src="../common/js/fileutils.js"></script>
+<script>
+function switchTab(evt, cityName) {
+  var i, tabcontent, tablinks;
+  tabcontent = document.getElementsByClassName("tabcontent");
+  for (i = 0; i < tabcontent.length; i++) {
+    tabcontent[i].style.display = "none";
+  }
+  tablinks = document.getElementsByClassName("tablinks");
+  for (i = 0; i < tablinks.length; i++) {
+    tablinks[i].className = tablinks[i].className.replace(" active", "");
+  }
+  document.getElementById(cityName).style.display = "block";
+  evt.currentTarget.className += " active";
+}
+</script>
+<body>
+<h2>CAD Log Viewer</h2>
+<p>Select incident to view.</p>
+<div class="tab">
+  <button class="tablinks active" onclick="switchTab(event, '181')">181</button>
+  <button class="tablinks" onclick="switchTab(event, '182')">182</button>
+  <button class="tablinks" onclick="switchTab(event, '190')">190</button>
+</div>
+
+<div id="181" class="tabcontent" style="display:block">
+
+  <table width="100%">
+    <tr>
+      <th>Time</th>
+      <th>Author</th>
+      <th>Comment</th>
+    </tr>
+    <tr class="d1">
+      <td class="timestamp" width="10%">00:01:00</td>
+      <td width="15%">CHP</td>
+      <td>14-13 10-97 1125  EMS 10-97  HAY TRK VS 2 VEH  #1 2 3 LNS BLCKD REQ ADDL UNITS</td>
+    </tr>
+    <tr class="d2">
+      <td class="timestamp" width="10%">00:05:00</td>
+      <td>CHP</td>
+      <td>10-39 COLLEGE OAK FOR BIG RIG AND CYCLE FOR ROT</td>
+    </tr>
+  </table>
+</div>
+
+<div id="182" class="tabcontent">
+
+  <table width="100%">
+    <tr>
+      <th>Time</th>
+      <th>Author</th>
+      <th>Comment</th>
+    </tr>
+    <tr class="d1">
+      <td class="timestamp" width="10%">00:03:00</td>
+      <td width="15%">CHP</td>
+      <td>14-7 ENRT FROM SB 405 AT BROOKHURST</td>
+    </tr>
+    <tr class="d2">
+      <td class="timestamp" width="10%">00:30:00</td>
+      <td>Maria</td>
+      <td>REGION 30 SUPER ENROUTE FROM 55 AT DYER</td>
+    </tr>
+  </table>
+</div>
+
+<div id="190" class="tabcontent">
+
+  <table width="100%">
+    <tr>
+      <th>Time</th>
+      <th>Author</th>
+      <th>Comment</th>
+    </tr>
+    <tr class="d1">
+      <td class="timestamp" width="10%">00:03:00</td>
+      <td width="15%">CHP</td>
+      <td>14-21 1097 PROV 1184 TRF BACKING QUICKLY</td>
+    </tr>
+    <tr class="d2">
+      <td class="timestamp" width="10%">00:09:00</td>
+      <td>Jose</td>
+      <td>MAINTENANCE TRUCK REQUESTED</td>
+    </tr>
+    <tr class="d1">
+      <td class="timestamp" width="10%">00:12:00</td>
+      <td>Jose</td>
+      <td>CMS #131 ACTIVATED</td>
+    </tr>
+  </table>
+</div></body>
+</html>
+
+
Index: unk/webapps/CADviewer_prototype.html
===================================================================
--- /trunk/webapps/CADviewer_prototype.html	(revision 616)
+++ 	(revision )
@@ -1,158 +1,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta charset="UTF-8">
-<title>CAD Log Viewer Prototype</title>
-<style>
-body {
-    font-family: Arial;
-    background-color: ivory;
-}
-/* Style the tab */
-.tab {
-  overflow: hidden;
-  border: 1px solid #ccc;
-  background-color: #f1f1f1;
-}
-
-/* Style the buttons inside the tab */
-.tab button {
-  text-decoration: underline;
-  background-color: inherit;
-  float: left;
-  border: 1px solid #ccc;
-  outline: none;
-  cursor: pointer;
-  padding: 14px 16px;
-  transition: 0.3s;
-  font-size: 17px;
-}
-
-/* Change background color of buttons on hover */
-.tab button:hover {
-  background-color: #ddd;
-}
-
-/* Create an active/current tablink class */
-.tab button.active {
-  background-color: #ccc;
-}
-
-/* Style the tab content */
-.tabcontent {
-  display: none;
-  padding: 6px 12px;
-  border: 1px solid #ccc;
-  border-top: none;
-}
-.timestamp {
-  font-family: monospace;
-  font-size: x-large;
-}
-th {
-  text-align: left;
-  background: #f1f1f1;
-}
-tr.d1 {
-	background: white;
-  color: black;
-}
-tr.d2 {
-  background: #f1f1f1;
-  color: black;
-}</style>
-<script  src="../common/js/fileutils.js"></script>
-<script>
-function switchTab(evt, cityName) {
-  var i, tabcontent, tablinks;
-  tabcontent = document.getElementsByClassName("tabcontent");
-  for (i = 0; i < tabcontent.length; i++) {
-    tabcontent[i].style.display = "none";
-  }
-  tablinks = document.getElementsByClassName("tablinks");
-  for (i = 0; i < tablinks.length; i++) {
-    tablinks[i].className = tablinks[i].className.replace(" active", "");
-  }
-  document.getElementById(cityName).style.display = "block";
-  evt.currentTarget.className += " active";
-}
-</script>
-<body>
-<h2>CAD Log Viewer</h2>
-<p>Select incident to view.</p>
-<div class="tab">
-  <button class="tablinks active" onclick="switchTab(event, '181')">181</button>
-  <button class="tablinks" onclick="switchTab(event, '182')">182</button>
-  <button class="tablinks" onclick="switchTab(event, '190')">190</button>
-</div>
-
-<div id="181" class="tabcontent" style="display:block">
-
-  <table width="100%">
-    <tr>
-      <th>Time</th>
-      <th>Author</th>
-      <th>Comment</th>
-    </tr>
-    <tr class="d1">
-      <td class="timestamp" width="10%">00:01:00</td>
-      <td width="15%">CHP</td>
-      <td>14-13 10-97 1125  EMS 10-97  HAY TRK VS 2 VEH  #1 2 3 LNS BLCKD REQ ADDL UNITS</td>
-    </tr>
-    <tr class="d2">
-      <td class="timestamp" width="10%">00:05:00</td>
-      <td>CHP</td>
-      <td>10-39 COLLEGE OAK FOR BIG RIG AND CYCLE FOR ROT</td>
-    </tr>
-  </table>
-</div>
-
-<div id="182" class="tabcontent">
-
-  <table width="100%">
-    <tr>
-      <th>Time</th>
-      <th>Author</th>
-      <th>Comment</th>
-    </tr>
-    <tr class="d1">
-      <td class="timestamp" width="10%">00:03:00</td>
-      <td width="15%">CHP</td>
-      <td>14-7 ENRT FROM SB 405 AT BROOKHURST</td>
-    </tr>
-    <tr class="d2">
-      <td class="timestamp" width="10%">00:30:00</td>
-      <td>Maria</td>
-      <td>REGION 30 SUPER ENROUTE FROM 55 AT DYER</td>
-    </tr>
-  </table>
-</div>
-
-<div id="190" class="tabcontent">
-
-  <table width="100%">
-    <tr>
-      <th>Time</th>
-      <th>Author</th>
-      <th>Comment</th>
-    </tr>
-    <tr class="d1">
-      <td class="timestamp" width="10%">00:03:00</td>
-      <td width="15%">CHP</td>
-      <td>14-21 1097 PROV 1184 TRF BACKING QUICKLY</td>
-    </tr>
-    <tr class="d2">
-      <td class="timestamp" width="10%">00:09:00</td>
-      <td>Jose</td>
-      <td>MAINTENANCE TRUCK REQUESTED</td>
-    </tr>
-    <tr class="d1">
-      <td class="timestamp" width="10%">00:12:00</td>
-      <td>Jose</td>
-      <td>CMS #131 ACTIVATED</td>
-    </tr>
-  </table>
-</div></body>
-</html>
-
-
