From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sun, 23 Aug 2009 16:08:00 +0000 (+0100)
Subject: Reorder columns; rename "suggested" to "planned"
X-Git-Tag: 3.4~126
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=commitdiff_plain;h=db75e9a488c8c07fff3d1ed6156e12965c4c0ec2

Reorder columns; rename "suggested" to "planned"
---

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index 97359a9..3e024e1 100644
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -47,18 +47,6 @@
 
 16:40 <ceb> columns should be sortable with the small arrows as before
 
-16:51 <ceb> YPP interfaces have price then qty. You have qty then price. This 
-            is confusing!
-16:51 <ceb> the max column ordering is OK
-16:51 <ceb> (alo profit and suggested are OK)
-16:52 <Diziet> Err, you want qty on the left in those two but on the right in 
-               collect and deliver ?
-16:53 <ceb> Yes (price and capital are not the same thing)
-16:53 <Diziet> OK
-16:53 <ceb> for max the order in which you want to think about it is 'I need to 
-            buy ten of them and that will cost me $total price)
-16:54 <ceb> s/)/'/
-
 16:46 <ceb> Also trading plan not functional but I guess you know that :-)
 
 Also:
@@ -199,7 +187,7 @@ if ($qa->{ShowStalls}) {
 }
 $addcols->({ Text => 1 }, qw(commodname));
 $addcols->({},
-	qw(	org_qty org_price dst_qty dst_price
+	qw(	org_price org_qty dst_price dst_qty
 		Margin unitprofit MaxQty
 		MaxCapital MaxProfit
 	));
@@ -452,7 +440,7 @@ $addcols->({ Total => 0 }, qw(
 <th colspan=2>Profit
 <th colspan=3>Max
 %	if ($optimise) {
-<th colspan=3>Suggested
+<th colspan=3>Planned
 %	}
 
 <tr>
@@ -460,10 +448,10 @@ $addcols->({ Total => 0 }, qw(
 <th>Island <% $cdstall %>
 <th>Island <% $cdstall %>
 <th>Commodity
-<th>Qty
 <th>Price
 <th>Qty
 <th>Price
+<th>Qty
 <th>Margin
 <th>Unit
 <th>Qty