Show overall total cash flow

diff --git a/yarrg/TODO b/yarrg/TODO
index ad3e1fc5d897c0af4b361fc93f7ffe83595bf813..d0862504e4405001aece394565ddcd46979b349e 100644 (file)
--- a/yarrg/TODO
+++ b/yarrg/TODO
@@ -29,8 +29,6 @@ use POST for routetrade update
 
 dropdowns are broken sometimes
 
-display net cash flow
-
 initial/final stocks feature
 
 adjustable potential cost of losses (rather than fixed 1e-BIG per league)

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index 6fe34fee16d382e0eb0e954a2e9fa6f174f04e23..4d8cd9f9ae8b77881616d907aa130b2f90ca19b2 100644 (file)
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -551,6 +551,7 @@ $addcols->({ Total => 0, DoReverse => 1 }, qw(
 % my $iquery= $dbh->prepare('SELECT islandname FROM islands
 %                              WHERE islandid = ?');
 % my %da_ages;
+% my $total_total= 0;
 %
 <h1>Voyage trading plan</h1>
 <table rules=groups>
@@ -647,25 +648,32 @@ Sail to <% $islandname |h %>
 %      }
 %    };
 %    my $show_total= sub {
-%      my ($totaldesc)= @_;
+%      my ($totaldesc, $sign)= @_;
 %      if (defined $total) {
 <tr>
 <td colspan=3>
 <td colspan=2 align=right><% $totaldesc %>
 <td align=right><% $total |h %> total
+%              $total_total += $sign * $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');
+     $show_flows->('dst',0,'Deliver'); $show_total->('Proceeds',1);
+     $show_flows->('org',1,'Collect'); $show_total->('(Arbitrage) outlay',-1);
+     $show_flows->('dst',1,'Deliver'); $show_total->('(Arbitrage) proceeds',1);
+     $show_flows->('org',0,'Collect'); $show_total->('Outlay',-1);
 
 }
 </%perl>
+<tbody><tr>
+<td colspan=2>
+<td colspan=3 align=right>Overall net cash flow
+<td align=right><strong><%
+  $total_total < 0 ? -$total_total." loss" : $total_total." gain"
+ %></strong>
 </table>
 <& query_age:dataages, id2age => \%da_ages &>
 %