X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=src%2Fmkws-widget-main.js;h=3986c16fa21b04ac72796964cc3841cbf7f6975c;hp=ef4b3c71b0beb3614b6cafdbd8f9f8d6caaeea6b;hb=7610fdb0a2ebc53d9e9f960bbd9f2c806ec3d738;hpb=03aa531c961b56b06bcc2e2b94ccb47cdb86e7e4

diff --git a/src/mkws-widget-main.js b/src/mkws-widget-main.js
index ef4b3c7..3986c16 100644
--- a/src/mkws-widget-main.js
+++ b/src/mkws-widget-main.js
@@ -19,15 +19,19 @@ mkws.registerWidgetType('targets', function() {
     var cleandata = [];
     for (var i = 0; i < data.length; i++) {
       var cur = {};
+      cur.name = data[i].name;
       cur.id = data[i].id;
       cur.hits = data[i].hits;
       cur.diagnostic = data[i].diagnostic;
+      cur.message = data[i].message;
       cur.records = data[i].records;
-      cur.state = data[i].state;
+      cur.state = data[i].state.replace(/^Client_/, '');
       cleandata.push(cur);
     }
 
-    var template = that.team.loadTemplate(that.config.template || "Targets");
+    cleandata.sort(function(a,b) { return a.name.localeCompare(b.name) });
+
+    var template = that.team.loadTemplate(that.config.template || "targets");
     that.node.html(template({data: cleandata}));
   });
 });
