$capacitystring => '';
$lossperleague => '';
$capitalstring => '';
+$minprofitstring => '';
$someresults
$emsgokorprint
+$allargs
</%args>
<%perl>
my $emsg;
+my @warningfs;
my @archipelagoes;
my @islandids;
-my %islandid2;
-my ($max_volume, $max_mass);
-my $lossperleaguepct;
-my $capital;
my $qa= \%ARGS;
</%perl>
-<h1>Specify route</h1>
-
-% $prselector->('ShowStalls');
-
-%#---------- textbox, user enters route as string ----------
+% # 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}) {
-
-Enter route (islands, or archipelagoes, separated by |s or commas;
- abbreviations are OK):<br>
-
-% $startform->($routestring =~ m/\S/);
-
-<&| qtextstring, qa => $qa, dbh => $dbh,
- thingstring => 'routestring', emsgstore => \$emsg,
- perresult => sub {
- my ($canonname, $island, $arch) = @_;
- push @islandids, $island;
- push @archipelagoes, defined $island ? undef : $arch;
- }
- &>
- size=80
-</&>
-
-<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',
- perresult => sub {
- ($max_mass,$max_volume) = @_;
- }
- &>
- size=40
-</&>
-
-<td>
-
-
-
-<td>
-Expected losses:
-
-<&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'll',
- thingstring => 'lossperleague', emsgstore => \$emsg,
- helpref => 'losses',
- perresult => sub { ($lossperleaguepct)= @_; }
- &>
- size=9
-</&>
-</tr>
-<tr>
-
-<td>Available capital:
-
-<&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'ac',
- thingstring => 'capitalstring', emsgstore => \$emsg,
- helpref => 'capital',
- perresult => sub { ($capital)= @_; }
- &>
- size=9
-</&>
-</td>
-</tr>
-</table>
-
-% } else { #---------- dropdowns, user selects from menus ----------
-
-% $startform->(grep {
-% defined $ARGS{"archipelago$_"} ||
-% defined $ARGS{"islandid$_"}
+% $startform->($routestring =~ m/\S/);
+% } else {
+% $startform->(grep {
+% defined $qa->{"archipelago$_"} ||
+% defined $qa->{"islandid$_"}
% } (0..$qa->{Dropdowns}-1));
+% }
-<%perl>
-my ($sth,$row);
-my @archlistdata;
-my %islandlistdata;
-$islandlistdata{'none'}= [ [ "none", "Select island..." ] ];
-
-my $optionlistmap= sub {
- my ($optlist, $selected) = @_;
- my $out='';
- foreach my $entry (@$optlist) {
- $out.= sprintf('<option value="%s" %s>%s</option>',
- encode_entities($entry->[0]),
- defined $selected && $entry->[0] eq $selected
- ? 'selected' : '',
- encode_entities($entry->[1]));
- }
- return $out;
-};
-
-$sth= $dbh->prepare("SELECT DISTINCT archipelago FROM islands
- ORDER BY archipelago;");
-$sth->execute();
-
-while ($row=$sth->fetchrow_arrayref) {
- my ($arch)= @$row;
- push @archlistdata, [ $arch, $arch ];
- $islandlistdata{$arch}= [ [ "none", "Whole arch" ] ];
-}
-
-$sth= $dbh->prepare("SELECT islandid,islandname,archipelago
- FROM islands
- ORDER BY islandname;");
-$sth->execute();
-
-while ($row=$sth->fetchrow_arrayref) {
- my $arch= $row->[2];
- push @{ $islandlistdata{'none'} }, [ @$row ];
- push @{ $islandlistdata{$arch} }, [ @$row ];
- $islandid2{$row->[0]}= { Name => $row->[1], Arch => $arch };
-}
-
-my %resetislandlistdata;
-foreach my $arch (keys %islandlistdata) {
- $resetislandlistdata{$arch}=
- $optionlistmap->($islandlistdata{$arch}, '');
-}
+<div class="query">
-</%perl>
+<h1>Specify route</h1>
-<&| script &>
-ms_lists= <% to_json_protecttags(\%resetislandlistdata) %>;
-function ms_Setarch(dd) {
- debug('ms_SetArch '+dd+' arch='+arch);
- var arch= document.getElementsByName('archipelago'+dd).item(0).value;
- var got= ms_lists[arch];
- if (got == undefined) return; // unknown arch ? hrm
- debug('ms_SetArch '+dd+' arch='+arch+' got ok');
- var select= document.getElementsByName('islandid'+dd).item(0);
- select.innerHTML= got;
- debug('ms_SetArch '+dd+' arch='+arch+' innerHTML set');
-}
-</&script>
+% $prselector->('ShowStalls');
-<table style="table-layout:fixed; width:90%;">
+<& enter_route, qa => $qa, dbh => $dbh, emsg_r => \$emsg,
+ warningfs_r => \@warningfs,
+ enterwhat => 'Enter route',
+ islandids_r => \@islandids,
+ archipelagoes_r => \@archipelagoes
+ &>
-<tr>
-% for my $dd (0..$qa->{Dropdowns}-1) {
-<td>
-<select name="archipelago<% $dd %>" onchange="ms_Setarch(<% $dd %>)">
-<option value="none">Whole ocean</option>
-<% $optionlistmap->(\@archlistdata, $ARGS{"archipelago$dd"}) %></select></td>
-% }
-</tr>
+%#---------- textboxes, user enters details as strings ----------
+% my $routeparams= { EmsgRef => \$emsg };
+% if (!$qa->{Dropdowns}) {
-<tr>
-% for my $dd (0..$qa->{Dropdowns}-1) {
-% my $arch= $ARGS{"archipelago$dd"};
-% $arch= 'none' if !defined $arch;
-<td>
-<select name="islandid<% $dd %>">
-<% $optionlistmap->($islandlistdata{$arch}, $ARGS{"islandid$dd"}) %>
-</select></td>
-% }
-</tr>
+<input type=submit name=submit value="<% $goupdate->() %>">
+<p>
-</table>
+<& enter_advrouteopts, qa=>$qa, dbh=>$dbh,
+ minprofit_needs_apply => $be_post,
+ routeparams=>$routeparams &>
% } #---------- end of dropdowns, now common middle of page code ----------
-<input type=submit name=submit value="<% $goupdate->() %>">
% 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 &>
+</div>
+<div class="results">
<%perl>
#========== results ==========
$emsgokorprint->($emsg) or @islandids=();
-my $argorundef= sub {
- my ($dd,$base) = @_;
- my $thing= $ARGS{"${base}${dd}"};
- $thing= undef if defined $thing and $thing eq 'none';
- return $thing;
-};
-
-for my $dd (0..$qa->{Dropdowns}-1) {
- my $arch= $argorundef->($dd,'archipelago');
- my $island= $argorundef->($dd,'islandid');
- next unless defined $arch or defined $island;
- if (defined $island and defined $arch) {
- my $ii= $islandid2{$island};
- my $iarch= $ii->{Arch};
- if ($iarch ne $arch) {
- $someresults->();
-</%perl>
- Specified archipelago <% $arch %> but
- island <% $ii->{Name} %>
- which is in <% $iarch %>; using the island.<br>
-<%perl>
- }
- $arch= undef;
- }
- push @archipelagoes, $arch;
- push @islandids, $island;
+foreach my $warningf (@warningfs) {
+ $someresults->();
+ $warningf->();
}
</%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
+ qa => $qa, quri => $quri,
+ routeparams => $routeparams,
+ reset_suppressions => !!$allargs->{'apply_minprofit'}
&>
-</form>
% }
+</div>
+</form>
~yarrgweb / ypp-sc-tools.db-live.git / blobdiff