Minimum trade value feature

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

diff --git a/yarrg/web/query_route b/yarrg/web/query_route
index fb32bcdd705017d6ad82f7da4a3344c55b44b47e..3c769a92f4fc6390851f22bb8c4a92e25d3d715c 100644 (file)
--- a/yarrg/web/query_route
+++ b/yarrg/web/query_route
@@ -41,8 +41,10 @@ $routestring => '';
 $capacitystring => '';
 $lossperleague => '';
 $capitalstring => '';
 $capacitystring => '';
 $lossperleague => '';
 $capitalstring => '';

+$minprofitstring => '';

 $someresults
 $emsgokorprint
 $someresults
 $emsgokorprint

+$allargs

 </%args>
 
 <%perl>
 </%args>
 
 <%perl>


@@ -64,8 +66,6 @@ my $goupdate= sub { $be_post ? 'Update' : 'Go' };
 
 </%perl>
 
 
 </%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}) {
 % # 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}) {


@@ -77,6 +77,10 @@ my $goupdate= sub { $be_post ? 'Update' : 'Go' };
 %      } (0..$qa->{Dropdowns}-1));
 % }
 
 %      } (0..$qa->{Dropdowns}-1));
 % }
 

+<div class="query">
+
+<h1>Specify route</h1>
+

 % $prselector->('ShowStalls');
 
 <& enter_route, qa => $qa, dbh => $dbh, emsg_r => \$emsg,
 % $prselector->('ShowStalls');
 
 <& enter_route, qa => $qa, dbh => $dbh, emsg_r => \$emsg,


@@ -90,16 +94,22 @@ my $goupdate= sub { $be_post ? 'Update' : 'Go' };
 % my $routeparams= { EmsgRef => \$emsg };
 % if (!$qa->{Dropdowns}) {
 
 % my $routeparams= { EmsgRef => \$emsg };
 % if (!$qa->{Dropdowns}) {
 

-<& enter_advrouteopts, qa=>$qa, dbh=>$dbh, routeparams=>$routeparams &>
+<input type=submit name=submit value="<% $goupdate->() %>">
+<p>
+
+<& enter_advrouteopts, qa=>$qa, dbh=>$dbh,
+   minprofit_needs_apply => $be_post,
+   routeparams=>$routeparams &>

 
 % } #---------- end of dropdowns, now common middle of page code ----------
 
 
 % } #---------- end of dropdowns, now common middle of page code ----------
 

-<input type=submit name=submit value="<% $goupdate->() %>">

 % my $ours= sub { $_[0] =~
 % my $ours= sub { $_[0] =~

-%  m/^island|^archipelago|^routestring|^capacitystring|^lossperleague|^capitalstring|^[RT]/;
+%  m/^island|^archipelago|^routestring|^capacitystring|^lossperleague|^capitalstring|^minprofitstring|^[RT]/;

 % };
 <& "lookup:formhidden", ours => $ours &>
 
 % };
 <& "lookup:formhidden", ours => $ours &>
 

+</div>
+<div class="results">

 <%perl>
 #========== results ==========
 
 <%perl>
 #========== results ==========
 


@@ -119,7 +129,9 @@ foreach my $warningf (@warningfs) {
    islandids => \@islandids,
    archipelagoes => \@archipelagoes,
    qa => $qa,
    islandids => \@islandids,
    archipelagoes => \@archipelagoes,
    qa => $qa,

-   routeparams => $routeparams
+   routeparams => $routeparams,
+   reset_suppressions => !!$allargs->{'apply_minprofit'}

  &>
 % }
  &>
 % }

+</div>

 </form>
 </form>