X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_route;h=296c0126f8989fb1a22c897605e197944a1771d0;hp=d4a3bd15e4c06cd362765852d3e63bcc8c6284fd;hb=742ec1631db983f22545c9c7d6d573865bdc85fa;hpb=70f23c42b325a1463fe8a9d76cb967b7df1260df

diff --git a/yarrg/web/query_route b/yarrg/web/query_route
index d4a3bd1..296c012 100644
--- 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,6 +88,12 @@ Enter route (islands, or archipelagoes, separated by |s or commas;
  size=80
 </&>
 
+<strong>Advanced options - you may leave these blank:</strong>
+<p>
+<table>
+<tr>
+<td>
+
 Vessel capacity:
 <&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'cs',
     thingstring => 'capacitystring', emsgstore => \$emsg,
@@ -93,8 +101,25 @@ Vessel capacity:
         ($max_volume,$max_mass) = @_;
     }
  &>
+ size=30
+</&>
+
+<td>
+&nbsp;
+&nbsp;
+
+<td>
+Estimated loss per league:
+
+<&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'll',
+    thingstring => 'lossperleague', emsgstore => \$emsg,
+    perresult => sub { ($lossperleaguepct)= @_; }
+ &>
+ size=10
 </&>
 
+</table>
+
 % } else { #---------- dropdowns, user selects from menus ----------
 
 % $startform->(grep {
@@ -193,7 +218,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 &>
 
@@ -238,7 +263,10 @@ for my $dd (0..$qa->{Dropdowns}-1) {
    dbh => $dbh,
    islandids => \@islandids,
    archipelagoes => \@archipelagoes,
-   qa => $qa
+   qa => $qa,
+   max_mass => $max_mass,
+   max_volume => $max_volume,
+   lossperleaguepct => $lossperleaguepct
  &>
 </form>
 % }