X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;ds=sidebyside;f=yarrg%2Fweb%2Fquery_commod;h=0bd36cbffa4db9e958ce30cbc84521a181e70862;hb=2007f48bd68be9218b8f41acd9ba32d378a1b22c;hp=4869e5c50fad00d6222fa0a1ce8e2df110f488a9;hpb=890faab73220a817300d53a362464d6a7fc06788;p=ypp-sc-tools.web-live.git

diff --git a/yarrg/web/query_commod b/yarrg/web/query_commod
index 4869e5c..0bd36cb 100644
--- 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,17 +89,19 @@ $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');
-#INNER JOIN 
+	my $joinkind= $ARGS{ShowBlank} ? 'LEFT OUTER JOIN' : 'INNER JOIN';
 	my $islands= $dbh->prepare(
 	"SELECT islands.islandid AS islandid, archipelago, islandname,
 			sum(qty) as tqty
-		FROM islands LEFT OUTER JOIN $bs offers
+		FROM islands $joinkind $bs offers
 		ON islands.islandid == offers.islandid AND commodid == ?
 		GROUP BY islands.islandid,
 		ORDER BY archipelago, islandname"
@@ -116,23 +119,24 @@ 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;
 %	while ($island= $islands->fetchrow_hashref) {
 %		my $islandid= $island->{'islandid'};
 %		$offers->execute($commodid, $islandid);
@@ -159,21 +163,64 @@ 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==0 ? '-' :
-            $nstalls==1 ? $beststalls[0] : "$nstalls offers" |h %>
-     <td><% length $bestqty ? $bestprice : '-' %>
-     <td><% $median %>
-     <td><% $bestqty %>
-     <td><% $approxqty %>
-     <td><% $cqty %>
+<tr id=<% $rowid %> >
+     <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];
+%		}
 %	}
 </table>
 
+<& tabsort,	table => "${bs}_table", sortkeys => "${bs}_sortkeys",
+		throw => "${bs}_table_thr", 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;
+</&>