From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sun, 23 Aug 2009 15:22:44 +0000 (+0100)
Subject: Totals
X-Git-Tag: 3.4~131
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=commitdiff_plain;h=7d910f97374604024af42c3497b82c35ed7715ab

Totals
---

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index ee15afb..cb0ef93 100644
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -165,8 +165,6 @@ $addcols->({ Text => 1 }, qw(commodname));
 $addcols->({},
 	qw(	org_qty org_price dst_qty dst_price
 		Margin unitprofit MaxQty
-	));
-$addcols->({ Total => 1 }, qw(
 		MaxCapital MaxProfit
 	));
 
@@ -384,7 +382,7 @@ if ($qa->{'debug'}) {
 $addcols->({}, qw(
 		OptQty
 	));
-$addcols->({ Total => 1 }, qw(
+$addcols->({ Total => 0 }, qw(
 		OptCapital OptProfit
 	));
 
@@ -449,10 +447,21 @@ $addcols->({ Total => 1 }, qw(
 %	foreach my $ci (0..$#cols) {
 %		my $col= $cols[$ci];
 %		my $v= $flow->{$col->{Name}};
+%		$col->{Total} += $v if defined $col->{Total};
 %		$v='' if !$col->{Text} && !$v;
 <td <% $col->{Text} ? '' : 'align=right' %>><% $v |h %>
 %	}
 % }
+<tr>
+<th>
+<th colspan=2>Total
+% foreach my $ci (2..$#cols) {
+%	my $col= $cols[$ci];
+<td align=right>
+%	if (defined $col->{Total}) {
+<% $col->{Total} |h %>
+%	}
+% }
 </table>
 
 <input type=submit name=update value="Update">