death date

diff --git a/ChangeLog b/ChangeLog
index 8a41e68..8542dac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@ Changes :
 
        * Search :
                - dead members and non subsribed people are grayed.                                     -MC
+               - dead members now have the date of death printed.                                      -MC
                - better things done for married women.                                                         -MC
                - Mobile is know printed too.                                                                           -MC
 

diff --git a/htdocs/advanced_search.php b/htdocs/advanced_search.php
index 0fb86e2..ae745af 100644 (file)
--- a/htdocs/advanced_search.php
+++ b/htdocs/advanced_search.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: advanced_search.php,v 1.17 2004-10-19 18:06:43 x2000bedo Exp $
+        $Id: advanced_search.php,v 1.18 2004-10-22 12:12:23 x2000habouzit Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -111,6 +111,7 @@ else {
                        u.prenom,
                        u.promo,
                        i.deces!=0 AS decede,
+                      i.deces,
                        a.alias AS forlife,
                        '.$globals->search_result_fields.'
                        c.uid AS contact

diff --git a/htdocs/mescontacts.php b/htdocs/mescontacts.php
index b12a410..5284abf 100644 (file)
--- a/htdocs/mescontacts.php
+++ b/htdocs/mescontacts.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: mescontacts.php,v 1.15 2004-10-21 12:24:20 x2000habouzit Exp $
+        $Id: mescontacts.php,v 1.16 2004-10-22 12:12:23 x2000habouzit Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -59,7 +59,7 @@ if (isset($_REQUEST['action'])) {
 
 $sql = "SELECT contact AS id,
                a.*, l.alias AS forlife,
-               i.deces != 0 AS dcd, i.matricule_ax,
+               i.deces != 0 AS dcd, i.deces, i.matricule_ax,
                e.entreprise, es.label AS secteur, ef.fonction_fr AS fonction,
                n.text AS nat,
                ad0.text AS app0text, ad0.url AS app0url, ai0.type AS app0type,

diff --git a/htdocs/search.php b/htdocs/search.php
index 9da39d6..ccae63b 100644 (file)
--- a/htdocs/search.php
+++ b/htdocs/search.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: search.php,v 1.30 2004-10-19 18:06:43 x2000bedo Exp $
+        $Id: search.php,v 1.31 2004-10-22 12:12:23 x2000habouzit Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -67,6 +67,7 @@ if (array_key_exists('rechercher', $_REQUEST)) {
                        IF(u.prenom!="",u.prenom,i.prenom) AS prenom,
                        IF(u.promo!="",u.promo,i.promo) AS promo,
                        i.deces!=0 AS decede,
+                      i.deces,
                        a.alias AS forlife,
                        '.$globals->search_result_fields.'
                        c.uid AS contact

diff --git a/templates/include/x_inscrit.tpl b/templates/include/x_inscrit.tpl
index fa92e9b..35b829f 100644 (file)
--- a/templates/include/x_inscrit.tpl
+++ b/templates/include/x_inscrit.tpl
@@ -17,17 +17,15 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: x_inscrit.tpl,v 1.16 2004-10-22 12:00:31 x2000habouzit Exp $
+        $Id: x_inscrit.tpl,v 1.17 2004-10-22 12:12:24 x2000habouzit Exp $
  ***************************************************************************}
 
 
 <div class="contact" title="fiche mise à jour le {$c.date|date_format:"%d %b %Y"}">
   <div class="nom">
     {if $c.epouse}{$c.epouse} {$c.prenom}<br />(née {$c.nom}){else}{$c.nom} {$c.prenom}{/if}
-    {if $c.dcd}(décédé){/if}
   </div>
   <div class="appli">
-    {strip}
     (
     X{$c.promo}{if $c.app0text},
     {applis_fmt type=$c.app0type text=$c.app0text url=$c.app0url}
@@ -35,7 +33,7 @@
     {applis_fmt type=$c.app1type text=$c.app1text url=$c.app1url}
     {/if}
     )
-    {/strip}
+    {if $c.dcd}<br />décédé le {$c.deces}{/if}
   </div>
   <div class="bits">
     <a href="javascript:x()" onclick="popWin('fiche.php?user={$c.forlife}')">

diff --git a/templates/search.result.private.tpl b/templates/search.result.private.tpl
index a74185a..a5a825d 100644 (file)
--- a/templates/search.result.private.tpl
+++ b/templates/search.result.private.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: search.result.private.tpl,v 1.19 2004-10-22 12:05:47 x2000habouzit Exp $
+        $Id: search.result.private.tpl,v 1.20 2004-10-22 12:12:24 x2000habouzit Exp $
  ***************************************************************************}
 
 <div class="bits">
@@ -36,12 +36,14 @@
     {/if}
   </a>
   {/if}
+  {if $result.decede neq 1}
   {perms level='admin'}
   <a href="{"admin/utilisateurs.php"|url}?login={$result.forlife}">su</a>
   <a href="javascript:x()" onclick="popWin('http://www.polytechniciens.com/index.php?page=AX_FICHE_ANCIEN&amp;anc_id={$result.matricule_ax}')">
     ax
   </a>
   {/perms}
+  {/if}
 </div>
 {if $result.inscrit!=1}
 {if $result.decede != 1}

diff --git a/templates/search.result.public.tpl b/templates/search.result.public.tpl
index b94cf3f..c30308b 100644 (file)
--- a/templates/search.result.public.tpl
+++ b/templates/search.result.public.tpl
@@ -17,12 +17,11 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: search.result.public.tpl,v 1.8 2004-10-22 12:00:31 x2000habouzit Exp $
+        $Id: search.result.public.tpl,v 1.9 2004-10-22 12:12:24 x2000habouzit Exp $
  ***************************************************************************}
 
 <div class="nom">
   {if $result.epouse}{$result.epouse} {$result.prenom} <br />(née {$result.nom}){else}{$result.nom} {$result.prenom}{/if}
-  {if $result.decede == 1}(décédé){/if}
 </div>
 <div class="appli">
   {strip}
@@ -33,6 +32,7 @@
   {if $result.app1text},
     {applis_fmt type=$result.app1type text=$result.app1text url=$result.app1url}
   {/if})
+  {if $result.decede == 1}<br />décédé le {$result.deces}{/if}
   {/strip}
 </div>
 {* vim:set et sw=2 sts=2 sws=2: *}