X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetevents%2Fxnetevents.inc.php;h=fdc46c051a3f775b4e07029ef7397f4963824eba;hb=e557b0dbd21096d0fdd5c18f62dab460d20c90c3;hp=fd92d2262a0cade023a10e428da63e57272e4fec;hpb=0ea9f32b63ac9e272518b9bc5a1ac0b512e7e8a1;p=platal.git

diff --git a/modules/xnetevents/xnetevents.inc.php b/modules/xnetevents/xnetevents.inc.php
index fd92d22..fdc46c0 100644
--- a/modules/xnetevents/xnetevents.inc.php
+++ b/modules/xnetevents/xnetevents.inc.php
@@ -27,6 +27,13 @@ function get_event_detail($eid, $item_id = false, $asso_id = null)
     if (is_null($asso_id)) {
         $asso_id = $globals->asso('id');
     }
+    if (!$item_id) {
+        $where = '';
+        $group_by = 'e.eid';
+    } else {
+        $where = XDB::format(' AND ei.item_id = {?}', $item_id);
+        $group_by = 'ei.item_id';
+    }
     $evt = XDB::fetchOneAssoc('SELECT  SUM(nb) AS nb_tot, COUNT(DISTINCT ep.uid) AS nb, e.*, SUM(IF(nb > 0, 1, 0)) AS user_count,
                                        IF(e.deadline_inscription,
                                           e.deadline_inscription >= LEFT(NOW(), 10),
@@ -37,9 +44,9 @@ function get_event_detail($eid, $item_id = false, $asso_id = null)
                                  FROM  group_events             AS e
                            INNER JOIN  group_event_items        AS ei ON (e.eid = ei.eid)
                             LEFT JOIN  group_event_participants AS ep ON(e.eid = ep.eid AND ei.item_id = ep.item_id)
-                                WHERE  (e.eid = {?} OR e.short_name = {?}) AND ei.item_id = {?} AND e.asso_id = {?}
-                             GROUP BY  ei.item_id',
-                           $eid, $eid, $item_id ? $item_id : 1, $asso_id);
+                                WHERE  (e.eid = {?} OR e.short_name = {?}) AND e.asso_id = {?}' . $where . '
+                             GROUP BY  ' . $group_by,
+                              $eid, $eid, $asso_id);
 
     if (!$evt) {
         return null;
@@ -133,7 +140,7 @@ function get_event_participants(&$evt, $item_id, array $tri = array(), $limit =
     $evt['topay']     = 0;
     $evt['paid']      = 0;
     foreach ($tab as $uid=>&$u) {
-        $u['adminpaid'] = $u['paid'];
+        $u['adminpaid'] = (float)$u['paid'];
         $u['montant'] = 0;
         if ($money && $pay_id) {
             $montant = XDB::fetchOneCell('SELECT  SUM(amount)