Let officers see all members

[ndwebbie.git] / NDWeb / Pages / MemberIntel.pm

diff --git a/NDWeb/Pages/MemberIntel.pm b/NDWeb/Pages/MemberIntel.pm
index d8a72cef755ef46fe307005bd8119cd72d619396..1a5ffa8af2ff17667dcddf5ed7c5ce90ec59914d 100644 (file)
--- a/NDWeb/Pages/MemberIntel.pm
+++ b/NDWeb/Pages/MemberIntel.pm
@@ -57,12 +57,12 @@ sub render_body {
                my $query = $DBH->prepare(q{
                        SELECT coords(t.x,t.y,t.z), i.eta, i.tick, rt.id AS ndtarget, rc.launched, inc.landing_tick
                        FROM users u
-                       LEFT OUTER JOIN (SELECT * FROM intel WHERE amount = -1) i ON i.sender = u.planet
+                       LEFT OUTER JOIN (SELECT DISTINCT * 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
+                               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 AND i.tick = rt.tick + rc.wave - 1
                        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 
                                        AND (inc.landing_tick + inc.eta) >= i.tick 
@@ -98,7 +98,7 @@ sub render_body {
                $query = $DBH->prepare(q{
                        SELECT coords(t.x,t.y,t.z),t.alliance_id, t.alliance, i.eta, i.tick, i.ingal
                        FROM users u
-                       JOIN (SELECT * FROM intel WHERE amount = -1) i ON i.sender = u.planet
+                       JOIN (SELECT DISTINCT * FROM intel WHERE amount = -1) i ON i.sender = u.planet
                        LEFT OUTER JOIN current_planet_stats t ON i.target = t.id
                        WHERE u.uid = $1 AND (i.mission = 'Defend' OR i.mission = 'AllyDef')
                        ORDER BY (i.tick - i.eta)
@@ -130,17 +130,28 @@ sub render_body {
                $BODY->param(Defenses => \@defenses);
 
        }else{
-               my $query = $DBH->prepare(q{SELECT u.uid,u.username,u.attack_points, u.defense_points, n.tick
+               my $order = "attacks";
+               if (defined param('order') && param('order') =~ /^(attacks|defenses|attack_points|defense_points|solo|bad_def)$/){
+                       $order = $1;
+               }
+
+               my $query = $DBH->prepare(qq{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 (SELECT DISTINCT * 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 AND i.tick = rt.tick + rc.wave - 1
                        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});
+                       ORDER BY $order DESC});
                $query->execute() or $error .= $DBH->errstr;
                my @members;
                my $i = 0;