X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=cb0ef9379e1a451ebbe3b5c3aff332794ada7850;hp=ee15afbc1e98e6aa82f88f5bac22cda24d57d6c7;hb=7d910f97374604024af42c3497b82c35ed7715ab;hpb=7f92b134aef043ef30305f3175d3559829b04805;ds=sidebyside

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">