Allow showing stall names in routetrade

[ypp-sc-tools.web-live.git] / yarrg / web / routetrade

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index 9c2a5a423fdda83fe833c43ceb2ba02462df6a79..c5c2ab7e3b8d042de5660aaef9f4f96d2940865b 100644 (file)
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -98,30 +98,43 @@ my $stmt= "
        SELECT  sell_islands.islandname                         org_name,
                sell_islands.islandid                           org_id,
                sell.price                                      org_price,
-               sum(sell.qty)                                   org_qty,
                buy_islands.islandname                          dst_name,
                buy_islands.islandid                            dst_id,
                buy.price                                       dst_price,
+".($qa->{ShowStalls} ? "
+               sell.stallid                                    org_stallid,
+               sell_stalls.stallname                           org_stallname,
+               sell.qty                                        org_qty,
+               buy.stallid                                     dst_stallid,
+               buy_stalls.stallname                            dst_stallname,
+               buy.qty                                         dst_qty,
+" : "
+               sum(sell.qty)                                   org_qty,
                sum(buy.qty)                                    dst_qty,
+")."
                commods.commodname                              commodname,
                commods.commodid                                commodid,
                commods.unitmass                                unitmass,
                commods.unitvolume                              unitvolume,
-               buy.price - sell.price                          unitprofit,
-               min(sell.qty,buy.qty)                           max_qty,
-               min(sell.qty,buy.qty) * (buy.price-sell.price)  max_profit
+               buy.price - sell.price                          unitprofit
        FROM commods
        JOIN buy  on commods.commodid = buy.commodid
        JOIN sell on commods.commodid = sell.commodid
        JOIN islands as sell_islands on sell.islandid = sell_islands.islandid
        JOIN islands as buy_islands  on buy.islandid  = buy_islands.islandid
+".($qa->{ShowStalls} ? "
+       JOIN stalls  as sell_stalls  on sell.stallid  = sell_stalls.stallid
+       JOIN stalls  as buy_stalls   on buy.stallid   = buy_stalls.stallid
+" : "")."
        WHERE   (
                ".join("
           OR   ", @flow_conds)."
        )
          AND   buy.price > sell.price
+".($qa->{ShowStalls} ? "" : "
        GROUP BY commods.commodid, org_id, org_price, dst_id, dst_price
-       ORDER BY org_name, dst_name, max_profit DESC, commodname,
+")."
+       ORDER BY org_name, dst_name, commodname, unitprofit DESC,
                 org_price, dst_price DESC
      ";
 
@@ -129,9 +142,16 @@ my $sth= $dbh->prepare($stmt);
 $sth->execute(@query_params);
 my @flows;
 
-my @columns= qw(org_name dst_name commodname
-               org_price org_qty dst_price dst_qty
-               max_qty max_profit);
+my @columns;
+if ($qa->{ShowStalls}) {
+       push @columns,       qw(org_name org_stallname dst_name dst_stallname);
+} else {
+       push @columns,       qw(org_name dst_name);
+}
+push @columns,              qw(commodname
+                               org_price org_qty dst_price dst_qty
+                               unitprofit PctProfit
+                               MaxQty MaxCapital MaxProfit);
 
 </%perl>
 
@@ -154,7 +174,8 @@ my @columns= qw(org_name dst_name commodname
 <& dumptable:end &>
 % }
 
-% if (!$specific || $confusing || @islandids<=1) {
+% my $optimise= $specific && !$confusing && @islandids>1;
+% if (!$optimise) {
 
 <p>
 % if (@islandids<=1) {
@@ -242,8 +263,9 @@ if ($qa->{'debug'}) {
                my ($ix, $qty) =
                        m/^\s*\d+\s+f(\d+)\s+\S+\s+(\d+)\s/ or die "$_ ?";
                my $flow= $flows[$ix] or die;
-               $flow->{Opt_qty}= $qty;
-               $flow->{Opt_profit}= $flow->{'unitprofit'} * $qty;
+               $flow->{OptQty}= $qty;
+               $flow->{OptProfit}= $flow->{'unitprofit'} * $qty;
+               $flow->{OptCapital}= $flow->{OptQty} * $flow->{'org_price'};
        }
        print "</pre>\n" if $qa->{'debug'};
        pipethrough_run_finish($output, 'glpsol');
@@ -252,14 +274,63 @@ if ($qa->{'debug'}) {
 
 print join ' ', map { $_->{Optimal} } @flows;
 
-push @columns, qw(Opt_qty Opt_profit);
+push @columns, qw(OptQty OptCapital OptProfit);
 
 </%perl>
 
-<& dumptable:literal, cols => \@columns, rows => \@flows &>
-
 % } # ========== OPTIMISATION ==========
 
+% {
+%      my $cdspan= $qa->{ShowStalls} ? ' colspan=2' : '';
+%      my $cdstall= $qa->{ShowStalls} ? '<th>Stall</th>' : '';
+<table>
+<tr>
+<th<% $cdspan %>>Collect
+<th<% $cdspan %>>Deliver
+<th>
+<th colspan=2>Collect
+<th colspan=2>Deliver
+<th colspan=2>Profit
+<th colspan=3>Max
+%      if ($optimise) {
+<th colspan=3>Suggested
+%      }
+
+<tr>
+<th>Island <% $cdstall %>
+<th>Island <% $cdstall %>
+<th>Commodity
+<th>Price
+<th>Qty
+<th>Price
+<th>Qty
+<th>Unit
+<th>Margin
+<th>Qty
+<th>Capital
+<th>Profit
+%      if ($optimise) {
+<th>Qty
+<th>Capital
+<th>Profit
+%      }
+% }
+
+% foreach my $flow (@flows) {
+<tr>
+%      foreach my $col (@columns) {
+%              $flow->{MaxQty}= $flow->{'org_qty'} < $flow->{'dst_qty'}
+%                      ? $flow->{'org_qty'} : $flow->{'dst_qty'};
+%              $flow->{MaxProfit}= $flow->{MaxQty} * $flow->{'unitprofit'};
+%              $flow->{PctProfit}= sprintf "%3.1f%%",
+%                      $flow->{'dst_price'} * 100.0 / $flow->{'org_price'}
+%                      - 100.0;
+%              $flow->{MaxCapital}= $flow->{MaxQty} * $flow->{'org_price'};
+<td><% $flow->{$col} |h %>
+%      }
+% }
+</table>
+
 <%init>
 use CommodsWeb;
 use Commods;