From a24d3c48b31f364a66ee4b965cb1a56a9bfe851a Mon Sep 17 00:00:00 2001 From: Anne Limoges Date: Tue, 4 Mar 2014 22:02:27 +0100 Subject: [PATCH] Revert "Rewrite xnetevents and removes anim notification when the subscription is not changed." This reverts commit aa3ef74f4477984d6f5771b1baa0c9c7cbe2b6ea. --- modules/xnetevents.php | 134 +++++++++++--------- modules/xnetevents/xnetevents.inc.php | 224 ++-------------------------------- templates/xnetevents/index.tpl | 27 ++-- templates/xnetevents/subscribe.tpl | 61 +++++---- 4 files changed, 127 insertions(+), 319 deletions(-) diff --git a/modules/xnetevents.php b/modules/xnetevents.php index b3a5959..a9d4d1c 100644 --- a/modules/xnetevents.php +++ b/modules/xnetevents.php @@ -40,8 +40,6 @@ class XnetEventsModule extends PLModule global $globals; $page->changeTpl('xnetevents/index.tpl'); - $this->load('xnetevents.inc.php'); - $action = null; $archive = ($archive == 'archive' && may_update()); @@ -153,49 +151,77 @@ class XnetEventsModule extends PLModule SET event_order = {?} WHERE id = {?}", $order, $globals->asso('id')); + } else { + $order = XDB::fetchOneCell("SELECT event_order FROM groups + WHERE id = {?}", + $globals->asso('id')); + } + if ($order == 'desc') { + $evenements = XDB::iterator('SELECT e.*, LEFT(e.debut, 10) AS first_day, LEFT(e.fin, 10) AS last_day, + IF(e.deadline_inscription, + e.deadline_inscription >= LEFT(NOW(), 10), + 1) AS inscr_open, + e.deadline_inscription, + MAX(ep.nb) IS NOT NULL AS inscrit, MAX(ep.paid) AS paid + FROM group_events AS e + LEFT JOIN group_event_participants AS ep ON (ep.eid = e.eid AND ep.uid = {?}) + WHERE asso_id = {?} AND archive = {?} + GROUP BY e.eid + ORDER BY inscr_open DESC, debut DESC', + S::i('uid'), $globals->asso('id'), $archive ? 1 : 0); + } else { + $evenements = XDB::iterator('SELECT e.*, LEFT(e.debut, 10) AS first_day, LEFT(e.fin, 10) AS last_day, + IF(e.deadline_inscription, + e.deadline_inscription >= LEFT(NOW(), 10), + 1) AS inscr_open, + e.deadline_inscription, + MAX(ep.nb) IS NOT NULL AS inscrit, MAX(ep.paid) AS paid + FROM group_events AS e + LEFT JOIN group_event_participants AS ep ON (ep.eid = e.eid AND ep.uid = {?}) + WHERE asso_id = {?} AND archive = {?} + GROUP BY e.eid + ORDER BY inscr_open DESC, debut ASC', + S::i('uid'), $globals->asso('id'), $archive ? 1 : 0); } - $order = get_event_order($globals->asso('id')); - $evts = get_events($globals->asso('id'), $order); $page->assign('order', $order); + $evts = array(); $undisplayed_events = 0; - foreach ($evts as $eid => &$e) { + $this->load('xnetevents.inc.php'); + + while ($e = $evenements->next()) { if (!is_member() && !may_update() && !$e['accept_nonmembre']) { $undisplayed_events ++; continue; } $e['show_participants'] = ($e['show_participants'] && (is_member() || may_update())); - $e['items'] = get_event_items($eid); + $e['moments'] = XDB::fetchAllAssoc('SELECT titre, details, montant, ei.item_id, nb, ep.paid + FROM group_event_items AS ei + LEFT JOIN group_event_participants AS ep + ON (ep.eid = ei.eid AND ep.item_id = ei.item_id AND ep.uid = {?}) + WHERE ei.eid = {?}', + S::i('uid'), $e['eid']); + $e['topay'] = 0; $e['paid'] = 0; - $sub = get_event_subscription($eid, S::i('uid')); - if (empty($sub)) { - $e['inscrit'] = false; - } else { - $e['inscrit'] = true; - foreach ($e['items'] as $item_id => $m) { - if (isset($sub[$item_id])) { - $e['topay'] += $sub[$item_id]['nb'] * $m['montant']; - $e['paid'] += $sub[$item_id]['paid']; - } - } - } - $e['sub'] = $sub; - - $telepaid = get_event_telepaid($eid, S::i('uid')); - $e['paid'] += $telepaid; - - $e['date'] = make_event_date($e['debut'], $e['fin']); - if ($e['deadline_inscription'] == null || strtotime($e['deadline_inscription']) >= time()) { - $e['inscr_open'] = true; - } else { - $e['inscr_open'] = false; + foreach ($e['moments'] as $m) { + $e['topay'] += $m['nb'] * $m['montant']; + $e['paid'] += $m['paid']; } + $montant = XDB::fetchOneCell( + "SELECT SUM(amount) as sum_amount + FROM payment_transactions AS t + WHERE ref = {?} AND uid = {?}", $e['paiement_id'], S::v('uid')); + $e['paid'] += $montant; + + make_event_date($e); + if (Env::has('updated') && $e['eid'] == Env::i('updated')) { $page->assign('updated', $e); } + $evts[] = $e; } $page->assign('evenements', $evts); @@ -207,17 +233,12 @@ class XnetEventsModule extends PLModule $this->load('xnetevents.inc.php'); $page->changeTpl('xnetevents/subscribe.tpl'); - $evt = get_event($eid); + $evt = get_event_detail($eid); if (is_null($evt)) { return PL_NOT_FOUND; } - - global $globals; - - if (!$evt['inscr_open']) { - $page->kill('Les inscriptions pour cet événement sont closes'); - } - if (!$evt['accept_nonmembre'] && !is_member() && !may_update()) { + if ($evt === false) { + global $globals, $platal; $url = $globals->asso('sub_url'); if (empty($url)) { $url = $platal->ns . 'subscribe'; @@ -226,29 +247,20 @@ class XnetEventsModule extends PLModule '. Pour devenir membre, rends-toi sur la page de demande d\'inscripton.'); } + if (!$evt['inscr_open']) { + $page->kill('Les inscriptions pour cet événement sont closes'); + } + if (!$evt['accept_nonmembre'] && !is_member() && !may_update()) { + $page->kill('Cet événement est fermé aux non-membres du groupe'); + } + + global $globals; $res = XDB::query("SELECT stamp FROM requests WHERE type = 'paiements' AND data LIKE {?}", - PayReq::same_event($eid, $globals->asso('id'))); + PayReq::same_event($evt['eid'], $globals->asso('id'))); $page->assign('validation', $res->numRows()); - - $page->assign('eid', $eid); $page->assign('event', $evt); - - $items = get_event_items($eid); - $subs = get_event_subscription($eid, S::v('uid')); - var_dump($subs); - // count what the user must pay - $topay = 0; - foreach ($items as $item_id => $item) { - if (array_key_exists($item_id, $subs)) { - $topay += $item['montant']*$subs[$item_id]['nb']; - } - } - $page->assign('moments', $items); - $page->assign('subs', $subs); - $page->assign('topay', $topay); - $page->assign('telepaid', get_event_telepaid($eid, S::v('uid'))); if (!Post::has('submit')) { return; @@ -284,8 +296,12 @@ class XnetEventsModule extends PLModule } // update actual inscriptions - $updated = subscribe(S::v('uid'), $eid, $subs); - /* foreach ($subs as $j => $nb) { + $updated = false; + $total = 0; + $paid = $evt['paid'] ? $evt['paid'] : 0; + $telepaid = $evt['telepaid'] ? $evt['telepaid'] : 0; + $paid_inserted = false; + foreach ($subs as $j => $nb) { if ($nb >= 0) { XDB::execute('INSERT INTO group_event_participants (eid, uid, item_id, nb, flags, paid) VALUES ({?}, {?}, {?}, {?}, {?}, {?}) @@ -302,15 +318,15 @@ class XnetEventsModule extends PLModule $updated = $eid; } $total += $nb; - } - */ - if ($updated) { + } + if ($updated !== false) { $evt = get_event_detail($eid); if ($evt['topay'] > 0) { $page->trigSuccess('Ton inscription à l\'événement a été mise à jour avec succès, tu peux payer ta participation en cliquant ci-dessous'); } else { $page->trigSuccess('Ton inscription à l\'événement a été mise à jour avec succès.'); } + subscribe_lists_event(S::i('uid'), $evt['short_name'], ($total > 0 ? 1 : 0), 0); if ($evt['subscription_notification'] != 'nobody') { $mailer = new PlMailer('xnetevents/subscription-notif.mail.tpl'); diff --git a/modules/xnetevents/xnetevents.inc.php b/modules/xnetevents/xnetevents.inc.php index a41f7d8..594f0aa 100644 --- a/modules/xnetevents/xnetevents.inc.php +++ b/modules/xnetevents/xnetevents.inc.php @@ -19,113 +19,6 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************/ -// {{{ function get_event_order() -/* get the order to paste the events - * @param $asso_id: group's id - */ -function get_event_order($asso_id) -{ - $order = XDB::fetchOneCell('SELECT g.event_order - FROM groups as g - WHERE id = {?}', - $asso_id); - return $order; -} -// }}} - -// {{{ function get_events() -/* get the events of the given group ordered by the standard order for the group - * @param $asso_id: group's id - * @param $order: order to paste the events (asc or desc) - */ -function get_events($asso_id, $order) -{ - if ($order != 'asc' && $order != 'desc') { - $order = 'desc'; - } - $evts = XDB::fetchAllAssoc('eid', "SELECT ge.eid, ge.uid, ge.intitule, ge.debut, ge.fin, ge.show_participants, ge.deadline_inscription, ge.accept_nonmembre - FROM group_events as ge - WHERE asso_id = {?} - ORDER BY ge.debut $order", - $asso_id); - return $evts; -} -// }}} - -// {{{ function get_event() (detail, for subs page only for now) -/* get event details - * @param $eid: event's id - */ -function get_event($eid) -{ - $evt = XDB::fetchOneAssoc('SELECT ge.uid, ge.intitule, ge.descriptif, ge.debut, ge.fin, ge.deadline_inscription, ge.accept_nonmembre - FROM group_events as ge - WHERE eid = {?}', - $eid); - if (!is_null($evt['deadline_inscription']) && strtotime($evt['deadline_inscription']) < time()) { - $evt['inscr_open'] = false; - } else { - $evt['inscr_open'] = true; - } - $evt['organizer'] = User::getSilent($evt['uid'])->profile(); - $evt['date'] = make_event_date($evt['debut'], $evt['fin']); - - return $evt; -} -// }}} - -// {{{ function get_event_items() -/** get items of the given event - * - * @param $eid : event's id - * - */ -function get_event_items($eid) -{ - $evt = XDB::fetchAllAssoc('item_id', 'SELECT gei.item_id, gei.titre, gei.details, gei.montant - FROM group_event_items as gei - WHERE eid = {?}', - $eid); - return $evt; -} -// }}} - -// {{{ function get_event_subscription() -/* get all participations if uid is not specified, only the user's participation if uid specified - * @param $eid: event's id - * @param $uid: user's id - */ -function get_event_subscription($eid, $uid = null) -{ - if (!is_null($uid)) { - $where = ' and gep.uid = '.$uid; - } - else { - $where = ''; - } - $sub = XDB::fetchAllAssoc('item_id','SELECT gep.item_id, gep.nb, gep.paid FROM group_event_participants as gep - WHERE gep.eid = {?}'.$where, - $eid); - return $sub; -} -// }}} - -// {{{ function get_event_telepaid() -/* get the total payments made by a user for an event - * @param $eid: event's id - * @param $uid: user's id - */ -function get_event_telepaid($eid, $uid) -{ - $telepaid = XDB::fetchOneCell('SELECT SUM(pt.amount) - FROM payment_transactions AS pt - LEFT JOIN group_events as ge ON (ge.paiement_id = pt.ref) - WHERE ge.eid = {?} AND pt.uid = {?}', - $eid, $uid); - return $telepaid; -} -// }}} - // {{{ function get_event_detail() function get_event_detail($eid, $item_id = false, $asso_id = null) @@ -203,7 +96,7 @@ function get_event_detail($eid, $item_id = false, $asso_id = null) $evt['paid'] += $montant; $evt['organizer'] = User::getSilent($evt['uid']); - $evt['date'] = make_event_date($evt); + make_event_date($evt); $evt['show_participants'] = ($evt['show_participants'] && $GLOBALS['IS_XNET_SITE'] && (is_member() || may_update())); @@ -273,106 +166,6 @@ function get_event_participants(&$evt, $item_id, array $tri = array(), $limit = } // }}} -// {{{ function subscribe() -/** set or update the user's subscription - * - * @param $uid: user's id - * @param $eid: event's id - * @param $subs: user's new subscription - * - */ -function subscribe($uid, $eid, $subs = array()) -{ - global $globals; - // get items - $items = get_event_items($eid); - // get previous subscription - $old_subs = get_event_subscription($eid, $uid); - $participate = false; - $updated = false; - // for each item of the event - foreach ($items as $item_id => $details) { - // check if there is an old subscription - if (array_key_exists($item_id, $old_subs)) { - echo 'prev exists '; - // compares new and old subscription - if ($old_subs[$item_id]['nb'] != $subs[$item_id]) { - echo 'different '; - if ($subs[$item_id] != 0) { - echo "je m'inscris "; - XDB::execute('INSERT INTO group_event_participants (eid, uid, item_id, nb, flags, paid) - VALUES ({?}, {?}, {?}, {?}, {?}, {?}) - ON DUPLICATE KEY UPDATE nb = VALUES(nb), flags = VALUES(flags), paid = VALUES(paid)', - $eid, $uid, $item_id, $subs[$item_id],(Env::has('notify_payment') ? 'notify_payment' : ''), 0); - $participate = true; - } else { // we do not store non-subscription to event items - echo "je me desinscris "; - XDB::execute('DELETE FROM group_event_participants - WHERE eid = {?} AND uid = {?} AND item_id = {?}', - $eid, $uid, $item_id); - } - $updated = true; - } - } else { // if no old subscription - echo 'no prev '; - if ($subs[$item_id] != 0) { - echo 'subscribe '; - XDB::execute('INSERT INTO group_event_participants (eid, uid, item_id, nb, flags, paid) - VALUES ({?}, {?}, {?}, {?}, {?}, {?})', - $eid, $uid, $item_id, $subs[$item_id], '', 0); - $participate = true; - $updated = true; - } - } - } - // item 0 stores whether the user participates globally or not, if he has to be notified when payment is created and his manual payment - if (array_key_exists(0, $old_subs)) { - XDB::execute('UPDATE group_event_participants - SET nb = {?} - WHERE eid = {?}, uid = {?}, item_id = 0', - ($participate ? 1 : 0), $eid, $uid); - } else { - XDB::execute('INSERT INTO group_event_participants (eid, uid, item_id, nb, flags, paid) - VALUES ({?}, {?}, {?}, {?}, {?}, {?})', - $eid, $uid, 0, ($participate ? 1 : 0), (Env::has('notify_payment') ? 'notify_payment' : ''), 0); - } - // if subscription is updated, we have to update the event aliases - if ($updated) { - echo "inscription mise a jour "; - $short_name = get_event_detail($eid)['short_name']; - subscribe_lists_event($uid, $short_name, ($participate ? 1 : -1), 0); - } - return $updated; -} -// }}} - -// {{{ function add_manual_payment() -// deal with manual payments : add them on item_id = 0 (so that it's not dependant on what items the user registers) -/* - * - */ -function add_manual_payment($newly_paid) -{ - $old_subs = get_event_subscription($eid, $uid); - if ($newly_paid != 0) { - if (array_key_exists(0, $old_subs)) { - echo "update paiement liquide "; - XDB::execute('UPDATE group_event_participants - SET paid = {?} - WHERE eid = {?}, uid = {?}, item_id = 0', - $old_subs[0]['paid'] + $newly_paid, $eid, $uid); - } else { - echo "on ne devrait pas passer ici car on a deja un moment 0 des qu'on est ajoute comme participant "; - XDB::execute('INSERT INTO group_event_participants (eid, uid, item_id, nb, flags, paid) - VALUES ({?}, {?}, 0, 0, "", {?})', - $eid, $uid, $newly_paid); - } - } -} -// }}} -// TODO : correct this function to be compatible with subscribe() (use $eid, remove useless argument) -// TODO : correct other calls - // {{{ function subscribe_lists_event() /** Subscribes user to various event related mailing lists. * @@ -531,14 +324,13 @@ function event_change_shortname($page, $eid, $old, $new) // }}} // {{{ function make_event_date() -function make_event_date($debut, $fin) +function make_event_date(&$e) { - $start = strtotime($debut); - $end = strtotime($fin); -// $first_day = $e['first_day']; -// $last_day = $e['last_day']; - $first_day = strftime("%d %B %Y", $start); - $last_day = strftime("%d %B %Y", $end); + $start = strtotime($e['debut']); + $end = strtotime($e['fin']); + $first_day = $e['first_day']; + $last_day = $e['last_day']; + $date = ""; if ($start && $end != $start) { if ($first_day == $last_day) { @@ -551,7 +343,7 @@ function make_event_date($debut, $fin) } else { $date .= "le " . strftime("%d %B %Y à %H:%M", $start); } - return $date; + $e['date'] = $date; } // }}} diff --git a/templates/xnetevents/index.tpl b/templates/xnetevents/index.tpl index 962fdaa..833db76 100644 --- a/templates/xnetevents/index.tpl +++ b/templates/xnetevents/index.tpl @@ -47,7 +47,7 @@ {if $archive}Archives {else}[Archives] {/if} -{if t($updated) && $updated} +{if $updated}

