<!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>[12823] 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/12823">12823</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-03-05 15:16:47 -0800 (Wed, 05 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add table columns automatically.</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 (12822 => 12823)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/work.xhtml 2014-03-05 21:20:34 UTC (rev 12822)
+++ CalendarServer/trunk/calendarserver/webadmin/work.xhtml 2014-03-05 23:16:47 UTC (rev 12823)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> <script>
</span><span class="cx"> //<![CDATA[
</span><span class="cx">
</span><del>- var workTableDescriptions = {
</del><ins>+ var workTypeDescriptions = {
</ins><span class="cx"> // Scheduling
</span><span class="cx"> "SCHEDULE_ORGANIZER_WORK": "Schedule Organizer",
</span><span class="cx"> "SCHEDULE_REPLY_WORK": "Schedule Reply",
</span><span class="lines">@@ -82,6 +82,33 @@
</span><span class="cx"> "FIND_MIN_VALID_REVISION_WORK": "Revision Cleanup: Find Minimum",
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ var jobItemAttributeDescriptions = {
+ "jobID": "Job ID",
+ "priority": "Priority",
+ "notBefore": "Not Before",
+ "notAfter": "Not After",
+ }
+
+ // Function to return keys from an object in order, followed by keys
+ // from another which were not in the first.
+ // We use this in case we get a JSON dictionary with keys that haven't
+ // been mapped; the mapped keys will be in a known order and the rest
+ // will be in whatever order they came in over the wire.
+ function keysInKindOfKnownOrder(obj1, obj2) {
+ keys = [];
+ for (key in obj1) { keys.push(key); }
+ for (key in obj2) { if (! key in obj1) { keys.push(key); } }
+ return keys;
+ }
+
+ function valueOrKey(obj, key) {
+ if (key in obj) {
+ return obj[key];
+ } else {
+ return key;
+ }
+ }
+
</ins><span class="cx"> var maxSeen = 30;
</span><span class="cx">
</span><span class="cx"> var eventSource = undefined;
</span><span class="lines">@@ -90,27 +117,20 @@
</span><span class="cx"> function drawChart(data) {
</span><span class="cx"> items = [];
</span><span class="cx">
</span><del>- // Add items in the order used by workTableDescriptions
- for (key in workTableDescriptions) {
</del><ins>+ keys = keysInKindOfKnownOrder(workTypeDescriptions, data);
+
+ for (i in keys) {
+ key = keys[i]; // OMG JavaScript, seriously?
+
</ins><span class="cx"> if (key in data) {
</span><span class="cx"> items.push({
</span><span class="cx"> name: key,
</span><span class="cx"> count: data[key],
</span><del>- description: workTableDescriptions[key],
</del><ins>+ description: valueOrKey(workTypeDescriptions, key),
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- for (key in data) {
- if (! key in workTableDescriptions) {
- items.push({
- name: key,
- count: data[key],
- description: key,
- });
- }
- }
-
</del><span class="cx"> var outerWidth = 960;
</span><span class="cx"> var outerHeight = 500;
</span><span class="cx"> var margin = { top: 20, right: 30, bottom: 30, left: 160 };
</span><span class="lines">@@ -255,7 +275,7 @@
</span><span class="cx"> function initChart() {
</span><span class="cx"> data = {};
</span><span class="cx">
</span><del>- for (key in workTableDescriptions) {
</del><ins>+ for (key in workTypeDescriptions) {
</ins><span class="cx"> data[key] = 0.1;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -277,29 +297,74 @@
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function showDetails(workItemType) {
</del><ins>+ function showDetails(workType) {
+ // DEBUG
</ins><span class="cx"> detailsDebug = document.getElementById("work_item_debug");
</span><del>- detailsDebug.innerHTML = workItemType;
-
</del><ins>+ detailsDebug.innerHTML = workType;
</ins><span class="cx"> eventDebug = document.getElementById("event_debug");
</span><span class="cx"> eventDebug.innerHTML = "";
</span><span class="cx">
</span><ins>+ if (workType in workTypeDescriptions) {
+ description = workTypeDescriptions[workType];
+ } else {
+ description = workType;
+ }
+
+ // Look up elements
</ins><span class="cx"> detailsTable = document.getElementById("work_item_details");
</span><ins>+ detailsCaption = document.getElementById("work_item_details_caption");
+ detailsHeader = document.getElementById("work_item_details_header");
</ins><span class="cx"> detailsBody = document.getElementById("work_item_details_body");
</span><span class="cx">
</span><ins>+ // Unregister existing details listener
</ins><span class="cx"> if (itemTypeEventListener != undefined) {
</span><span class="cx"> eventSource.removeEventListener(itemTypeEventListener)
</span><span class="cx"> }
</span><span class="cx">
</span><del>- detailsTable.style.display = "block";
</del><ins>+ // Reset the details elements
+ detailsTable.style.display = "none";
+ detailsCaption.innerHTML = "Work Item Details: " + description;
+ detailsHeader.innerHTML = "";
+ detailsBody.innerHTML = "";
</ins><span class="cx">
</span><ins>+ // Register requested details listener
</ins><span class="cx"> itemTypeEventListener = function(e) {
</span><del>- eventDebug.innerHTML = e.data;
</del><ins>+ // DEBUG
+ eventDebug.innerHTML = e.data;
</ins><span class="cx">
</span><del>- detailsBody.innerHTML = "";
</del><ins>+ jobItems = JSON.parse(e.data);
+
+ for (i in jobItems) {
+ jobItem = jobItems[i]; // OMG JavaScript is so stupid.
+
+ // Unhide the table
+ detailsTable.style.display = "block";
+
+ // Add the table headers if they aren't already there
+ if (detailsHeader.innerHTML == "") {
+ row = document.createElement("tr");
+
+ attributes = keysInKindOfKnownOrder(jobItemAttributeDescriptions, jobItem);
+
+ for (i in attributes) {
+ attribute = attributes[i]; // OMG JavaScript, wow you so dumb
+ attributeDescription = valueOrKey(jobItemAttributeDescriptions, attribute)
+
+ header = document.createElement("th");
+ text = document.createTextNode(attributeDescription);
+ header.appendChild(text);
+ row.appendChild(header);
+ }
+
+ detailsHeader.appendChild(row);
+ }
+
+
+
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- eventSource.addEventListener(workItemType, itemTypeEventListener)
</del><ins>+ eventSource.addEventListener(workType, itemTypeEventListener)
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> window.onload = function() {
</span><span class="lines">@@ -319,8 +384,8 @@
</span><span class="cx"> <svg id="work_queue_chart" />
</span><span class="cx">
</span><span class="cx"> <table id="work_item_details">
</span><del>- <caption>Work Item Details</caption>
- <thead>
</del><ins>+ <caption id="work_item_details_caption">Work Item Details</caption>
+ <thead id="work_item_details_header">
</ins><span class="cx"> <tr>
</span><span class="cx"> <th>Job ID</th>
</span><span class="cx"> <th>Priority</th>
</span></span></pre>
</div>
</div>
</body>
</html>