Merge branch 'master' into memberintel

diff --git a/NDWeb/Pages/MemberIntel.pm b/NDWeb/Pages/MemberIntel.pm
index f6ef0c49a0d16ca416a5f7b29fe8de3869f693e5..0974b5ab6fab7e70be44ddaaa81317b5ca9dbdec 100644 (file)
--- a/NDWeb/Pages/MemberIntel.pm
+++ b/NDWeb/Pages/MemberIntel.pm
@@ -45,44 +45,77 @@ sub render_body {
                }
        }
 
+       my $user;
+       if (defined param('uid') && param('uid') =~ /^(\d+)$/){
+               my $query = $DBH->prepare(q{SELECT username,uid FROM users WHERE uid = ?
+                       });
+               $user = $DBH->selectrow_hashref($query,undef,$1);
+       }
 
-       my $query = $DBH->prepare(intelquery('o.alliance AS oalliance,coords(o.x,o.y,o.z) AS origin, coords(t.x,t.y,t.z) AS target, t.nick',"t.alliance_id = 1 $showticks"));
-       $query->execute() or $error .= $DBH->errstr;
-       my @intellists;
-       my @incomings;
-       my $i = 0;
-       while (my $intel = $query->fetchrow_hashref){
-               if ($intel->{ingal}){
-                       $intel->{missionclass} = 'ingal';
-               }else{
-                       $intel->{missionclass} = $intel->{mission};
+       if ($user){
+               $BODY->param(UID => $user->{uid});
+               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 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
+                       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 
+                                       AND (inc.landing_tick - inc.eta - 1) <= (i.tick - i.eta) 
+                       WHERE u.uid = $1 AND i.mission = 'Attack'
+                       ORDER BY (i.tick - i.eta)
+                       });
+               $query->execute($user->{uid}) or $error .= $DBH->errstr;
+               my @nd_attacks;
+               my @retals;
+               my @other;
+               while (my $intel = $query->fetchrow_hashref){
+                       my $attack = {target => $intel->{coords}, tick => $intel->{tick}};
+                       if ($intel->{ndtarget}){
+                               if (defined $intel->{launched}){
+                                       $attack->{Other} = 'Claimed '.($intel->{launched} ? 'and confirmed' : 'but NOT confirmed');
+                               }else{
+                                       $attack->{Other} = 'Launched at a tick that was not claimed';
+                               }
+                               push @nd_attacks, $attack;
+                       }else{
+                               push @other, $attack;
+                       }
                }
-               $intel->{oalliance} = ' ' unless $intel->{oalliance};
-               $i++;
-               $intel->{ODD} = $i % 2;
-               push @incomings,$intel;
-       }
-       push @intellists,{Message => 'Incoming fleets', Intel => \@incomings, Origin => 1};
+               my @attacks;
+               push @attacks, {name => 'ND Attacks', list => \@nd_attacks};
+               push @attacks, {name => 'Other', list => \@other};
+               $BODY->param(Attacks => \@attacks);
 
-       $query = $DBH->prepare(intelquery('o.nick,coords(o.x,o.y,o.z) AS origin,t.alliance AS talliance,coords(t.x,t.y,t.z) AS target',"o.alliance_id = 1 $showticks"));
-       $query->execute() or $error .= $DBH->errstr;
-       my @outgoings;
-       $i = 0;
-       while (my $intel = $query->fetchrow_hashref){
-               if ($intel->{ingal}){
-                       $intel->{missionclass} = 'ingal';
-               }else{
-                       $intel->{missionclass} = $intel->{mission};
+       }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
+                       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
+                       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});
+               $query->execute() or $error .= $DBH->errstr;
+               my @members;
+               my $i = 0;
+               while (my $intel = $query->fetchrow_hashref){
+                       $i++;
+                       $intel->{ODD} = $i % 2;
+                       $intel->{OLD} = 'OLD' if (!defined $intel->{tick} || $self->{TICK} > $intel->{tick} + 60);
+                       delete $intel->{tick};
+                       push @members,$intel;
                }
-               $intel->{talliance} = ' ' unless $intel->{talliance};
-               $i++;
-               $intel->{ODD} = $i % 2;
-               push @outgoings,$intel;
+               $BODY->param(Members => \@members);
        }
-       push @intellists,{Message => 'Outgoing Fleets', Intel => \@outgoings, Target => 1};
-
-       $BODY->param(IntelLIsts => \@intellists);
-
        $BODY->param(Error => $error);
        return $BODY;
 }

