Fix bug with not counting first wave on target and also show solo attacks and def...

diff --git a/NDWeb/Pages/MemberIntel.pm b/NDWeb/Pages/MemberIntel.pm
index d8a72cef755ef46fe307005bd8119cd72d619396..2ec5785ac6f129b5aacefe351e939bc23c13dd2e 100644 (file)
--- a/NDWeb/Pages/MemberIntel.pm
+++ b/NDWeb/Pages/MemberIntel.pm
@@ -61,7 +61,7 @@ sub render_body {
                        LEFT OUTER JOIN current_planet_stats t ON i.target = t.id
                        LEFT OUTER JOIN (SELECT rt.id,planet,tick FROM raids r 
                                        JOIN raid_targets rt ON r.id = rt.raid) rt ON rt.planet = i.target 
-                               AND (rt.tick + 12) > i.tick AND rt.tick < i.tick 
+                               AND (rt.tick + 12) > i.tick AND rt.tick <= i.tick 
                        LEFT OUTER JOIN raid_claims rc ON rt.id = rc.target AND rc.uid = u.uid
                        LEFT OUTER JOIN (SELECT sender, eta, landing_tick FROM calls c 
                                                JOIN incomings i ON i.call = c.id) inc ON inc.sender = i.target 
@@ -133,11 +133,17 @@ sub render_body {
                my $query = $DBH->prepare(q{SELECT u.uid,u.username,u.attack_points, u.defense_points, n.tick
                        ,count(CASE WHEN i.mission = 'Attack' THEN 1 ELSE NULL END) AS attacks
                        ,count(CASE WHEN (i.mission = 'Defend' OR i.mission = 'AllyDef') THEN 1 ELSE NULL END) AS defenses
+                       ,count(CASE WHEN i.mission = 'Attack' AND rt.id IS NULL THEN 1 ELSE NULL END) AS solo
+                       ,count(CASE WHEN i.mission = 'Defend' OR i.mission = 'AllyDef' THEN NULLIF(i.ingal OR (t.alliance_id = 1),TRUE) ELSE NULL END) AS bad_def
                        FROM users u
                        JOIN groupmembers gm USING (uid)
                        LEFT OUTER JOIN (SELECT DISTINCT ON (planet) planet,tick from scans where type = 'News' ORDER BY planet,tick DESC) n USING (planet)
                        LEFT OUTER JOIN (SELECT * FROM intel WHERE amount = -1) i ON i.sender = u.planet
                        LEFT OUTER JOIN current_planet_stats t ON i.target = t.id
+                       LEFT OUTER JOIN (SELECT rt.id,planet,tick FROM raids r 
+                                       JOIN raid_targets rt ON r.id = rt.raid) rt ON rt.planet = i.target 
+                               AND (rt.tick + 12) > i.tick AND rt.tick <= i.tick 
+                       LEFT OUTER JOIN raid_claims rc ON rt.id = rc.target AND rc.uid = u.uid
                        WHERE gm.gid = 2
                        GROUP BY u.uid,u.username,u.attack_points, u.defense_points,n.tick
                        ORDER BY attacks DESC,defenses DESC, attack_points DESC, defense_points DESC});

diff --git a/templates/memberIntel.tmpl b/templates/memberIntel.tmpl
index ff5c871b6057079c2ae3974951c54129624fdb61..c6fae519d0d1880e136cfbe394fd0fd6a9fec1ff 100644 (file)
--- a/templates/memberIntel.tmpl
+++ b/templates/memberIntel.tmpl
@@ -1,7 +1,7 @@
 <TMPL_VAR NAME=Error>
 <!--<p><a href="/<TMPL_VAR NAME=PAGE>?show=all">Show all ticks</a></p>-->
 <TMPL_IF UID>
-<table>
+<table class="boards">
        <tr>
                <th>Attack</th><th>Pt</th><th></th>
        </tr>
@@ -16,7 +16,7 @@
                </TMPL_LOOP>
        </TMPL_LOOP>
 </table>
-<table>
+<table class="boards">
        <tr>
                <th>Defense</th><th>Pt</th><th></th>
        </tr>
@@ -44,6 +44,8 @@
                <td><TMPL_VAR NAME=defenses></td>
                <td><TMPL_VAR NAME=attack_points></td>
                <td><TMPL_VAR NAME=defense_points></td>
+               <td><TMPL_VAR NAME=solo></td>
+               <td><TMPL_VAR NAME=bad_def></td>
        </tr>
        </TMPL_LOOP>
 </table>