La modification de l'inscription a été prise en compte ! {if $updated.topay > $updated.paid} @@ -70,14 +70,15 @@ {/if} {/if} -{foreach from=$evenements key=eid item=e} +{foreach from=$evenements item=e} +
- + {icon name=calendar_view_day title="Événement iCal"} {$e.intitule} @@ -86,11 +87,11 @@ {/if} {if $is_admin}
- [ + [ modifier {icon name=date_edit title="Édition de l'événement"}]   - [ + [ {if !$archive} archiver {icon name=package_add title="Archivage"}] @@ -99,7 +100,7 @@ {icon name=package_delete title="Désarchivage"}] {/if}   - [ supprimer {icon name=delete title='Suppression'}] @@ -122,7 +123,7 @@ 		Informations : {if $is_admin || $e.show_participants} - + consulter la liste des participants {icon name=group title="Liste des participants"}
@@ -139,18 +140,18 @@ 		État inscription : {if $e.inscr_open} - + {/if} {if !$e.inscrit} Non inscrit
{else} - {foreach from=$e.items key=item_id item=m} - {if !t($e.sub.$item_id) || !$e.sub.$item_id.nb} + {foreach from=$e.moments item=m} + {if !$m.nb} Tu ne viendras pas {else} - Tu as inscrit {$e.sub.$item_id.nb} personne{if $e.sub.$item_id.nb > 1}s{/if} + Tu as inscrit {$m.nb} personne{if $m.nb > 1}s{/if} {/if} à {$m.titre}.
{/foreach} {/if} @@ -165,7 +166,7 @@ {else} Tu as déjà payé les {$e.paid|replace:'.':','} € de ton inscription. {/if} - {if t($e.paiement_id) && $e.paid < $e.topay} + {if $e.paiement_id && $e.paid < $e.topay} [ Payer en ligne] {/if} @@ -178,7 +179,7 @@
- + Gérer mon inscription et voir les détails de l'événement. diff --git a/templates/xnetevents/subscribe.tpl b/templates/xnetevents/subscribe.tpl index 5b0b7ca..0fcbe11 100644 --- a/templates/xnetevents/subscribe.tpl +++ b/templates/xnetevents/subscribe.tpl @@ -27,8 +27,9 @@

+ {assign var=profile value=$event.organizer->profile()} Cet événement a lieu {$event.date} et a été proposé par - + {$event.organizer->fullName('promo')} .

@@ -37,20 +38,20 @@ {$event.descriptif|nl2br}

-{if $is_admin || $event.show_participants} +{if $admin || $event.show_participants}

Tu peux - + consulter la liste des participants {icon name=group title="Liste des participants"} déjà inscrits.

{/if} -
+ {xsrf_token_field} - {foreach from=$moments key=item_id item=m} + {foreach from=$event.moments item=m} {if $m.details} @@ -62,23 +63,22 @@ @@ -88,23 +88,22 @@ -- 2.1.4
{$m.titre} ({$m.montant} €)
{if $event.inscr_open} - {assign var=nb value=$subs.$item_id.nb} -
- {if $event.accept_nonmembre} - +
+ {if $event.noinvite} + {else} - - + + {/if} {else} - {if !$nb} + {if !$m.nb} Je ne viendrai pas. {else} - J'ai inscrit {$nb} personne{if $nb > 1}s{/if}. + J'ai inscrit {$m.nb} personne{if $m.nb > 1}s{/if}. {/if} {/if}
À payer
- {if $topay} -
- {assign var=paid value=$telepaid+$subs.0.paid} - {if $paid eq 0} - Tu dois payer {$topay|replace:'.':','} €. - {elseif $paid < $topay} - Tu dois encore payer {math equation="a-b" a=$topay b=$paid|replace:'.':','} € - (tu as déjà payé {$paid|replace:'.':','} €). + {if $event.topay} +
+ {if $event.paid eq 0} + Tu dois payer {$event.topay|replace:'.':','} €. + {elseif $event.paid < $event.topay} + Tu dois encore payer {math equation="a-b" a=$event.topay b=$event.paid|replace:'.':','} € + (tu as déjà payé {$event.paid|replace:'.':','} €). {else} - Tu as déjà payé {$paid|replace:'.':','} € pour ton inscription. + Tu as déjà payé {$event.paid|replace:'.':','} € pour ton inscription. {/if}
- {if $event.paiement_id && $paid < $topay} - + {if $event.paiement_id && $event.paid < $event.topay} + {icon name=money} Payer en ligne - {elseif $validation && $paid < $topay} + {elseif $validation && $event.paid < $event.topay}
Le télépaiement pour cet événement est en instance de validation :
@@ -112,8 +111,8 @@
{else} Rien à payer - {if $paid > 0} - (tu as déjà payé {$paid|replace:'.':','} €). + {if $event.paid > 0} + (tu as déjà payé {$event.paid|replace:'.':','} €). {/if}. {/if}