Show red username for old scans

diff --git a/NDWeb/Pages/MemberIntel.pm b/NDWeb/Pages/MemberIntel.pm
index 2958e44f64ad6e920d9fa9a146d36da9824d1d47..69ced51e09e7abcfb125cffc4ac9a2959ec8dad1 100644 (file)
--- a/NDWeb/Pages/MemberIntel.pm
+++ b/NDWeb/Pages/MemberIntel.pm
@@ -45,15 +45,16 @@ sub render_body {
                }
        }
 
-       my $query = $DBH->prepare(q{SELECT u.uid,u.username,u.attack_points, u.defense_points
+       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
+               GROUP BY u.uid,u.username,u.attack_points, u.defense_points,n.tick
                ORDER BY attacks DESC,defenses DESC});
        $query->execute() or $error .= $DBH->errstr;
        my @members;
@@ -61,6 +62,8 @@ sub render_body {
        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;
        }
 

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 6ebacffe10db360a17b06065380f3fdbd0269b41..6260dc9b09edb67c555c26afde6777c2ca251a73 100644 (file)
--- a/templates/memberIntel.tmpl
+++ b/templates/memberIntel.tmpl
@@ -7,7 +7,7 @@
        </tr>
        <TMPL_LOOP Members>
        <tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
-               <td><a href="intel?coords=<TMPL_VAR NAME=uid>"><TMPL_VAR NAME=username></a></td>
+               <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>