X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_route;h=81e91bcca2334c023edefb73060f544ebb77c08c;hp=296c0126f8989fb1a22c897605e197944a1771d0;hb=1a64a4e4703ade43ff0b26150f8128969be0ec8b;hpb=742ec1631db983f22545c9c7d6d573865bdc85fa
diff --git a/yarrg/web/query_route b/yarrg/web/query_route
index 296c012..81e91bc 100644
--- a/yarrg/web/query_route
+++ b/yarrg/web/query_route
@@ -40,6 +40,7 @@ $prselector
$routestring => '';
$capacitystring => '';
$lossperleague => '';
+$capitalstring => '';
$someresults
$emsgokorprint
%args>
@@ -51,6 +52,7 @@ my @islandids;
my %islandid2;
my ($max_volume, $max_mass);
my $lossperleaguepct;
+my $capital;
my $qa= \%ARGS;
@@ -94,14 +96,15 @@ Enter route (islands, or archipelagoes, separated by |s or commas;
-Vessel capacity:
+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=30
+ size=40
&>
|
@@ -109,15 +112,29 @@ Vessel capacity:
|
-Estimated loss per league:
+Expected losses:
<&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'll',
thingstring => 'lossperleague', emsgstore => \$emsg,
+ helpref => 'losses',
perresult => sub { ($lossperleaguepct)= @_; }
&>
- size=10
+ size=9
&>
+ |
+
+
+Available capital:
+<&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'ac',
+ thingstring => 'capitalstring', emsgstore => \$emsg,
+ helpref => 'capital',
+ perresult => sub { ($capital)= @_; }
+ &>
+ size=9
+&>
+ |
+
% } else { #---------- dropdowns, user selects from menus ----------
@@ -218,7 +235,7 @@ function ms_Setarch(dd) {
% my $ours= sub { $_[0] =~
-% m/^island|^archipelago|^routestring|^capacitystring|^lossperleague|^[RT]/;
+% m/^island|^archipelago|^routestring|^capacitystring|^lossperleague|^capitalstring|^[RT]/;
% };
<& "lookup:formhidden", ours => $ours &>
@@ -266,7 +283,8 @@ for my $dd (0..$qa->{Dropdowns}-1) {
qa => $qa,
max_mass => $max_mass,
max_volume => $max_volume,
- lossperleaguepct => $lossperleaguepct
+ lossperleaguepct => $lossperleaguepct,
+ max_capital => $capital
&>
% }