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=efd709692a855426a1ae3f7ca819a2f009ce8b4f;hp=a02187eae01d1b85988382f3e82bc538c6ba010f;hb=53dfe71f6c510ee12bbf6bdaeb3984024d34a7be;hpb=767e625796d67e5f5cc94d7e1949b1389f753764

diff --git a/yarrg/web/query_age b/yarrg/web/query_age
index a02187e..efd7096 100644
--- a/yarrg/web/query_age
+++ b/yarrg/web/query_age
@@ -46,31 +46,41 @@ $dbh
 <%perl>
 my $now= time;
 
-my $row;
 my $sth= $dbh->prepare("SELECT archipelago, islandid, islandname, timestamp
 				FROM uploads NATURAL JOIN islands
-				ORDER BY archipelago, islandid");
+				ORDER BY archipelago, islandname");
 $sth->execute();
 
 </%perl>
+<div class="results">
 
+<& SELF:pageload &>
+<%method pageload>
 <&| script &>
   da_pageload= Date.now();
 </&script>
+</%method>
 
 <h1>Market data age</h1>
 
-<table id="ts_table">
+<& SELF:agestable, now => $now, fetchrow => sub { $sth->fetchrow_hashref } &>
+
+<%method agestable>
+<%args>
+  $now
+  $fetchrow
+</%args>
+<table class="data" id="ts_table" rules="groups">
 <tr>
 <th>Archipelago
 <th>Island
 <th>Age
-</tr>
+% my $row;
 % my %da_ages;
 % my %ts_sortkeys;
 % $da_ages{'id_loaded'}= 0;
 % my $rowix= 0;
-% while ($row=$sth->fetchrow_hashref) {
+% while ($row= $fetchrow->()) {
 %	my $rowid= "id_$row->{'islandid'}";
 %	my $cellid= "c$rowid";
 %	my $age= $now - $row->{'timestamp'};
@@ -80,53 +90,58 @@ $sth->execute();
 <tr id=<% $rowid %> class="<% 'datarow'.($rowix & 1) %>"
    > <td><% $row->{'archipelago'} |h
   %> <td><% $row->{'islandname'} |h
-  %> <td id="<% $cellid %>"><% prettyprint_age($age) %> </tr>
+  %> <td id="<% $cellid %>" align=right><% prettyprint_age($age) %> </tr>
 %	$rowix++;
 % }
 </table>
+<& SELF:dataages, id2age => \%da_ages,
+	jsprefix => 'dat_', elemidprefix => "'c'+" &>
+
+<&| tabsort, table => 'ts_table', rowclass => 'datarow', cols => [
+	{}, {},
+	{ DoReverse => 1,
+	  Numeric => 1,
+	  SortKey => "dat_ages[rowid]" }]
+  &>
+  ts_sortkeys= <% to_json_protecttags(\%ts_sortkeys) %>;
+</&tabsort>
+<p>
+% print $m->content();
+Time since this page loaded:
+<span id="cid_loaded">(not known; times above not updating)</span>
+
+</%method>
 
-<& SELF:dataages, id2age => \%da_ages, elemidprefix => "'c'+" &>
 <%method dataages>
 <%args>
   $id2age
   $elemidprefix => ''
+  $jsprefix => 'da_'
 </%args>
 <&| script &>
-  function da_Refresh() {
+  function <% $jsprefix %>Refresh() {
     var now= Date.now();
     debug('updating now='+now);
-    for (var ageid in da_ages) {
-      var oldage= da_ages[ageid];
+    for (var ageid in <% $jsprefix %>ages) {
+      var oldage= <% $jsprefix %>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);
+  <% $jsprefix %>ages= <% to_json_protecttags($id2age) %>;
+  window.setInterval(<% $jsprefix %>Refresh, 10000);
+  register_onload(<% $jsprefix %>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:
-<span id="cid_loaded">(not known; times above not updating)</span>
-
 <form action="lookup" method="get">
 <input type=submit name=submit value="Reload">
 <& "lookup:formhidden", ours => sub { 0; } &>
 </form>
 
+</div>
 <%init>
 use POSIX;
 use CommodsWeb;