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=3c769a92f4fc6390851f22bb8c4a92e25d3d715c;hp=fb32bcdd705017d6ad82f7da4a3344c55b44b47e;hb=43454422b2df5e0dcfe144fcb871a2b6f9c1a3d0;hpb=ce49620ef8a4e24daa206185138919bb58d35d37 diff --git a/yarrg/web/query_route b/yarrg/web/query_route index fb32bcd..3c769a9 100644 --- a/yarrg/web/query_route +++ b/yarrg/web/query_route @@ -41,8 +41,10 @@ $routestring => ''; $capacitystring => ''; $lossperleague => ''; $capitalstring => ''; +$minprofitstring => ''; $someresults $emsgokorprint +$allargs <%perl> @@ -64,8 +66,6 @@ my $goupdate= sub { $be_post ? 'Update' : 'Go' }; -

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}) { @@ -77,6 +77,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, @@ -90,16 +94,22 @@ my $goupdate= sub { $be_post ? 'Update' : 'Go' }; % my $routeparams= { EmsgRef => \$emsg }; % if (!$qa->{Dropdowns}) { -<& enter_advrouteopts, qa=>$qa, dbh=>$dbh, routeparams=>$routeparams &> + +

+ +<& enter_advrouteopts, qa=>$qa, dbh=>$dbh, + minprofit_needs_apply => $be_post, + routeparams=>$routeparams &> % } #---------- end of dropdowns, now common middle of page code ---------- - % 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 &> +

+
<%perl> #========== results ========== @@ -119,7 +129,9 @@ foreach my $warningf (@warningfs) { islandids => \@islandids, archipelagoes => \@archipelagoes, qa => $qa, - routeparams => $routeparams + routeparams => $routeparams, + reset_suppressions => !!$allargs->{'apply_minprofit'} &> % } +