From 20c5c7e6a3ba4acebffb88a22d474931a2b4353b Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Wed, 21 Jan 2009 00:37:17 +0100 Subject: [PATCH] Displays the date of the event on the administration page. --- modules/xnetevents.php | 5 ++++- modules/xnetevents/xnetevents.inc.php | 31 ++++++++++++++++++++++++++++++- templates/xnetevents/admin.tpl | 15 +++++++-------- templates/xnetevents/index.tpl | 13 +------------ templates/xnetevents/subscribe.tpl | 2 +- 5 files changed, 43 insertions(+), 23 deletions(-) diff --git a/modules/xnetevents.php b/modules/xnetevents.php index 3cacb71..f5cd0f4 100644 --- a/modules/xnetevents.php +++ b/modules/xnetevents.php @@ -117,7 +117,7 @@ class XnetEventsModule extends PLModule $page->assign('archive', $archive); $evenements = XDB::iterator( - "SELECT e.*, LEFT(10, e.debut) AS debut_day, LEFT(10, e.fin) AS fin_day, + "SELECT e.*, LEFT(10, e.debut) AS first_day, LEFT(10, e.fin) AS last_day, IF(e.deadline_inscription, e.deadline_inscription >= LEFT(NOW(), 10), 1) AS inscr_open, e.deadline_inscription, u.nom, u.prenom, u.promo, a.alias, @@ -133,6 +133,7 @@ class XnetEventsModule extends PLModule $evts = array(); $undisplayed_events = 0; + $this->load('xnetevents.inc.php'); while ($e = $evenements->next()) { if (!is_member() && !may_update() && !$e['accept_nonmembre']) { @@ -167,6 +168,8 @@ class XnetEventsModule extends PLModule $e['paid'] += trim($p); } + make_event_date($e); + if (Env::has('updated') && $e['eid'] == Env::i('updated')) { $page->assign('updated', $e); } diff --git a/modules/xnetevents/xnetevents.inc.php b/modules/xnetevents/xnetevents.inc.php index 00740b7..7bbd1d7 100644 --- a/modules/xnetevents/xnetevents.inc.php +++ b/modules/xnetevents/xnetevents.inc.php @@ -31,7 +31,7 @@ function get_event_detail($eid, $item_id = false, $asso_id = null) "SELECT SUM(nb) AS nb_tot, COUNT(DISTINCT ep.uid) AS nb, e.*, IF(e.deadline_inscription, e.deadline_inscription >= LEFT(NOW(), 10), 1) AS inscr_open, - LEFT(10, e.debut) AS debut_day, LEFT(10, e.fin) AS fin_day, + 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, @@ -107,6 +107,8 @@ function get_event_detail($eid, $item_id = false, $asso_id = null) $evt['telepaid'] += trim($p); } + make_event_date($evt); + return $evt; } @@ -252,6 +254,7 @@ function subscribe_lists_event($participate, $uid, $evt) } // }}} +// {{{ function event_change_shortname() function event_change_shortname(&$page, $eid, $old, $new) { global $globals; @@ -350,6 +353,32 @@ function event_change_shortname(&$page, $eid, $old, $new) // cannot happen return $old; } +// }}} + +// {{{ function make_event_date() +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']); + + $date = ""; + if ($start && $end != $start) { + if ($first_day == $last_day) { + $date .= "le " . strftime("%d %B %Y", $start) . " de " + . strftime("%H:%M", $start) . " à " . strftime("%H:%M", $end); + } else { + $date .= "du " . strftime("%d %B %Y à %H:%M", $start) + . "\nau " . strftime("%d %B %Y à %H:%M", $end); + } + } else { + $date .= "le " . strftime("%d %B %Y à %H:%M", $start); + } + $e['date'] = $date; +} +// }}} // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: ?> diff --git a/templates/xnetevents/admin.tpl b/templates/xnetevents/admin.tpl index fe3c139..ab83d43 100644 --- a/templates/xnetevents/admin.tpl +++ b/templates/xnetevents/admin.tpl @@ -23,14 +23,13 @@

{$asso.nom} : Événements

-L'événement {$evt.intitule} -{if $evt.titre} - {$evt.titre} -{/if} -{if $evt.titre || count($moments) eq 1} -comptera {$evt.nb_tot} personne{if $evt.nb_tot > 1}s{/if}. -{else} -({$evt.nb} personne{if $evt.nb > 1}s ont réalisé leur{else} a réalisé son{/if} inscription). -{/if} + {if $evt.titre || count($moments) eq 1} + {$evt.nb_tot} personne{if $evt.nb_tot > 1}s ont réalisé leur {else} a réalisé son {/if} + {else} + {$evt.nb} personne{if $evt.nb > 1}s ont réalisé leur{else} a réalisé son {/if} + {/if} + inscription à l'événement {$evt.intitule} {if $evt.titre}- {$evt.titre} {/if} + qui aura lieu {$evt.date}.

{if $evt.participant_list && $is_admin} diff --git a/templates/xnetevents/index.tpl b/templates/xnetevents/index.tpl index e3fe95b..5311d07 100644 --- a/templates/xnetevents/index.tpl +++ b/templates/xnetevents/index.tpl @@ -92,18 +92,7 @@ Date : - - {if $e.fin and $e.fin neq $e.debut} - {if $e.debut_day eq $e.fin_day} - le {$e.debut|date_format:"%d %B %Y"} de {$e.debut|date_format:"%H:%M"} à {$e.fin|date_format:"%H:%M"} - {else} - du {$e.debut|date_format:"%d %B %Y à %H:%M"}
- au {$e.fin|date_format:"%d %B %Y à %H:%M"} - {/if} - {else} - le {$e.debut|date_format:"%d %B %Y à %H:%M"} - {/if} - + {$e.date} diff --git a/templates/xnetevents/subscribe.tpl b/templates/xnetevents/subscribe.tpl index 0ccf8aa..695fe59 100644 --- a/templates/xnetevents/subscribe.tpl +++ b/templates/xnetevents/subscribe.tpl @@ -30,7 +30,7 @@ Cet événement a lieu {if $event.fin and $event.fin neq $event.debut} - {if $event.debut_day eq $event.fin_day} + {if $event.first_day eq $event.last_day} le {$event.debut|date_format:"%d %B %Y"} de {$event.debut|date_format:"%H:%M"} à {$event.fin|date_format:"%H:%M"} {else} du {$event.debut|date_format:"%d %B %Y à %H:%M"}
-- 2.1.4