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

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

diff --git a/NDWeb/Pages/MemberIntel.pm b/NDWeb/Pages/MemberIntel.pm
index ae5cb2d8ad83cd7918edc36f10c55849015ef953..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 
@@ -72,8 +72,9 @@ sub render_body {
                        });
                $query->execute($user->{uid}) or $error .= $DBH->errstr;
                my @nd_attacks;
-               my @retals;
                my @other_attacks;
+               my $ndi = 0;
+               my $oi = 0;
                while (my $intel = $query->fetchrow_hashref){
                        my $attack = {target => $intel->{coords}, tick => $intel->{tick}};
                        if ($intel->{ndtarget}){
@@ -82,14 +83,16 @@ sub render_body {
                                }else{
                                        $attack->{Other} = 'Launched at a tick that was not claimed';
                                }
+                               $attack->{ODD} = ++$ndi % 2;
                                push @nd_attacks, $attack;
                        }else{
+                               $attack->{ODD} = ++$oi % 2;
                                push @other_attacks, $attack;
                        }
                }
                my @attacks;
-               push @attacks, {name => 'ND Attacks', list => \@nd_attacks};
-               push @attacks, {name => 'Other', list => \@other_attacks};
+               push @attacks, {name => 'ND Attacks', list => \@nd_attacks, class => 'AllyDef'};
+               push @attacks, {name => 'Other', list => \@other_attacks, class => 'Attack'};
                $BODY->param(Attacks => \@attacks);
 
                $query = $DBH->prepare(q{
@@ -104,31 +107,43 @@ sub render_body {
                my @nd_def;
                my @ingal_def;
                my @other_def;
+               $ndi = 0;
+               $oi = 0;
+               my $gi = 0;
                while (my $intel = $query->fetchrow_hashref){
                        my $def = {target => $intel->{coords}.(defined $intel->{alliance} ? " ($intel->{alliance})" : ''), tick => $intel->{tick}};
                        if (defined $intel->{alliance_id} && $intel->{alliance_id} == 1){
+                               $def->{ODD} = ++$ndi % 2;
                                push @nd_def, $def;
                        }elsif($intel->{ingal}){
+                               $def->{ODD} = ++$gi % 2;
                                push @ingal_def, $def;
                        }else{
+                               $def->{ODD} = ++$oi % 2;
                                push @other_def, $def;
                        }
                }
                my @defenses;
-               push @defenses, {name => 'ND Def', list => \@nd_def};
-               push @defenses, {name => 'Ingal Def', list => \@ingal_def};
-               push @defenses, {name => 'Other', list => \@other_def};
+               push @defenses, {name => 'ND Def', list => \@nd_def, class => 'AllyDef'};
+               push @defenses, {name => 'Ingal Def', list => \@ingal_def, class => 'Defend'};
+               push @defenses, {name => 'Other', list => \@other_def, class => 'Attack'};
                $BODY->param(Defenses => \@defenses);
 
        }else{
                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});