} else {
push @columns, qw(org_name dst_name);
}
+my $ntextcolumns= @columns+1;
push @columns, qw(commodname
- org_price org_qty dst_price dst_qty
- unitprofit PctProfit
+ org_qty org_price dst_qty dst_price
+ Margin unitprofit
MaxQty MaxCapital MaxProfit);
</%perl>
$f->{MaxProfit}= $f->{MaxQty} * $f->{'unitprofit'};
$f->{MaxCapital}= $f->{MaxQty} * $f->{'org_price'};
- $f->{PctProfit}= sprintf "%3.1f%%",
+ $f->{Margin}= sprintf "%3.1f%%",
$f->{'dst_price'} * 100.0 / $f->{'org_price'} - 100.0;
$f->{"org_stallid"}= $f->{"dst_stallid"}= 'all'
% {
% my $cdspan= $qa->{ShowStalls} ? ' colspan=2' : '';
% my $cdstall= $qa->{ShowStalls} ? '<th>Stall</th>' : '';
-<table>
+<table rules=groups>
+<colgroup span=1>
+<colgroup span=2>
+<% $qa->{ShowStalls} ? '<colgroup span=2>' : '' %>
+<colgroup span=1>
+<colgroup span=2>
+<colgroup span=2>
+<colgroup span=2>
+<colgroup span=3>
+% if ($optimise) {
+<colgroup span=3>
+% }
<tr>
<th>
<th<% $cdspan %>>Collect
<th>Island <% $cdstall %>
<th>Island <% $cdstall %>
<th>Commodity
-<th>Price
<th>Qty
<th>Price
<th>Qty
-<th>Unit
+<th>Price
<th>Margin
+<th>Unit
<th>Qty
<th>Capital
<th>Profit
<td><input type=hidden name=R<% $flow->{UidShort} %> value="">
<input type=checkbox name=T<% $flow->{UidShort} %> value=""
<% $flow->{Suppress} ? '' : 'checked' %> >
-% foreach my $col (@columns) {
-<td><% $flow->{$col} |h %>
+% foreach my $ci (0..$#columns) {
+% my $col= $columns[$ci];
+% my $v= $flow->{$col};
+% my $isnum= $ci >= $ntextcolumns;
+% $v='' if $isnum && !$v;
+<td <% $isnum ? 'align=right' : '' %>><% $v |h %>
% }
% }
</table>