Close #652

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1612 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/ChangeLog b/ChangeLog
index 0254749..84c5a29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -69,6 +69,7 @@ Bug/Wish:
 
     * XnetEvents:
         - #637: Check payment before submission                            -FRU
+        - #652: Show people who don't come separately                      -FRU
 
     * XnetGrp:
         - #543: Adapt marketing                                            -FRU

diff --git a/classes/miniwiki.php b/classes/miniwiki.php
index 6357d9b..a267379 100644 (file)
--- a/classes/miniwiki.php
+++ b/classes/miniwiki.php
@@ -78,7 +78,9 @@ class MiniWiki
             $oldrule12 = MiniWiki::$replacementHTML[12];
             MiniWiki::$replacementHTML[12] = "'$0'";
         }
-        $html = preg_replace(MiniWiki::$patternsWiki, MiniWiki::$replacementHTML, utf8_encode(htmlentities(utf8_decode(trim($wiki)))));
+        $html = preg_replace(MiniWiki::$patternsWiki,
+                             MiniWiki::$replacementHTML,
+                             htmlentities(trim($wiki), ENT_COMPAT, 'UTF-8'));
         if (!$title) {
             MiniWiki::$replacementHTML[12] = $oldrule12;
         }

diff --git a/modules/xnetevents.php b/modules/xnetevents.php
index f35b2f8..9c93130 100644 (file)
--- a/modules/xnetevents.php
+++ b/modules/xnetevents.php
@@ -624,6 +624,21 @@ class XnetEventsModule extends PLModule
             $page->assign('oubliinscription', $res);
         }
 
+        $absents = XDB::iterator("SELECT  p.uid,
+                                          IF(m.origine = 'X', IF(u.nom_usage != '', u.nom_usage, u.nom), m.nom) AS nom,
+                                          IF(m.origine = 'X', u.prenom, u.prenom) AS prenom,
+                                          IF(m.origine = 'X', u.promo, m.origine) AS promo,
+                                          IF(m.origine = 'X', FIND_IN_SET('femme', u.flags), m.sexe) AS sexe,
+                                          IF(m.origine = 'X', a.alias, m.email) AS email
+                                    FROM  groupex.evenements_participants AS p
+                              INNER JOIN  groupex.membres                 AS m USING(uid)
+                               LEFT JOIN  auth_user_md5                   AS u ON (u.user_id = m.uid)
+                               LEFT JOIN  aliases                         AS a ON (a.id = u.user_id AND a.type = 'a_vie')
+                                   WHERE  p.eid = {?} AND nb = 0
+                                GROUP BY  p.uid
+                                ORDER BY  nom, prenom, promo", $evt['eid']);     
+
+        $page->assign('absents', $absents);
         $page->assign('participants', 
                       get_event_participants($evt, $item_id, $tri,
                                              "LIMIT ".($ofs*NB_PER_PAGE).", ".NB_PER_PAGE));

diff --git a/modules/xnetevents/xnetevents.inc.php b/modules/xnetevents/xnetevents.inc.php
index 85e1316..f2acb44 100644 (file)
--- a/modules/xnetevents/xnetevents.inc.php
+++ b/modules/xnetevents/xnetevents.inc.php
@@ -132,7 +132,7 @@ function get_event_participants($evt, $item_id, $tri, $limit = '') {
            LEFT JOIN  groupex.membres AS m ON ( ep.uid = m.uid AND e.asso_id = m.asso_id)
         LEFT JOIN  auth_user_md5   AS u ON ( u.user_id = ep.uid )
         LEFT JOIN  aliases         AS a ON ( a.id = ep.uid AND a.type='a_vie' )
-            WHERE  ep.eid = {?}
+            WHERE  ep.eid = {?} AND ep.nb > 0
                     ".(($item_id)?" AND item_id = $item_id":"")."
                     $where
          GROUP BY  ep.uid

diff --git a/templates/xnetevents/admin.tpl b/templates/xnetevents/admin.tpl
index c1052cd..047c743 100644 (file)
--- a/templates/xnetevents/admin.tpl
+++ b/templates/xnetevents/admin.tpl
@@ -163,6 +163,30 @@ Ils ont payé mais ont oublié de s'inscrire :
 {/foreach}
 </p>
 
+{if $absents->total()}
+
+<hr />
+
+<p>Les personnes suivantes ont indiqué qu'elles ne viendraient pas à l'événement&nbsp;:</p>
+
+<table class="tinybicol">
+  <tr><th>Prénom NOM</th><th>Origine</th></tr>
+  {iterate from=$absents item=m}
+  <tr>
+    <td>
+      <a href="" {if $is_admin}onclick="return remplitAuto('{$m.email}')"{/if}>
+      {if $m.sexe}&bull;{/if}{$m.prenom} {$m.nom}
+      </a>
+    </td>
+    <td>
+      {$m.promo}
+    </td>
+  </tr>
+  {/iterate}
+</table>
+
+{/if}
+
 {if $is_admin}
 
 <p class="descr">