X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=1f8df2a5afdb6eafd5215a38f71cce74ad03dce5;hb=f7c3c04f684b0e9cac4518beeece11853ef75109;hp=c6ed408d80fe9d779e54de724856c6abf02ab673;hpb=fdf4e5538945f9d058f3ad54ddfe707b0977e1d4;p=ypp-sc-tools.web-live.git

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index c6ed408..1f8df2a 100644
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -585,17 +585,23 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
 
 % } # ========== OPTIMISATION ==========
 
+% if (!printable($m)) {
 <h2>Contents</h2>
 <ul>
 % if ($optimise) {
  <li><a href="#plan">Voyage trading plan</a>
   <ul>
    <li><a href="#summary">Summary statistics</a>
+   <li>Printable:
+         <input type=submit name=printable_pdf value="PDF">
+         <input type=submit name=printable_html value="HTML">
+         <input type=submit name=printable_ps value="PostScript">
   </ul>
 % }
  <li><a href="#dataage">Data age summary</a>
  <li><a href="#trades">Relevant trades</a>
 </ul>
+% }
 
 % if ($optimise) { # ========== TRADING PLAN ==========
 %
@@ -781,7 +787,7 @@ Expected average profit:
 %
 % } # ========== TRADING PLAN ==========
 
-% {
+% if (!printable($m)) {
 <h2><a name="dataage">Data age summary</a></h2>
 <%perl>
 	my $sth_i= $dbh->prepare(<<END);
@@ -825,10 +831,19 @@ END
 <&| 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>.
+%#	
 % }
 
-% my %ts_sortkeys;
-% {
+% if (!printable($m)) {
+%   my %ts_sortkeys;
+%   {
 %	my $cdspan= $qa->{ShowStalls} ? ' colspan=2' : '';
 %	my $cdstall= $qa->{ShowStalls} ? '<th>Stall</th>' : '';
 <h2><a name="trades">Relevant trades</a></h2>
@@ -882,14 +897,14 @@ Islands shown in reverse order of visits.<br>
 <th>Capital
 <th>Profit
 %	}
-% }
+%   }
 
 <tr id="trades_sort">
-% foreach my $col (@cols) {
+%   foreach my $col (@cols) {
 <th>
-% }
+%   }
 
-% foreach my $flowix (0..$#flows) {
+%   foreach my $flowix (0..$#flows) {
 %	my $flow= $flows[$flowix];
 %	my $rowid= "id_row_$flow->{UidShort}";
 <tr id="<% $rowid %>" class="datarow<% $flowix & 1 %>">
@@ -923,17 +938,17 @@ Islands shown in reverse order of visits.<br>
  %>><% exists $spec->{String} ? $spec->{String} : $v |h %>
 %		$ci += $spec->{Span};
 %	}
-% }
+%   }
 <tr id="trades_total">
 <th>
 <th colspan=2>Total
-% foreach my $ci (3..$#cols) {
+%   foreach my $ci (3..$#cols) {
 %	my $col= $cols[$ci];
 <td align=right>
 %	if (defined $col->{Total}) {
 <% $col->{Total} |h %>
 %	}
-% }
+%   }
 </table>
 
 <&| tabsort, cols => \@cols, table => 'trades', rowclass => 'datarow',
@@ -943,6 +958,8 @@ Islands shown in reverse order of visits.<br>
 
 <input type=submit name=update value="Update">
 
+% } # !printable
+
 <%init>
 use CommodsWeb;
 use Commods;