Merge branch 'master' into stable-5.x

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

diff --git a/yarrg/web/query_route b/yarrg/web/query_route
index 26b83a58b1308f3a595712ff76d1918bbee46146..fb32bcdd705017d6ad82f7da4a3344c55b44b47e 100644 (file)
--- 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;
 
@@ -87,55 +84,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}) {
 
-<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',
-    onresults => sub { ($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',
-    onresults => sub { ($lossperleaguepct)= @_; }
- &>
- size=9
-</&>
-</tr>
-<tr>
-
-<td>Available capital:
-
-<&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'ac',
-    thingstring => 'capitalstring', emsgstore => \$emsg,
-    helpref => 'capital',
-    onresults => sub { ($capital)= @_; }
- &>
- size=9
-</&>
-</td>
-</tr>
-</table>
+<& enter_advrouteopts, qa=>$qa, dbh=>$dbh, routeparams=>$routeparams &>
 
 % } #---------- end of dropdowns, now common middle of page code ----------
 
@@ -158,16 +113,13 @@ 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
  &>
 % }
 </form>