Show value percentage for defenders on call page

diff --git a/lib/NDWeb/Controller/Calls.pm b/lib/NDWeb/Controller/Calls.pm
index 7b7e523204019553f2e8fe7065595004ebf93e89..0ba04a513c40f2ceabe72a14b0bab6b504afb216 100644 (file)
--- a/lib/NDWeb/Controller/Calls.pm
+++ b/lib/NDWeb/Controller/Calls.pm
@@ -146,16 +146,31 @@ SELECT ship,amount from ships_home WHERE pid = $1 AND tick = $2
        $c->stash(fleets => \@fleets);
 
        my $defenders = $dbh->prepare(q{
+WITH lc AS (
+       SELECT fid,uid,back,eta,landing_tick
+       FROM launch_confirmations
+       WHERE pid = $1 AND landing_tick = $2
+), lcp AS (
+       SELECT DISTINCT ON (fid) fid,tick,value
+       FROM lc
+               JOIN users u USING (uid)
+               JOIN planet_stats USING (pid)
+       WHERE tick <= landing_tick - eta
+       ORDER BY fid,tick DESC
+), lcv AS (
+       SELECT fid,(sum(amount*(metal+crystal+eonium)) / value)::int  AS value_ratio
+       FROM lcp
+               JOIN fleet_ships fs USING (fid)
+               JOIN ship_stats s ON s.name = fs.ship
+       GROUP BY fid, value
+)
 SELECT DISTINCT ON (x,y,z,pid,name,amount,back) fid,mission, name, eta
        , amount, coords(x,y,z) AS coords, landing_tick AS tick, pid AS planet
-       ,back, (back <> landing_tick + eta - 1) AS recalled
+       ,back, (back <> landing_tick + eta - 1) AS recalled, value_ratio
 FROM fleets f
        LEFT OUTER JOIN current_planet_stats s USING (pid)
-       JOIN (
-               SELECT fid,back,eta,landing_tick
-               FROM launch_confirmations
-               WHERE pid = $1 AND landing_tick = $2
-       ) lc USING (fid)
+       JOIN lc USING (fid)
+       JOIN lcv USING (fid)
 WHERE mission IN ('Defend', 'Fake Defend')
 ORDER BY x,y,z
        });

diff --git a/root/lib/inc/missionlist.tt2 b/root/lib/inc/missionlist.tt2
index f72445dc2603e280ffb34cf2dfd910ddc2eedb6c..91e7c3133b2a15d72e8e411e730b16f875e9ffa5 100644 (file)
--- a/root/lib/inc/missionlist.tt2
+++ b/root/lib/inc/missionlist.tt2
@@ -17,6 +17,9 @@
                        <td>[% m.eta %]</td>
                        <td>[% m.amount %]</td>
                        <td>[% m.back %]</td>
+                       [% IF m.value_ratio %]
+                       <td>[% m.value_ratio %]%</td>
+                       [% END %]
                        [% IF m.fleetcatch %]
                        <td class="Hostile">FLEETCATCH!!</td>
                        [% END %]