@@ -36,7 +40,7 @@ mkws.registerWidgetType('targets', function() {
 mkws.registerWidgetType('stat', function() {
   var that = this;
   this.team.queue("stat").subscribe(function(data) {
-    var template = that.team.loadTemplate(that.config.template || "Stat");
+    var template = that.team.loadTemplate(that.config.template || "stat");
     that.node.html(template(data));
   });
 });
@@ -55,7 +59,7 @@ mkws.registerWidgetType('pager', function() {
     output.found = data.total;
 
     //client indexes pages from 1 but pz2 from 0
-    var onsides = 6;
+    var onsides = 5;
     var pages = Math.ceil(that.team.totalRecordCount() / that.team.perpage());
     var currentPage = that.team.currentPage();
 
@@ -83,7 +87,7 @@ mkws.registerWidgetType('pager', function() {
 
     if (pages - currentPage > 0) output.nextClick = "mkws.pagerNext(\'" + teamName + "\')";
 
-    var template = that.team.loadTemplate(that.config.template || "Pager");
+    var template = that.team.loadTemplate(that.config.template || "pager");
     that.node.html(template(output));
   });
 });
@@ -99,39 +103,74 @@ mkws.registerWidgetType('details', function() {
     });
   }
   this.team.queue("record").subscribe(function(data) {
-    console.log(data);
     if ($.inArray(recid, data.recid) > -1) {
-      var template = that.team.loadTemplate(that.config.template || "Record");
+      var template = that.team.loadTemplate(that.config.template || "details");
       that.node.html(template(data));
     }
   });
-  that.autosearch();
 });
 
 mkws.registerWidgetType('records', function() {
   var that = this;
   var team = this.team;
+  var m_data;
+  var m_needRedraw = false;
+  var m_frozen = false;
+
+  this.team.queue("searchtriggered").subscribe(function() {
+    var op = that.config.newsearch_opacity;
+    if (op !== undefined) { that.node.fadeTo(500, op); }
+  });
 
-  this.team.queue("records").subscribe(function(data) {
-    for (var i = 0; i < data.hits.length; i++) {
-      var hit = data.hits[i];
-      that.team.queue("record").publish(hit);
-      hit.detailLinkId = team.recordElementId(hit.recid[0]);
-      hit.detailClick = "mkws.showDetails('" + team.name() + "', '" + hit.recid[0] + "');return false;";
-      hit.containerClass = "mkwsSummary mkwsTeam_" + team.name();
-      hit.containerClass += " " + hit.detailLinkId;
-      // ### At some point, we may be able to move the
-      // m_currentRecordId and m_currentRecordData members
-      // from the team object into this widget.
-      if (hit.recid == team.currentRecordId()) {
-        if (team.currentRecordData()) {
-          hit.renderedDetails = team.renderDetails(team.currentRecordData());
-        } 
+  function refreshRecordData() {
+    that.node.css('opacity', 1);
+
+    if (m_needRedraw) {
+      for (var i = 0; i < m_data.hits.length; i++) {
+        var hit = m_data.hits[i];
+        hit.detailLinkId = team.recordElementId(hit.recid[0]);
+        hit.detailClick = "mkws.showDetails('" + team.name() + "', '" + hit.recid[0] + "');return false;";
+        hit.containerClass = "mkws-summary mkwsSummary mkws-team-" + team.name();
+        hit.containerClass += " " + hit.detailLinkId;
+        // ### At some point, we may be able to move the
+        // m_currentRecordId and m_currentRecordData members
+        // from the team object into this widget.
+        if (hit.recid == team.currentRecordId()) {
+          if (team.currentRecordData()) {
+            hit.renderedDetails = team.renderDetails(team.currentRecordData());
+          } 
+        }
       }
+      var template = team.loadTemplate(that.config.template || "records");
+      var summaryPartial = team.loadTemplate(that.config['summary-template'] || "summary");
+      var tdata = $.extend({}, {"hits": m_data.hits}, that.config.template_vars);
+      that.node.html(template(tdata, {"partials":{"summary":summaryPartial}}));
     }
-    var template = team.loadTemplate(that.config.template || "Records");
-    var targs = $.extend({}, {"hits": data.hits}, that.config.template_vars);
-    that.node.html(template(targs));
+
+    m_needRedraw = false;
+  }
+
+  function setRecordData(data) {
+    m_data = data;
+    m_needRedraw = true;
+    if (!m_frozen) {
+      refreshRecordData();
+    }
+  }
+
+  this.team.queue("records").subscribe(setRecordData);
+  
+  this.node.mouseenter(function() {
+    that.info("freezing display records");
+    that.node.css('opacity', 0.5);
+    m_frozen = true;
+  });
+
+  this.node.mouseleave(function() {
+    that.info("refreshing records");
+    that.node.css('opacity', 1);
+    m_frozen = false;
+    refreshRecordData();
   });
 
   that.autosearch();
@@ -142,7 +181,7 @@ mkws.registerWidgetType('navi', function() {
   var that = this;
   var teamName = this.team.name();
 
-  this.team.queue("navi").subscribe(function() {
+  this.team.queue("searchtriggered").subscribe(function() {
     var filters = that.team.filters();
     var output = {filters:[]};
 
@@ -162,7 +201,7 @@ mkws.registerWidgetType('navi', function() {
       output.filters.push(cur);
     });
 
-    var template = that.team.loadTemplate(that.config.template || "Navi");
+    var template = that.team.loadTemplate(that.config.template || "navi");
     that.node.html(template(output));
   });
 });
@@ -200,7 +239,7 @@ mkws.registerWidgetType('per-page', function() {
 mkws.registerWidgetType('done', function() {
   var that = this;
   this.team.queue("complete").subscribe(function(n) {
-    var template = that.team.loadTemplate(that.config.template || "Done");
+    var template = that.team.loadTemplate(that.config.template || "done");
     that.node.html(template({count: n}));
   });
 });
@@ -212,7 +251,7 @@ mkws.registerWidgetType('switch', function() {
   var output = {};
   output.recordClick = "mkws.switchView(\'" + tname + "\', \'records\')";
   output.targetClick = "mkws.switchView(\'" + tname + "\', \'targets\')";
-  var template = this.team.loadTemplate(this.config.template || "Switch");
+  var template = this.team.loadTemplate(this.config.template || "switch");
   this.node.html(template(output));
   this.hideWhenNarrow();
 });
@@ -221,8 +260,7 @@ mkws.registerWidgetType('switch', function() {
 mkws.registerWidgetType('search', function() {
   var output = {};
   output.team = this.team.name();
-  output.queryWidth = this.config.query_width;
-  var template = this.team.loadTemplate(this.config.template || "Search");
+  var template = this.team.loadTemplate(this.config.template || "search");
   this.node.html(template(output));
 });
 
@@ -238,7 +276,7 @@ mkws.registerWidgetType('search-form', function() {
 
 
 mkws.registerWidgetType('results', function() {
-  var template = this.team.loadTemplate(this.config.template || "Results");
+  var template = this.team.loadTemplate(this.config.template || "results");
   this.node.html(template({team: this.team.name()}));
   this.autosearch();
 });
@@ -253,18 +291,18 @@ mkws.registerWidgetType('ranking', function() {
   output.showPerPage = this.config.show_perpage;
 
   var order = this.team.sortOrder();
-  this.log("making sort, sortOrder = '" + order + "'");
+  this.info("making sort, sortOrder = '" + order + "'");
   for (var i = 0; i < this.config.sort_options.length; i++) {
     var cur = {};
     var opt = this.config.sort_options[i];
     cur.key = opt[0];
-    cur.label = opt.length == 1 ? opt[0] : opt[1];
+    cur.label = opt.length == 1 ? opt[0] : mkws.M(opt[1]);
     if (order == cur.key || order == cur.label) cur.selected = true;
     output.sort.push(cur);
   }
 
   var perpage = this.team.perpage();
-  this.log("making perpage, perpage = " + perpage);
+  this.info("making perpage, perpage = " + perpage);
   for(var i = 0; i < this.config.perpage_options.length; i++) {
     var cur = {};
     cur.perPage = this.config.perpage_options[i];
@@ -272,7 +310,7 @@ mkws.registerWidgetType('ranking', function() {
     output.perPage.push(cur);
   }
 
-  var template = this.team.loadTemplate(this.config.template || "Ranking");
+  var template = this.team.loadTemplate(this.config.template || "ranking");
   this.node.html(template(output));
 });
 
@@ -287,7 +325,7 @@ mkws.registerWidgetType('lang', function() {
   var list = [];
 
   /* display a list of configured languages, or all */
-  var lang_options = this.config.lang_options || [];
+  var lang_options = this.config.lang_options;
   var toBeIncluded = {};
   for (var i = 0; i < lang_options.length; i++) {
     toBeIncluded[lang_options[i]] = true;
@@ -312,9 +350,9 @@ mkws.registerWidgetType('lang', function() {
       list.push(cur);
   }
 
-  this.log("language menu: " + list.join(", "));
+  this.info("language menu: " + list.join(", "));
 
-  var template = this.team.loadTemplate(this.config.template || "Lang");
+  var template = this.team.loadTemplate(this.config.template || "lang");
   this.node.html(template({languages: list}));
   this.hideWhenNarrow();
 
@@ -357,7 +395,7 @@ mkws.registerWidgetType('config', function() {
   for (var name in c) {
     if (c.hasOwnProperty(name)) {
       this.team.config[name] = c[name];
-      this.log(this + " copied property " + name + "='" + c[name] + "' up to team");
+      this.info(this + " copied property " + name + "='" + c[name] + "' up to team");
     }
   }
 });
@@ -367,7 +405,7 @@ mkws.registerWidgetType('progress', function() {
   var that = this;
   this.node.hide();
   this.team.queue("stat").subscribe(function(data) {
-    var template = that.team.loadTemplate(that.config.template || "Progress");
+    var template = that.team.loadTemplate(that.config.template || "progress");
     that.node.html(template({
       done: data.clients - data.activeclients,
       waiting: data.activeclients
@@ -377,6 +415,24 @@ mkws.registerWidgetType('progress', function() {
 });
 
 
+mkws.registerWidgetType('waiting', function() {
+  var that = this;
+
+  this.node.css("visibility", "hidden");
+  var template = that.team.loadTemplate(that.config.template || "waiting");
+  this.node.html(template({
+    src: this.config.src || "http://mkws.indexdata.com/progress.gif"
+  }));
+
+  this.team.queue("searchtriggered").subscribe(function(data) {
+    that.node.css("visibility", "visible");
+  });
+  this.team.queue("complete").subscribe(function(n) {
+    that.node.css("visibility", "hidden");
+  });
+});
+
+
 // Some elements have mkws* classes that makes them appear as widgets
 // -- for example, because we want to style them using CSS -- but have
 // no actual functionality. We register these to prevent ignorable