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=a4e9a067e1b4c40b9c31215ad1bcc9abaee3f2fb;hp=2162e8a8bbf203c7336c561d217374c378d11043;hb=1f6f88af87868d6e059be154ed6b56dd9ea7ac6c;hpb=991b38b009b25da6992e9d984cd74d0e47c3c0b6

diff --git a/yarrg/web/query_route b/yarrg/web/query_route
index 2162e8a..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>
 
-<h1>Specify route</h1>
-
 % # 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));
 % }
 
+<div class="query">
+
+<h1>Specify route</h1>
+
 % $prselector->('ShowStalls');
 
 <& enter_route, qa => $qa, dbh => $dbh, emsg_r => \$emsg,
@@ -90,53 +89,10 @@ my $goupdate= sub { $be_post ? 'Update' : 'Go' };
  &>
 
 %#---------- 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
-</&>
-
-</table>
-<table><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 ----------
 
@@ -146,6 +102,8 @@ Expected losses:
 % };
 <& "lookup:formhidden", ours => $ours &>
 
+</div>
+<div class="results">
 <%perl>
 #========== results ==========
 
@@ -159,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
  &>
 % }
+</div>
 </form>