From: Michael Andreen <harv@ruin.nu>
Date: Fri, 27 Feb 2009 20:38:18 +0000 (+0100)
Subject: Show both total calls and defended calls for def leeches
X-Git-Url: https://ruin.nu/git/?p=ndwebbie.git;a=commitdiff_plain;h=44f9fde7339f31749b2cd390738d160cc2f0c68d

Show both total calls and defended calls for def leeches
---

diff --git a/lib/NDWeb/Controller/Calls.pm b/lib/NDWeb/Controller/Calls.pm
index 8515212..636ac29 100644
--- a/lib/NDWeb/Controller/Calls.pm
+++ b/lib/NDWeb/Controller/Calls.pm
@@ -231,13 +231,14 @@ sub defleeches : Local {
 
 	my $query = $dbh->prepare(q{SELECT username,defense_points,count(id) AS calls
 		, SUM(fleets) AS fleets, SUM(recalled) AS recalled
+		,count(NULLIF(fleets,0)) AS defended_calls
 		FROM (SELECT username,defense_points,c.id,count(f.target) AS fleets
 			, count(NULLIF(f.landing_tick + f.eta -1 = f.back,TRUE)) AS recalled
 			FROM users u JOIN calls c ON c.member = u.uid
 				LEFT OUTER JOIN (
 					SELECT * FROM launch_confirmations JOIN fleets USING (fid)
+					WHERE mission = 'Defend'
 				) f ON u.planet = f.target AND c.landing_tick = f.landing_tick
-			WHERE f.mission = 'Defend'
 			GROUP BY username,defense_points,c.id
 		) d
 		GROUP BY username,defense_points ORDER BY fleets DESC, defense_points
diff --git a/root/src/calls/defleeches.tt2 b/root/src/calls/defleeches.tt2
index f2e32cd..12c4e9f 100644
--- a/root/src/calls/defleeches.tt2
+++ b/root/src/calls/defleeches.tt2
@@ -6,14 +6,16 @@
 	<th>Def Missions</th>
 	<th>Recalled missions</th>
 	<th>Calls</th>
+	<th>Defended calls</th>
 	</tr>
 [% FOR m IN members %]
-	<tr class="[% loop.count % 2 == 0 ? 'even' : 'odd' %]">
-	<td>[% m.username %]</td>
+	<tr align="right" class="[% loop.count % 2 == 0 ? 'even' : 'odd' %]">
+	<td align="left">[% m.username %]</td>
 	<td>[% m.defense_points %]</td>
 	<td>[% m.fleets %]</td>
 	<td>[% m.recalled %]</td>
 	<td>[% m.calls %]</td>
+	<td>[% m.defended_calls %]</td>
 	</tr>
 [% END %]
 </table>