chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.web-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Printable plan: Put generation date near the top with the input questions
[ypp-sc-tools.web-live.git]
/
yarrg
/
web
/
routetrade
diff --git
a/yarrg/web/routetrade
b/yarrg/web/routetrade
index 1f8df2a5afdb6eafd5215a38f71cce74ad03dce5..68c727cdbd1aec41407534e2c1047e5b1d95b14b 100644
(file)
--- a/
yarrg/web/routetrade
+++ b/
yarrg/web/routetrade
@@
-596,11
+596,20
@@
$addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
<input type=submit name=printable_pdf value="PDF">
<input type=submit name=printable_html value="HTML">
<input type=submit name=printable_ps value="PostScript">
<input type=submit name=printable_pdf value="PDF">
<input type=submit name=printable_html value="HTML">
<input type=submit name=printable_ps value="PostScript">
+ <input type=submit name=printable_pdf2 value="PDF 2-up">
+ <input type=submit name=printable_ps2 value="PostScript 2-up">
</ul>
% }
<li><a href="#dataage">Data age summary</a>
<li><a href="#trades">Relevant trades</a>
</ul>
</ul>
% }
<li><a href="#dataage">Data age summary</a>
<li><a href="#trades">Relevant trades</a>
</ul>
+% } else {
+% my @tl= gmtime $now or die $!;
+<p>
+Generated by YARRG at <strong><%
+ sprintf "%04d-%02d-%02d %02d:%02d:%02d UTC",
+ $tl[5]+1900, @tl[4,3,2,1,0]
+ |h %></strong>.
% }
% if ($optimise) { # ========== TRADING PLAN ==========
% }
% if ($optimise) { # ========== TRADING PLAN ==========
@@
-613,9
+622,16
@@
$addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
%
<h2><a name="plan">Voyage trading plan</a></h2>
%
<h2><a name="plan">Voyage trading plan</a></h2>
-<table rules=groups>
+<table rules=groups <% printable($m) ? 'width=100%' : '' %> >
+% my $tbody= sub {
+% if (!printable($m)) { return '<tbody>'; }
+%# return "<tr><td colspan=7><hr>";
+% my ($c)= qw(40 00)[$_[0]];
+% return "<tr><td bgcolor=\"#${c}${c}${c}\" height=1 colspan=7>";
+% };
+%
% foreach my $i (0..$#islandids) {
% foreach my $i (0..$#islandids) {
-<
tbody
>
+<
% $tbody->(1) %
>
<tr><td colspan=4>
% $iquery->execute($islandids[$i]);
% my ($islandname) = $iquery->fetchrow_array();
<tr><td colspan=4>
% $iquery->execute($islandids[$i]);
% my ($islandname) = $iquery->fetchrow_array();
@@
-720,12
+736,12
@@
$addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
(Data age: <span id="<% $cellid %>"><% prettyprint_age($age) %></span>)
% } elsif (!defined $total) {
% $total= 0;
(Data age: <span id="<% $cellid %>"><% prettyprint_age($age) %></span>)
% } elsif (!defined $total) {
% $total= 0;
-<
tbody
>
+<
% $tbody->(0) %
>
% }
% $total += $t->{Total};
% my $span= 0 + keys %{ $t->{Stalls} };
% my $td= "td rowspan=$span";
% }
% $total += $t->{Total};
% my $span= 0 + keys %{ $t->{Stalls} };
% my $td= "td rowspan=$span";
-<tr class="datarow<% $dline %>">
+% tr_datarow($m,$dline);
<<% $td %>><% $collectdeliver %>
<<% $td %>><% $t->{'commodname'} |h %>
%
<<% $td %>><% $collectdeliver %>
<<% $td %>><% $t->{'commodname'} |h %>
%
@@
-741,7
+757,7
@@
$addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
<<% $td %> align=right><% $t->{Total} |h %> total
%
% foreach my $stallix (1..$#stalls) {
<<% $td %> align=right><% $t->{Total} |h %> total
%
% foreach my $stallix (1..$#stalls) {
-<tr class="datarow<% $dline %>">
+% tr_datarow($m,$dline);
% $pstall->($stallix);
% }
%
% $pstall->($stallix);
% }
%
@@
-773,7
+789,7
@@
$addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
$show_total_now->($totals);
}
</%perl><a name="summary"></a>
$show_total_now->($totals);
}
</%perl><a name="summary"></a>
-<
tbody
><tr>
+<
% $tbody->(1) %
><tr>
<td colspan=2>Total distance: <% $total_dist %> leagues.
<td colspan=3 align=right>Overall net cash flow
<td align=right><strong><%
<td colspan=2>Total distance: <% $total_dist %> leagues.
<td colspan=3 align=right>Overall net cash flow
<td align=right><strong><%
@@
-831,14
+847,6
@@
END
<&| query_age:agestable, now => $now, fetchrow => $fetchrow &>
Islands shown in reverse order of visits.<br>
</&>
<&| query_age:agestable, now => $now, fetchrow => $fetchrow &>
Islands shown in reverse order of visits.<br>
</&>
-% } else {
-% my @tl= gmtime $now or die $!;
-<p>
-Generated by YARRG at <strong><%
- sprintf "%04d-%02d-%02d %02d:%02d:%02d UTC",
- $tl[5]+1900, @tl[4,3,2,1,0]
- |h %></strong>.
-%#
% }
% if (!printable($m)) {
% }
% if (!printable($m)) {