X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=07789cf412564330fbfcd3d3606d30077c28b20b;hb=492ee8e5d023945e2768e9568f22bd63a19b59f4;hp=4dbe36e95c533e95cfecce13497c3baba0df66b4;hpb=ec244cf220ba2232df707da397dd10de776dbda2;p=ypp-sc-tools.db-live.git

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index 4dbe36e..07789cf 100644
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -34,6 +34,13 @@
 
 ========== TODO ==========
 16:36 <ceb> alpha,byrne,papaya,turtle,jorvik,luthien is my example
+xi,heph for mixed arbitrage/trade
+
+initial/final stocks feature
+
+display net cash flow
+
+onload thing broken, need proper framework
 
 use POST for update.  Hrrm.
 
@@ -563,8 +570,9 @@ $addcols->({ Total => 0, DoReverse => 1 }, qw(
 % my %da_ages;
 %
 <h1>Voyage trading plan</h1>
-<table>
+<table rules=groups>
 % foreach my $i (0..$#islandids) {
+<tbody>
 <tr><td colspan=3><strong>
 %	$iquery->execute($islandids[$i]);
 %	my ($islandname) = $iquery->fetchrow_array();
@@ -574,44 +582,66 @@ Start at <% $islandname |h %>
 Sail to <% $islandname |h %>
 %	}
 </strong>
-%    my $age_reported= 0;
-%    foreach my $od (qw(dst org)) {
-%	my $sign= $od eq 'dst' ? -1 : +1;
-%	my %todo;
-%	foreach my $f (@flows) {
-%		next if $f->{Suppress};
-%		next unless $f->{"${od}_id"} == $islandids[$i];
-%		next unless $f->{OptQty};
-%		my $price= $f->{"${od}_price"};
-%		my $stallname= $f->{"${od}_stallname"};
-%		my $todo= \$todo{ $f->{'commodname'},
-%				  (sprintf "%07d", $price),
-%				  $stallname };
-%		$$todo= { Qty => 0 } unless $$todo;
-%		$$todo->{'commodname'}= $f->{'commodname'};
-%		$$todo->{'stallname'}= $stallname;
-%		$$todo->{Price}= $price;
-%		$$todo->{Timestamp}= $f->{"${od}_timestamp"};
-%		$$todo->{Qty} += $f->{OptQty};
-%		$$todo->{Total}= $$todo->{Price} * $$todo->{Qty};
-%		$$todo->{Stalls}= $f->{"${od}Stalls"};
-%	}
-%	if (%todo && !$age_reported++) {
-%		my $age= $now - (values %todo)[0]->{Timestamp};
-%		my $cellid= "da_${i}";
-%		$da_ages{$cellid}= $age;
-<td colspan=3 align=right>\
+<%perl>
+     my $age_reported= 0;
+     my %flowlists;
+     foreach my $od (qw(org dst)) {
+	foreach my $f (@flows) {
+		next if $f->{Suppress};
+		next unless $f->{"${od}_id"} == $islandids[$i];
+		next unless $f->{OptQty};
+		my $price= $f->{"${od}_price"};
+		my $stallname= $f->{"${od}_stallname"};
+		my $todo= \$flowlists{$od}{
+				$f->{'commodname'},
+				(sprintf "%07d", ($od eq 'dst' ?
+						9999999-$price : $price)),
+				$stallname
+			};
+		$$todo= {
+			Qty => 0,
+			orgArbitrage => 0,
+			dstArbitrage => 0,
+		} unless $$todo;
+		$$todo->{'commodname'}= $f->{'commodname'};
+		$$todo->{'stallname'}= $stallname;
+		$$todo->{Price}= $price;
+		$$todo->{Timestamp}= $f->{"${od}_timestamp"};
+		$$todo->{Qty} += $f->{OptQty};
+		$$todo->{Total}= $$todo->{Price} * $$todo->{Qty};
+		$$todo->{Stalls}= $f->{"${od}Stalls"};
+		if ($f->{'org_id'} == $f->{'dst_id'}) {
+			$$todo->{"${od}Arbitrage"}= 1;
+		}
+	}
+     }
+
+     my $total;
+     my $dline= 0;
+     my $show_flows= sub {
+	my ($od,$arbitrage,$collectdeliver) = @_;
+</%perl>
+%
+%	my $todo= $flowlists{$od};
+%	return unless $todo;
+%	foreach my $tkey (sort keys %$todo) {
+%		my $t= $todo->{$tkey};
+%		next if $t->{"${od}Arbitrage"} != $arbitrage;
+%		if (!$age_reported++) {
+%			my $age= $now - $t->{Timestamp};
+%			my $cellid= "da_${i}";
+%			$da_ages{$cellid}= $age;
+<td colspan=3>\
 (Data age: <span id="<% $cellid %>"><% prettyprint_age($age) %></span>)
-%	}
-%	my $total= 0;
-%	my $dline= 0;
-%	foreach my $tkey (sort keys %todo) {
-%		my $t= $todo{$tkey};
+%		} elsif (!defined $total) {
+%			$total= 0;
+<tbody>
+%		}
 %		$total += $t->{Total};
 %		my $span= 0 + keys %{ $t->{Stalls} };
 %		my $td= "td rowspan=$span";
 <tr class="datarow<% $dline %>">
-<<% $td %>><% $od eq 'org' ? 'Collect' : 'Deliver' %>
+<<% $td %>><% $collectdeliver %>
 <<% $td %>><% $t->{'commodname'} |h %>
 %
 %		my @stalls= sort keys %{ $t->{Stalls} };
@@ -632,13 +662,27 @@ Sail to <% $islandname |h %>
 %
 %		$dline ^= 1;
 %	}
-%	if (%todo) {
+%    };
+%    my $show_total= sub {
+%	my ($totaldesc)= @_;
+%	if (defined $total) {
 <tr>
-<td colspan=4><td align=right><% $od eq 'org' ? 'Outlay' : 'Proceeds' %>
+<td colspan=3>
+<td colspan=2 align=right><% $totaldesc %>
 <td align=right><% $total |h %> total
 %	}
-%    }
-% }
+%	$total= undef;
+%	$dline= 0;
+<%perl>
+     };
+
+     $show_flows->('dst',0,'Deliver');  $show_total->('Proceeds');
+     $show_flows->('org',1,'Collect');  $show_total->('(Arbitrage) outlay');
+     $show_flows->('dst',1,'Deliver');  $show_total->('(Arbitrage) proceeds');
+     $show_flows->('org',0,'Collect');  $show_total->('Outlay');
+
+}
+</%perl>
 </table>
 <& query_age:dataages, id2age => \%da_ages &>
 %