X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_route;h=a4e9a067e1b4c40b9c31215ad1bcc9abaee3f2fb;hb=18bff492748999fe28f474cea854f0fd26d6394f;hp=26b83a58b1308f3a595712ff76d1918bbee46146;hpb=13b9f206d92634f4e6f4a940ed31690c1235d827;p=ypp-sc-tools.main.git
diff --git a/yarrg/web/query_route b/yarrg/web/query_route
index 26b83a5..a4e9a06 100644
--- a/yarrg/web/query_route
+++ b/yarrg/web/query_route
@@ -50,9 +50,6 @@ my $emsg;
my @warningfs;
my @archipelagoes;
my @islandids;
-my ($max_volume, $max_mass);
-my $lossperleaguepct;
-my $capital;
my $qa= \%ARGS;
@@ -67,8 +64,6 @@ my $goupdate= sub { $be_post ? 'Update' : 'Go' };
%perl>
-
Specify route
-
% # Sadly we need to do this rather hacky thing to make it be a POST
% # form if the user has already selected some thing(s)
% if (!$qa->{Dropdowns}) {
@@ -80,6 +75,10 @@ my $goupdate= sub { $be_post ? 'Update' : 'Go' };
% } (0..$qa->{Dropdowns}-1));
% }
+
+
+
Specify route
+
% $prselector->('ShowStalls');
<& enter_route, qa => $qa, dbh => $dbh, emsg_r => \$emsg,
@@ -87,55 +86,13 @@ my $goupdate= sub { $be_post ? 'Update' : 'Go' };
enterwhat => 'Enter route',
islandids_r => \@islandids,
archipelagoes_r => \@archipelagoes
-&>
+ &>
%#---------- textboxes, user enters details as strings ----------
+% my $routeparams= { EmsgRef => \$emsg };
% if (!$qa->{Dropdowns}) {
-
Advanced options - you may leave these blank:
-
-
-
-
-
-Vessel or capacity:
-<&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'cs',
- thingstring => 'capacitystring', emsgstore => \$emsg,
- helpref => 'capacity',
- onresults => sub { ($max_mass,$max_volume) = @_; }
- &>
- size=40
-&>
-
- |
-
-
-
- |
-Expected losses:
-
-<&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'll',
- thingstring => 'lossperleague', emsgstore => \$emsg,
- helpref => 'losses',
- onresults => sub { ($lossperleaguepct)= @_; }
- &>
- size=9
-&>
- |
-
-
-Available capital:
-
-<&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'ac',
- thingstring => 'capitalstring', emsgstore => \$emsg,
- helpref => 'capital',
- onresults => sub { ($capital)= @_; }
- &>
- size=9
-&>
- |
-
-
+<& enter_advrouteopts, qa=>$qa, dbh=>$dbh, routeparams=>$routeparams &>
% } #---------- end of dropdowns, now common middle of page code ----------
@@ -145,6 +102,8 @@ Expected losses:
% };
<& "lookup:formhidden", ours => $ours &>
+
+
<%perl>
#========== results ==========
@@ -158,16 +117,14 @@ foreach my $warningf (@warningfs) {
%perl>
% if (@islandids) {
-% $someresults->('Relevant trades');
+% $someresults->();
<& routetrade,
dbh => $dbh,
islandids => \@islandids,
archipelagoes => \@archipelagoes,
qa => $qa,
- max_mass => $max_mass,
- max_volume => $max_volume,
- lossperleaguepct => $lossperleaguepct,
- max_capital => $capital
+ routeparams => $routeparams
&>
% }
+