diff --git a/htdocs/default.css b/htdocs/default.css
index 04fd989555008ed9e5256e4e6341e9b4e6e2ab38..6affe189fb712e6dccdf81d22d9d9a0136e94aa9 100644 (file)
--- a/htdocs/default.css
+++ b/htdocs/default.css
@@ -158,6 +158,11 @@ td.NAP a{
        color: yellow;
        background: blue;
 }
+
+td.OLD{
+       background: red;
+       color: black;
+}
 table.old{
        border: outset 1pt;
        border-collapse: separate;

diff --git a/templates/memberIntel.tmpl b/templates/memberIntel.tmpl
index ea57f66277aed450487236da85a5188b2edf8d9b..95a7d56007c72de7dbb0dfa27c1ba8f1b68c0cde 100644 (file)
--- a/templates/memberIntel.tmpl
+++ b/templates/memberIntel.tmpl
@@ -1,35 +1,35 @@
 <TMPL_VAR NAME=Error>
-<p><a href="/<TMPL_VAR NAME=PAGE>?show=all">Show all ticks</a></p>
-<TMPL_LOOP IntelLists>
-<TMPL_IF Message><p><TMPL_VAR NAME=Message></p></TMPL_IF>
+<!--<p><a href="/<TMPL_VAR NAME=PAGE>?show=all">Show all ticks</a></p>-->
+<TMPL_IF UID>
 <table>
        <tr>
-               <TMPL_IF Origin><th>Alliance</th><TMPL_ELSE><th>Nick</th></TMPL_IF><th>Sender</th>
-               <th>Mission</th><th>Landing tick</th><th>ETA</th><th>Amount</th>
-               <th>Target</th><TMPL_IF Target><th>Alliance</th><TMPL_ELSE><th>Nick</th></TMPL_IF>
-               <th>Ingal</th><th>Reported by</th>
+               <th>Attack</th><th>Pt</th><th></th>
        </tr>
-       <TMPL_LOOP Intel>
+       <TMPL_LOOP Attacks>
+               <tr><td><TMPL_VAR NAME=NAME></td></tr>
+               <TMPL_LOOP LIST>
        <tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
-       <TMPL_IF OAlliance>
-       <td><TMPL_VAR NAME=OAlliance></td>
-       <TMPL_ELSE>
-       <td><TMPL_VAR NAME=Nick></td>
-       </TMPL_IF>
-       <td><a href="intel?coords=<TMPL_VAR NAME=Origin>"><TMPL_VAR NAME=Origin></a></td>
-       <td class="<TMPL_VAR NAME=MissionClass>"><TMPL_VAR NAME=Mission></td>
-       <td align="center"><TMPL_VAR NAME=landingtick></td>
-       <td align="center"><TMPL_VAR NAME=ETA></td>
-       <td><TMPL_VAR NAME=Amount></td>
-       <td><a href="intel?coords=<TMPL_VAR NAME=Target>"><TMPL_VAR NAME=Target></a></td>
-       <TMPL_IF TAlliance>
-       <td><TMPL_VAR NAME=TAlliance></td>
-       <TMPL_ELSE>
-       <td><TMPL_VAR NAME=Nick></td>
-       </TMPL_IF>
-       <td><TMPL_VAR NAME=Ingal></td>
-       <td><TMPL_VAR NAME=Username></td>
+               <td><TMPL_VAR NAME=Target></td>
+               <td><TMPL_VAR NAME=tick></td>
+               <td><TMPL_VAR NAME=Other></td>
        </tr>
+               </TMPL_LOOP>
        </TMPL_LOOP>
 </table>
-</TMPL_LOOP>
+<TMPL_ELSE>
+<table>
+       <tr>
+               <th>Member</th><th>Attacks</th><th>Defenses</th><th>Attack Points</th><th>Defense Points</th>
+               <th>Solo attacks</th><th>Def outside ND/Gal</th>
+       </tr>
+       <TMPL_LOOP Members>
+       <tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
+               <td class="<TMPL_VAR NAME=OLD>"><a href="<TMPL_VAR NAME=PAGE>?uid=<TMPL_VAR NAME=uid>"><TMPL_VAR NAME=username></a></td>
+               <td><TMPL_VAR NAME=attacks></td>
+               <td><TMPL_VAR NAME=defenses></td>
+               <td><TMPL_VAR NAME=attack_points></td>
+               <td><TMPL_VAR NAME=defense_points></td>
+       </tr>
+       </TMPL_LOOP>
+</table>
+</TMPL_IF>