X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_age;h=a02187eae01d1b85988382f3e82bc538c6ba010f;hp=fc7999341fee3451976280d98faa00d2770aa1b1;hb=062f9c87d921e901c1daf85a3e602e7e4c9a0cb4;hpb=f6d7a4d627f3ecc0624649bb895dbf8e59afcf47

diff --git a/yarrg/web/query_age b/yarrg/web/query_age
index fc79993..a02187e 100644
--- a/yarrg/web/query_age
+++ b/yarrg/web/query_age
@@ -85,12 +85,38 @@ $sth->execute();
 % }
 </table>
 
-<& tabsort, table => 'ts_table', rowclass => 'datarow', cols => [
+<& SELF:dataages, id2age => \%da_ages, elemidprefix => "'c'+" &>
+<%method dataages>
+<%args>
+  $id2age
+  $elemidprefix => ''
+</%args>
+<&| script &>
+  function da_Refresh() {
+    var now= Date.now();
+    debug('updating now='+now);
+    for (var ageid in da_ages) {
+      var oldage= da_ages[ageid];
+      var el= document.getElementById(<% $elemidprefix %>ageid);
+      var age= oldage + (now - da_pageload) / 1000;
+      var newhtml= <% meta_prettyprint_age('age','Math.floor','+') %>;
+      el.innerHTML= newhtml;
+    }
+  }
+  da_ages= <% to_json_protecttags($id2age) %>;
+  window.setInterval(da_Refresh, 10000);
+  register_onload(da_Refresh);
+</&>
+</%method>
+
+<&| tabsort, table => 'ts_table', rowclass => 'datarow', cols => [
 	{}, {},
 	{ DoReverse => 1,
 	  Numeric => 1,
 	  SortKey => "da_ages[rowid]" }]
   &>
+  ts_sortkeys= <% to_json_protecttags(\%ts_sortkeys) %>;
+</&tabsort>
 
 <p>
 Time since this page loaded:
@@ -101,36 +127,6 @@ Time since this page loaded:
 <& "lookup:formhidden", ours => sub { 0; } &>
 </form>
 
-<&| script &>
-  ts_sortkeys= <% to_json_protecttags(\%ts_sortkeys) %>;
-  da_ages= <% to_json_protecttags(\%da_ages) %>;
-
-  function da_Refresh() {
-    var now= Date.now();
-    debug('updating now='+now);
-    for (var rowid in da_ages) {
-      var oldage= da_ages[rowid];
-      var cellid= 'c'+rowid;
-      var el= document.getElementById(cellid);
-      var age= oldage + (now - da_pageload) / 1000;
-      var newhtml= <% meta_prettyprint_age('age','Math.floor','+') %>;
-% if ($ARGS{debug}) {
-      if (cellid == 'cid_loaded')
-	debug('element rowid='+rowid+' cellid='+cellid
-		+' oldage='+oldage+' age='+age+': '+newhtml);
-% }
-      el.innerHTML= newhtml;
-    }
-  }
-
-  function all_onload() {
-    ts_onload__ts_table();
-    da_Refresh();
-  }
-  window.onload= all_onload;
-  window.setInterval(da_Refresh, 10000);
-</&script>
-
 <%init>
 use POSIX;
 use CommodsWeb;