Stripey tables

[ypp-sc-tools.db-live.git] / yarrg / web / query_commod

diff --git a/yarrg/web/query_commod b/yarrg/web/query_commod
index a4063c12204e703bbb748e07e3d444c3c0f89bc3..34b1347f20f5034315a1821d535cd6de40f8f8e2 100644 (file)
--- a/yarrg/web/query_commod
+++ b/yarrg/web/query_commod
@@ -52,6 +52,7 @@ my $qa= \%ARGS;
 <h1>Commodity enquiry</h1>
 
 % $prselector->('BuySell');
+% $prselector->('ShowBlank');
 
 %#---------- textbox, user enters route as string ----------
 % if (!$qa->{Dropdowns}) {
@@ -88,18 +89,21 @@ $someresults->();
 
 #---------- actually compute the results and print them ----------
 
+my $onloads= "";
+
 foreach my $bs (split /_/, $ARGS{BuySell}) {
        $bs =~ m/^(buy|sell)$/ or die;
        $bs= $1;
        my ($ascdesc) = ($bs eq 'buy')
                ? ('DESC')
                : ('ASC');
-
+       my $joinkind= $ARGS{ShowBlank} ? 'LEFT OUTER JOIN' : 'INNER JOIN';
        my $islands= $dbh->prepare(
-       "SELECT islandid, archipelago, islandname, sum(qty) as tqty
-               FROM $bs NATURAL JOIN islands
-               WHERE commodid = ?
-               GROUP BY islandid,
+       "SELECT islands.islandid AS islandid, archipelago, islandname,
+                       sum(qty) as tqty
+               FROM islands $joinkind $bs offers
+               ON islands.islandid == offers.islandid AND commodid == ?
+               GROUP BY islands.islandid
                ORDER BY archipelago, islandname"
                );
 
@@ -115,41 +119,44 @@ foreach my $bs (split /_/, $ARGS{BuySell}) {
 
 <h2>Offers to <% uc $bs |h %> <% $commodname |h %></h2>
 
-<table>
+<table id="<% $bs %>_table">
 <tr>
 <th colspan=3>
 <th colspan=2>Prices
-<th colspan=3>Quantities available
-<tr>
+<th colspan=3>Quantity at price
+<tr id="<% $bs %>_table_thr">
 <th>Archipelago
 <th>Island
-<th>Unique best stall
+<th>Stall(s)
 <th>Best
 <th>Median
-<th>At best
-<th>Within 10%
-<th>Total
+<th>Best
+<th>+/-10%
+<th>Any
 </tr>
 %      $islands->execute($commodid);
 %      my $island;
+%      my %ts_sortkeys;
+%      my $rowix= 0;
 %      while ($island= $islands->fetchrow_hashref) {
 %              my $islandid= $island->{'islandid'};
 %              $offers->execute($commodid, $islandid);
-%              my ($offer, $bestprice, $median, $marginal, @beststalls);
+%              my ($offer, $bestprice, $marginal, @beststalls);
 %              my $tqty= $island->{'tqty'};
-%              my $cqty= 0;
-%              my $bestqty= 0;
-%              my $approxqty= 0;
+%              my $cqty= '';
+%              my $bestqty= '';
+%              my $approxqty= '';
+%              my $median= '-';
 %              while ($offer= $offers->fetchrow_hashref) {
 %                      my $price= $offer->{'price'};
 %                      my $qty= $offer->{'qty'};
-%                      defined $bestprice or $bestprice= $price;
+%                      length $bestqty or $bestprice= $price;
 %                      if ($price == $bestprice) {
 %                              $bestqty += $qty;
 %                              push @beststalls, $offer->{'stallname'};
 %                      }
 %                      $cqty += $qty;
-%                      if ($cqty*2 >= $tqty && !defined $median) {
+%                      if ($cqty*2 >= $tqty && $median eq '-') {
 %                              $median= $price;
 %                      }
 %                      if ($bestprice*9 <= $price*10 and
@@ -157,20 +164,65 @@ foreach my $bs (split /_/, $ARGS{BuySell}) {
 %                              $approxqty += $qty;
 %                      }
 %              }
-%              my $nstalls= @beststalls;
+%              my $stallname;
+%
+%              my $rowid= "id_${bs}_$islandid";
+%              my $s= [ ];
+%
+%              $s->[2]= sprintf "%06d", scalar @beststalls;
+%              if (!@beststalls) {
+%                      $stallname= '-';
+%              } elsif (@beststalls==1) {
+%                      $stallname= $beststalls[0];
+%                      $s->[2] .= " $stallname";
+%              } else {
+%                      $stallname= sprintf "%d offers", scalar @beststalls;
+%              }
+%
 %              $cqty == $tqty or die "$bs $cqty $tqty $commodid $islandid ";
-<tr> <td><% $island->{'archipelago'} |h %>
-     <td><% $island->{'islandname'} |h %>
-     <td><% $nstalls==1 ? $beststalls[0] : "$nstalls offers" |h %>
-     <td><% $bestprice %>
-     <td><% $median %>
-     <td><% $bestqty %>
-     <td><% $approxqty %>
-     <td><% $tqty %>
+<tr id=<% $rowid %> class="<% 'datarow'.($rowix & 1) %>">
+     <td><% $s->[0]= $island->{'archipelago'} |h %>
+     <td><% $s->[1]= $island->{'islandname'} |h %>
+     <td><%          $stallname |h %>
+     <td><% $s->[3]= (length $bestqty ? $bestprice : '-') %>
+     <td><% $s->[4]= $median %>
+     <td><% $s->[5]= $bestqty %>
+     <td><% $s->[6]= $approxqty %>
+     <td><% $s->[7]= $cqty %>
 </tr>
+%              for my $cix (0..$#$s) {
+%                      $ts_sortkeys{$cix}{$rowid}= $s->[$cix];
+%              }
+%              $rowix++;
 %      }
 </table>
 
+<& tabsort,    table => "${bs}_table", sortkeys => "${bs}_sortkeys",
+               throw => "${bs}_table_thr", rowclass => 'datarow', cols => [
+       {}, {},
+       { DoReverse => 1 },
+       { DoReverse => 1, Numeric => 1, MapFn => "ts_Pricemap_${bs}" },
+       { DoReverse => 1, Numeric => 1, MapFn => "ts_Pricemap_${bs}" },
+       { DoReverse => 1, Numeric => 1 },
+       { DoReverse => 1, Numeric => 1 },
+       { DoReverse => 1, Numeric => 1 },
+       ] &>
+<&| script &>
+  <% $bs %>_sortkeys= <% to_json_protecttags(\%ts_sortkeys) %>;
+  function ts_Pricemap_<% $bs %>(price) {
+    if (price=='-') { return <% $bs eq 'buy' ? '-1' : '99999999' %>; }
+    return price;
+  }
+</&>
+%      $onloads .= "    ts_onload__${bs}_table();\n";
+
 <%perl>
 }
 </%perl>
+
+<&| script &>
+  function all_onload() {
+<% $onloads %>
+  }
+  window.onload= all_onload;
+</&>