Merge branch 'stable-3.x'

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

diff --git a/yarrg/web/query_route b/yarrg/web/query_route
index 759c9c547cbd92f01f39a6e9bda8e900a651d6d5..9a6ca0829114c622552209991c1fb6e1901094f4 100644 (file)
--- a/yarrg/web/query_route
+++ b/yarrg/web/query_route
@@ -39,6 +39,7 @@ $dbh
 $prselector
 $routestring => '';
 $capacitystring => '';
+$lossperleague => '';
 $someresults
 $emsgokorprint
 </%args>
@@ -49,6 +50,7 @@ my @archipelagoes;
 my @islandids;
 my %islandid2;
 my ($max_volume, $max_mass);
+my $lossperleaguepct;
 
 my $qa= \%ARGS;
 
@@ -86,15 +88,40 @@ Enter route (islands, or archipelagoes, separated by |s or commas;
  size=80
 </&>
 
-Vessel capacity:
+<strong>Advanced options - you may leave these blank:</strong>
+<p>
+<table>
+<tr>
+<td>
+
+Vessel or capacity:
 <&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'cs',
     thingstring => 'capacitystring', emsgstore => \$emsg,
+    helpref => 'capacity',
     perresult => sub {
-        ($max_volume,$max_mass) = @_;
+        ($max_mass,$max_volume) = @_;
     }
  &>
+ size=40
+</&>
+
+<td>
+&nbsp;
+&nbsp;
+
+<td>
+Expected losses:
+
+<&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'll',
+    thingstring => 'lossperleague', emsgstore => \$emsg,
+    helpref => 'losses',
+    perresult => sub { ($lossperleaguepct)= @_; }
+ &>
+ size=9
 </&>
 
+</table>
+
 % } else { #---------- dropdowns, user selects from menus ----------
 
 % $startform->(grep {
@@ -193,7 +220,7 @@ function ms_Setarch(dd) {
 
 <input type=submit name=submit value="<% $goupdate->() %>">
 % my $ours= sub { $_[0] =~
-%      m/^island|^archipelago|^routestring|^capacitystring|^[RT]/;
+%  m/^island|^archipelago|^routestring|^capacitystring|^lossperleague|^[RT]/;
 % };
 <& "lookup:formhidden", ours => $ours &>
 
@@ -240,7 +267,8 @@ for my $dd (0..$qa->{Dropdowns}-1) {
    archipelagoes => \@archipelagoes,
    qa => $qa,
    max_mass => $max_mass,
-   max_volume => $max_volume
+   max_volume => $max_volume,
+   lossperleaguepct => $lossperleaguepct
  &>
 </form>
 % }