From cc69b311d940475af8230fee2ddcafe8c10a900a Mon Sep 17 00:00:00 2001 From: Pascal Corpet Date: Mon, 7 Jun 2010 01:09:24 +0200 Subject: [PATCH] Fixes grp event display (need more fix) --- modules/xnetevents.php | 2 +- modules/xnetevents/xnetevents.inc.php | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/xnetevents.php b/modules/xnetevents.php index 43fa0a5..07bd834 100644 --- a/modules/xnetevents.php +++ b/modules/xnetevents.php @@ -631,7 +631,7 @@ class XnetEventsModule extends PLModule $page->assign('absents', $absents); $page->assign('participants', get_event_participants($evt, $item_id, UserFilter::sortByName(), - NB_PER_PAGE, $ofs * NB_PER_PAGE)); + new PLLimit(NB_PER_PAGE), $ofs * NB_PER_PAGE)); } } diff --git a/modules/xnetevents/xnetevents.inc.php b/modules/xnetevents/xnetevents.inc.php index 8886f37..ff82344 100644 --- a/modules/xnetevents/xnetevents.inc.php +++ b/modules/xnetevents/xnetevents.inc.php @@ -33,12 +33,15 @@ function get_event_detail($eid, $item_id = false, $asso_id = null) 1) AS inscr_open, LEFT(10, e.debut) AS start_day, LEFT(10, e.fin) AS last_day, LEFT(NOW(), 10) AS now, - ei.titre, al.vid AS absent_list, pl.vid AS participant_list + ei.titre, al.vid AS absent_list, pl.vid AS participant_list, + pyl.vid AS payed_list, bl.vid AS booked_unpayed_list 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) LEFT JOIN virtual AS al ON(al.type = \'evt\' AND al.alias = CONCAT(short_name, {?})) LEFT JOIN virtual AS pl ON(pl.type = \'evt\' AND pl.alias = CONCAT(short_name, {?})) + LEFT JOIN virtual AS pyl ON(pyl.type = \'evt\' AND pyl.alias = CONCAT(short_name, {?})) + LEFT JOIN virtual AS bl ON(bl.type = \'evt\' AND bl.alias = CONCAT(short_name, {?})) WHERE (e.eid = {?} OR e.short_name = {?}) AND ei.item_id = {?} AND e.asso_id = {?} GROUP BY ei.item_id', '-absents@'.$globals->xnet->evts_domain, -- 2.1.4