X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetevents%2Fxnetevents.inc.php;h=4f7727f152ea26bb190373e1aea129a5f6f54a77;hb=9981ccc71af6da6dc7f970d6c882f22966d72f4f;hp=f329ad1a17362ba053d98d70f72117fc75a42899;hpb=7852229b8a8d821ecefc11dfb6dd061c2ef3dda5;p=platal.git diff --git a/modules/xnetevents/xnetevents.inc.php b/modules/xnetevents/xnetevents.inc.php index f329ad1..4f7727f 100644 --- a/modules/xnetevents/xnetevents.inc.php +++ b/modules/xnetevents/xnetevents.inc.php @@ -1,6 +1,6 @@ asso('id'); } - $evt = XDB::fetchOneAssoc('SELECT SUM(nb) AS nb_tot, COUNT(DISTINCT ep.uid) AS nb, e.*, + 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), 1) AS inscr_open, - LEFT(10, e.debut) AS start_day, LEFT(10, e.fin) AS last_day, + LEFT(e.debut, 10) AS first_day, LEFT(e.fin, 10) AS last_day, LEFT(NOW(), 10) AS now, ei.titre, e.subscription_notification 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; @@ -59,6 +66,9 @@ function get_event_detail($eid, $item_id = false, $asso_id = null) $evt['nb_tot'] = array_sum($res->fetchColumn()); $evt['titre'] = ''; $evt['item_id'] = 0; + $evt['csv_name'] = urlencode($evt['intitule']); + } else { + $evt['csv_name'] = urlencode($evt['intitule'] . '.' . $evt['titre']); } $evt['moments'] = XDB::fetchAllAssoc('SELECT titre, details, montant, ei.item_id, nb, @@ -76,31 +86,29 @@ function get_event_detail($eid, $item_id = false, $asso_id = null) if ($m['montant']) { $evt['money'] = true; } - $evt['paid'] = $m['paid']; + $evt['paid'] += $m['paid']; $evt['notify_payment'] = $evt['notify_payment'] || $m['notify_payment']; } - $montants = XDB::fetchColumn('SELECT amount + $montant = XDB::fetchOneCell('SELECT SUM(amount) AS sum_amount FROM payment_transactions AS t WHERE ref = {?} AND uid = {?}', $evt['paiement_id'], S::v('uid')); - $evt['telepaid'] = 0; - foreach ($montants as $m) { - $p = strtr(substr($m, 0, strpos($m, 'EUR')), ',', '.'); - $evt['paid'] += trim($p); - $evt['telepaid'] += trim($p); - } + $evt['telepaid'] = $montant; + $evt['paid'] += $montant; $evt['organizer'] = User::getSilent($evt['uid']); make_event_date($evt); + $evt['show_participants'] = ($evt['show_participants'] && $GLOBALS['IS_XNET_SITE'] && (is_member() || may_update())); + return $evt; } // }}} // {{{ function get_event_participants() -function get_event_participants(&$evt, $item_id, array $tri = array(), $limit = null) +function get_event_participants(&$evt, $item_id, array $tri = array(), $limit = null, $offset = 0) { global $globals; @@ -115,7 +123,7 @@ function get_event_participants(&$evt, $item_id, array $tri = array(), $limit = WHERE ep.eid = {?} AND nb > 0 ' . $append . ' GROUP BY ep.uid', $eid); $uf = new UserFilter(new PFC_True(), $tri); - $users = User::getBulkUsersWithUIDs($uf->filter(array_keys($query), new PlLimit($count, $offset))); + $users = User::getBulkUsersWithUIDs($uf->filter(array_keys($query), new PlLimit($limit, $offset))); $tab = array(); foreach ($users as $user) { $uid = $user->id(); @@ -132,17 +140,14 @@ 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) { - $montants = XDB::fetchColumn('SELECT amount + $montant = XDB::fetchOneCell('SELECT SUM(amount) FROM payment_transactions AS t WHERE ref = {?} AND uid = {?}', $pay_id, $uid); - foreach ($montants as $m) { - $p = strtr(substr($m, 0, strpos($m, "EUR")), ",", "."); - $u['paid'] += trim($p); - } + $u['paid'] += $montant; } $u['telepayment'] = $u['paid'] - $u['adminpaid']; $res_ = XDB::iterator('SELECT ep.nb, ep.item_id, ei.montant @@ -184,39 +189,37 @@ function subscribe_lists_event($uid, $short_name, $participate, $paid, $payment return; } - $user = User::getSilentWithUID($uid); - /** If $payment is not null, we do not retrieve the value of $participate, * thus we do not alter participant and absent lists. */ if ($payment === true) { if ($paid > 0) { - delete_from_list_alias($user, $short_name . $globals->xnet->unpayed_list, $globals->xnet->evts_domain, 'event'); - add_to_list_alias($user, $short_name . $globals->xnet->payed_list, $globals->xnet->evts_domain, 'event'); + delete_from_list_alias($uid, $short_name . $globals->xnet->unpayed_list, $globals->xnet->evts_domain, 'event'); + add_to_list_alias($uid, $short_name . $globals->xnet->payed_list, $globals->xnet->evts_domain, 'event'); } } else { switch ($participate) { case -1: - delete_from_list_alias($user, $short_name . $globals->xnet->participant_list, $globals->xnet->evts_domain, 'event'); - delete_from_list_alias($user, $short_name . $globals->xnet->unpayed_list, $globals->xnet->evts_domain, 'event'); - delete_from_list_alias($user, $short_name . $globals->xnet->payed_list, $globals->xnet->evts_domain, 'event'); - add_to_list_alias($user, $short_name . $globals->xnet->absent_list, $globals->xnet->evts_domain, 'event'); + delete_from_list_alias($uid, $short_name . $globals->xnet->participant_list, $globals->xnet->evts_domain, 'event'); + delete_from_list_alias($uid, $short_name . $globals->xnet->unpayed_list, $globals->xnet->evts_domain, 'event'); + delete_from_list_alias($uid, $short_name . $globals->xnet->payed_list, $globals->xnet->evts_domain, 'event'); + add_to_list_alias($uid, $short_name . $globals->xnet->absent_list, $globals->xnet->evts_domain, 'event'); break; case 0: - delete_from_list_alias($user, $short_name . $globals->xnet->participant_list, $globals->xnet->evts_domain, 'event'); - delete_from_list_alias($user, $short_name . $globals->xnet->absent_list, $globals->xnet->evts_domain, 'event'); - delete_from_list_alias($user, $short_name . $globals->xnet->unpayed_list, $globals->xnet->evts_domain, 'event'); - delete_from_list_alias($user, $short_name . $globals->xnet->payed_list, $globals->xnet->evts_domain, 'event'); + delete_from_list_alias($uid, $short_name . $globals->xnet->participant_list, $globals->xnet->evts_domain, 'event'); + delete_from_list_alias($uid, $short_name . $globals->xnet->absent_list, $globals->xnet->evts_domain, 'event'); + delete_from_list_alias($uid, $short_name . $globals->xnet->unpayed_list, $globals->xnet->evts_domain, 'event'); + delete_from_list_alias($uid, $short_name . $globals->xnet->payed_list, $globals->xnet->evts_domain, 'event'); break; case 1: - add_to_list_alias($user, $short_name . $globals->xnet->participant_list, $globals->xnet->evts_domain, 'event'); - delete_from_list_alias($user, $short_name . $globals->xnet->absent_list, $globals->xnet->evts_domain, 'event'); + add_to_list_alias($uid, $short_name . $globals->xnet->participant_list, $globals->xnet->evts_domain, 'event'); + delete_from_list_alias($uid, $short_name . $globals->xnet->absent_list, $globals->xnet->evts_domain, 'event'); if ($paid > 0) { - delete_from_list_alias($user, $short_name . $globals->xnet->unpayed_list, $globals->xnet->evts_domain, 'event'); - add_to_list_alias($user, $short_name . $globals->xnet->payed_list, $globals->xnet->evts_domain, 'event'); + delete_from_list_alias($uid, $short_name . $globals->xnet->unpayed_list, $globals->xnet->evts_domain, 'event'); + add_to_list_alias($uid, $short_name . $globals->xnet->payed_list, $globals->xnet->evts_domain, 'event'); } else { - add_to_list_alias($user, $short_name . $globals->xnet->unpayed_list, $globals->xnet->evts_domain, 'event'); - delete_from_list_alias($user, $short_name . $globals->xnet->payed_list, $globals->xnet->evts_domain, 'event'); + add_to_list_alias($uid, $short_name . $globals->xnet->unpayed_list, $globals->xnet->evts_domain, 'event'); + delete_from_list_alias($uid, $short_name . $globals->xnet->payed_list, $globals->xnet->evts_domain, 'event'); } break; } @@ -279,29 +282,30 @@ function event_change_shortname($page, $eid, $old, $new) // if we have a first new short_name create the lists $lastid = array(); $where = array( - $globals->xnet->participant_list => 'nb > 0', - $globals->xnet->payed_list => 'paid > 0', - $globals->xnet->unpayed_list => 'nb > 0 AND paid = 0' + $globals->xnet->participant_list => 'g.nb > 0', + $globals->xnet->payed_list => '(g.paid > 0 OR p.amount > 0)', + $globals->xnet->unpayed_list => 'g.nb > 0 AND g.paid = 0 AND p.amount IS NULL' ); foreach (array($globals->xnet->participant_list, $globals->xnet->payed_list, $globals->xnet->unpayed_list) as $suffix) { - $uids = XDB::fetchColumn('SELECT uid - FROM group_event_participants - WHERE eid = {?} AND ' . $where, + $uids = XDB::fetchColumn('SELECT g.uid + FROM group_event_participants AS g + INNER JOIN group_events AS e ON (g.eid = e.eid) + LEFT JOIN payment_transactions AS p ON (e.paiement_id = p.ref AND g.uid = p.uid) + WHERE g.eid = {?} AND ' . $where[$suffix], $eid); - $users = User::getBulkUsersWithUIDs($uids, null, null, false); - foreach ($users as $user) { - add_to_list_alias($user, $new . $suffix, $globals->xnet->evts_domain, 'event'); + foreach ($uids as $uid) { + add_to_list_alias($uid, $new . $suffix, $globals->xnet->evts_domain, 'event'); } } + $uids = XDB::fetchColumn('SELECT m.uid FROM group_members AS m LEFT JOIN group_event_participants AS e ON (e.uid = m.uid AND e.eid = {?}) WHERE m.asso_id = {?} AND e.uid IS NULL', $eid, $globals->asso('id')); - $users = User::getBulkUsersWithUIDs($uids, null, null, false); - foreach ($users as $user) { - add_to_list_alias($user, $new . $globals->xnet->absent_list, $globals->xnet->evts_domain, 'event'); + foreach ($uids as $uid) { + add_to_list_alias($uid, $new . $globals->xnet->absent_list, $globals->xnet->evts_domain, 'event'); } return $new; @@ -326,9 +330,8 @@ function make_event_date(&$e) { $start = strtotime($e['debut']); $end = strtotime($e['fin']); - $first_day = @strtotime($e['first_day']); - $last_day = strtotime($e['last_day']); - unset($e['debut'], $e['fin'], $e['first_day'], $e['last_day']); + $first_day = $e['first_day']; + $last_day = $e['last_day']; $date = ""; if ($start && $end != $start) {