<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[12824] CalendarServer/trunk/calendarserver/webadmin/work.xhtml</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/12824">12824</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-03-05 17:09:41 -0800 (Wed, 05 Mar 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Show job items in a table below the chart.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserverwebadminworkxhtml">CalendarServer/trunk/calendarserver/webadmin/work.xhtml</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarserverwebadminworkxhtml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/work.xhtml (12823 => 12824)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/work.xhtml        2014-03-05 23:16:47 UTC (rev 12823)
+++ CalendarServer/trunk/calendarserver/webadmin/work.xhtml        2014-03-06 01:09:41 UTC (rev 12824)
</span><span class="lines">@@ -43,6 +43,10 @@
</span><span class="cx">         display: none;
</span><span class="cx">       }
</span><span class="cx"> 
</span><ins>+      #debug {
+        display: none;
+      }
+
</ins><span class="cx">     &lt;/style&gt;
</span><span class="cx"> 
</span><span class="cx">     &lt;script src=&quot;http://d3js.org/d3.v3.min.js&quot;&gt;&lt;/script&gt;
</span><span class="lines">@@ -95,9 +99,9 @@
</span><span class="cx">       // been mapped; the mapped keys will be in a known order and the rest
</span><span class="cx">       // will be in whatever order they came in over the wire.
</span><span class="cx">       function keysInKindOfKnownOrder(obj1, obj2) {
</span><del>-        keys = [];
-        for (key in obj1) { keys.push(key); }
-        for (key in obj2) { if (! key in obj1) { keys.push(key); } }
</del><ins>+        var keys = [];
+        for (var key in obj1) { keys.push(key); }
+        for (var key in obj2) { if (! key in obj1) { keys.push(key); } }
</ins><span class="cx">         return keys;
</span><span class="cx">       }
</span><span class="cx"> 
</span><span class="lines">@@ -109,18 +113,21 @@
</span><span class="cx">         }
</span><span class="cx">       }
</span><span class="cx"> 
</span><ins>+      var debug = false;
+
</ins><span class="cx">       var maxSeen = 30;
</span><span class="cx"> 
</span><del>-      var eventSource = undefined;
-      var itemTypeEventListener = undefined;
</del><ins>+      var eventSource;
+      var itemTypeEventListener;
+      var itemTypeEventListenerWorkType;
</ins><span class="cx"> 
</span><span class="cx">       function drawChart(data) {
</span><del>-        items = [];
</del><ins>+        var items = [];
</ins><span class="cx"> 
</span><del>-        keys = keysInKindOfKnownOrder(workTypeDescriptions, data);
</del><ins>+        var keys = keysInKindOfKnownOrder(workTypeDescriptions, data);
</ins><span class="cx"> 
</span><del>-        for (i in keys) {
-          key = keys[i];  // OMG JavaScript, seriously?
</del><ins>+        for (var i in keys) {
+          var key = keys[i];  // OMG JavaScript, seriously?
</ins><span class="cx"> 
</span><span class="cx">           if (key in data) {
</span><span class="cx">             items.push({
</span><span class="lines">@@ -273,9 +280,9 @@
</span><span class="cx">       }
</span><span class="cx"> 
</span><span class="cx">     function initChart() {
</span><del>-        data = {};
</del><ins>+        var data = {};
</ins><span class="cx"> 
</span><del>-        for (key in workTypeDescriptions) {
</del><ins>+        for (var key in workTypeDescriptions) {
</ins><span class="cx">           data[key] = 0.1;
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -298,27 +305,37 @@
</span><span class="cx">       }
</span><span class="cx"> 
</span><span class="cx">       function showDetails(workType) {
</span><del>-        // DEBUG
-        detailsDebug = document.getElementById(&quot;work_item_debug&quot;);
-        detailsDebug.innerHTML = workType;
-        eventDebug = document.getElementById(&quot;event_debug&quot;);
-        eventDebug.innerHTML = &quot;&quot;;
</del><ins>+        var debuggingContainer = document.getElementById(&quot;debug&quot;);
</ins><span class="cx"> 
</span><ins>+        if (debug) {
+          debuggingContainer.style.display = &quot;block&quot;;
+
+          var detailsDebug = document.getElementById(&quot;work_item_debug&quot;);
+          detailsDebug.innerHTML = workType;
+
+          var eventDebug = document.getElementById(&quot;event_debug&quot;);
+          eventDebug.innerHTML = &quot;&quot;;
+
+        } else {
+          debuggingContainer.style.display = &quot;none&quot;;
+        }
+
+        // Get description
</ins><span class="cx">         if (workType in workTypeDescriptions) {
</span><del>-          description = workTypeDescriptions[workType];
</del><ins>+          var description = workTypeDescriptions[workType];
</ins><span class="cx">         } else {
</span><del>-          description = workType;
</del><ins>+          var description = workType;
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         // Look up elements
</span><del>-        detailsTable = document.getElementById(&quot;work_item_details&quot;);
-        detailsCaption = document.getElementById(&quot;work_item_details_caption&quot;);
-        detailsHeader = document.getElementById(&quot;work_item_details_header&quot;);
-        detailsBody = document.getElementById(&quot;work_item_details_body&quot;);
</del><ins>+        var detailsTable = document.getElementById(&quot;work_item_details&quot;);
+        var detailsCaption = document.getElementById(&quot;work_item_details_caption&quot;);
+        var detailsHeader = document.getElementById(&quot;work_item_details_header&quot;);
+        var detailsBody = document.getElementById(&quot;work_item_details_body&quot;);
</ins><span class="cx"> 
</span><span class="cx">         // Unregister existing details listener
</span><del>-        if (itemTypeEventListener != undefined) {
-          eventSource.removeEventListener(itemTypeEventListener)
</del><ins>+        if (typeof itemTypeEventListener !== &quot;undefined&quot;) {
+          eventSource.removeEventListener(itemTypeEventListenerWorkType, itemTypeEventListener)
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         // Reset the details elements
</span><span class="lines">@@ -328,30 +345,36 @@
</span><span class="cx">         detailsBody.innerHTML = &quot;&quot;;
</span><span class="cx"> 
</span><span class="cx">         // Register requested details listener
</span><ins>+        itemTypeEventListenerWorkType = workType;
+
</ins><span class="cx">         itemTypeEventListener = function(e) {
</span><del>-          // DEBUG
-          eventDebug.innerHTML = e.data;
</del><ins>+          if (debug) {
+            eventDebug.innerHTML = e.data;
+          }
</ins><span class="cx"> 
</span><del>-          jobItems = JSON.parse(e.data);
</del><ins>+          // Reset the rows; we're going to refill the table below
+          detailsBody.innerHTML = &quot;&quot;;
</ins><span class="cx"> 
</span><del>-          for (i in jobItems) {
-            jobItem = jobItems[i];  // OMG JavaScript is so stupid.
</del><ins>+          var jobItems = JSON.parse(e.data);
</ins><span class="cx"> 
</span><ins>+          for (var i in jobItems) {
+            var jobItem = jobItems[i];  // OMG JavaScript is so stupid.
+
</ins><span class="cx">             // Unhide the table
</span><span class="cx">             detailsTable.style.display = &quot;block&quot;;
</span><span class="cx">     
</span><ins>+            var attributes = keysInKindOfKnownOrder(jobItemAttributeDescriptions, jobItem);
+
</ins><span class="cx">             // Add the table headers if they aren't already there
</span><span class="cx">             if (detailsHeader.innerHTML == &quot;&quot;) {
</span><del>-              row = document.createElement(&quot;tr&quot;);
</del><ins>+              var row = document.createElement(&quot;tr&quot;);
</ins><span class="cx"> 
</span><del>-              attributes = keysInKindOfKnownOrder(jobItemAttributeDescriptions, jobItem);
-
-              for (i in attributes) {
-                attribute = attributes[i];  // OMG JavaScript, wow you so dumb
</del><ins>+              for (var i in attributes) {
+                var attribute = attributes[i];  // OMG JavaScript, wow you so dumb
</ins><span class="cx">                 attributeDescription = valueOrKey(jobItemAttributeDescriptions, attribute)
</span><span class="cx"> 
</span><del>-                header = document.createElement(&quot;th&quot;);
-                text = document.createTextNode(attributeDescription);
</del><ins>+                var header = document.createElement(&quot;th&quot;);
+                var text = document.createTextNode(attributeDescription);
</ins><span class="cx">                 header.appendChild(text);
</span><span class="cx">                 row.appendChild(header);
</span><span class="cx">               }
</span><span class="lines">@@ -359,8 +382,19 @@
</span><span class="cx">               detailsHeader.appendChild(row);
</span><span class="cx">             }
</span><span class="cx"> 
</span><ins>+            // Add a table row for this job item
+            var row = document.createElement(&quot;tr&quot;);
</ins><span class="cx"> 
</span><ins>+            for (var i in attributes) {
+              var attribute = attributes[i];  // OMG JavaScript the lameness
</ins><span class="cx"> 
</span><ins>+              var cell = document.createElement(&quot;td&quot;);
+              var text = document.createTextNode(jobItem[attribute]);
+              cell.appendChild(text);
+              row.appendChild(cell);
+            }
+
+            detailsBody.appendChild(row);
</ins><span class="cx">           }
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -396,9 +430,11 @@
</span><span class="cx">       &lt;tbody id=&quot;work_item_details_body&quot; /&gt;
</span><span class="cx">     &lt;/table&gt;
</span><span class="cx"> 
</span><del>-    &lt;hr /&gt;
-    &lt;div id=&quot;work_item_debug&quot; /&gt;
-    &lt;div id=&quot;event_debug&quot; /&gt;
</del><ins>+    &lt;div id=&quot;debug&quot;&gt;
+     &lt;hr /&gt;
+     &lt;div id=&quot;work_item_debug&quot; /&gt;
+     &lt;div id=&quot;event_debug&quot; /&gt;
+   &lt;/div&gt;
</ins><span class="cx"> 
</span><span class="cx">   &lt;/body&gt;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>