Adds 'last activity' information in the dead-but-still-alive table.

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>

diff --git a/modules/admin.php b/modules/admin.php
index 92a2107..976be74 100644 (file)
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -841,11 +841,12 @@ class AdminModule extends PLModule
         $page->assign('xorg_title','Polytechnique.org - Administration - Décédés');
 
         $res = XDB::iterator(
-                "SELECT  u.promo, u.nom, u.prenom, u.deces, u.matricule_ax, a.alias,
-                         DATEDIFF(NOW(), u.deces) AS days
+                "SELECT  u.promo, u.nom, u.prenom, u.deces, u.matricule_ax, a.alias, DATE(MAX(s.start)) AS last
                    FROM  auth_user_md5 AS u
               LEFT JOIN  aliases AS a ON (a.id = u.user_id AND a.type = 'a_vie')
+              LEFT JOIN  logger.sessions AS s ON (s.uid = u.user_id AND suid = 0)
                   WHERE  perms IN ('admin', 'user') AND deces <> 0
+               GROUP BY  u.user_id
                ORDER BY  u.promo, u.nom");
         $page->assign('dead', $res);
     }

diff --git a/templates/admin/dead_but_active.tpl b/templates/admin/dead_but_active.tpl
index cb3813c..b7ecb11 100644 (file)
--- a/templates/admin/dead_but_active.tpl
+++ b/templates/admin/dead_but_active.tpl
@@ -29,10 +29,10 @@
 
 <table class="bicol">
   <tr>
-    <th>Promotion</th>
+    <th>Promo</th>
     <th colspan="2">État civil</th>
-    <th>Date de décès</th>
-    <th>depuis</th>
+    <th>Décès</th>
+    <th>Dernière activité</th>
   </tr>
   {iterate from=$dead item=d}
   <tr class="{cycle values="impair,pair"}">
@@ -46,13 +46,7 @@
     <td>{$d.prenom} {$d.nom}</td>
     <td style="text-align: center">{$d.deces}</td>
     <td style="text-align: center">
-      {if $d.days gt 730}
-        <strong>{$d.days/365|string_format:"%d"} ans</strong>
-      {elseif $d.days gt 365}
-        1 an
-      {else}
-        {$d.days/30.5|string_format:"%d"} mois
-      {/if}
+      {if $d.last gt $d.deces}<strong>{$d.last}</strong>{elseif $d.last}{$d.last}{else}-{/if}
     </td>
   </tr>
   {/iterate}