projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a dissuasive message in the "send a mail to a group" page
[platal.git]
/
modules
/
xnetevents.php
diff --git
a/modules/xnetevents.php
b/modules/xnetevents.php
index
feb9d7f
..
a9d4d1c
100644
(file)
--- a/
modules/xnetevents.php
+++ b/
modules/xnetevents.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-201
3
Polytechnique.org *
+ * Copyright (C) 2003-201
4
Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-204,9
+204,10
@@
class XnetEventsModule extends PLModule
S::i('uid'), $e['eid']);
$e['topay'] = 0;
S::i('uid'), $e['eid']);
$e['topay'] = 0;
- $e['paid'] =
$e['moments'][0]['paid']
;
+ $e['paid'] =
0
;
foreach ($e['moments'] as $m) {
$e['topay'] += $m['nb'] * $m['montant'];
foreach ($e['moments'] as $m) {
$e['topay'] += $m['nb'] * $m['montant'];
+ $e['paid'] += $m['paid'];
}
$montant = XDB::fetchOneCell(
}
$montant = XDB::fetchOneCell(
@@
-274,7
+275,7
@@
class XnetEventsModule extends PLModule
foreach ($moments as $j => $v) {
$subs[$j] = intval($v);
foreach ($moments as $j => $v) {
$subs[$j] = intval($v);
- // retr
eive oht
er field when more than one person
+ // retr
ieve oth
er field when more than one person
if ($subs[$j] == 2) {
if (!isset($pers[$j]) || !is_numeric($pers[$j]) || $pers[$j] < 0) {
$page->trigError("Tu dois choisir un nombre d'invités correct !");
if ($subs[$j] == 2) {
if (!isset($pers[$j]) || !is_numeric($pers[$j]) || $pers[$j] < 0) {
$page->trigError("Tu dois choisir un nombre d'invités correct !");
@@
-319,7
+320,12
@@
class XnetEventsModule extends PLModule
$total += $nb;
}
if ($updated !== false) {
$total += $nb;
}
if ($updated !== false) {
- $page->trigSuccess('Ton inscription à l\'événement a été mise à jour avec succès.');
+ $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') {
subscribe_lists_event(S::i('uid'), $evt['short_name'], ($total > 0 ? 1 : 0), 0);
if ($evt['subscription_notification'] != 'nobody') {
@@
-365,7
+371,7
@@
class XnetEventsModule extends PLModule
$all = !Env::v('item_id', false);
$participants = get_event_participants($evt, $item_id, $tri);
$all = !Env::v('item_id', false);
$participants = get_event_participants($evt, $item_id, $tri);
- $title = 'Nom;Prénom;Promotion';
+ $title = 'Nom;Prénom;Promotion
;Email
';
if ($admin) {
$title .=';Société;Poste';
}
if ($admin) {
$title .=';Société;Poste';
}
@@
-388,7
+394,7
@@
class XnetEventsModule extends PLModule
if ($participants) {
foreach ($participants as $participant) {
$user = $participant['user'];
if ($participants) {
foreach ($participants as $participant) {
$user = $participant['user'];
- $line = $user->lastName() . ';' . $user->firstName() . ';' . $user->promo();
+ $line = $user->lastName() . ';' . $user->firstName() . ';' . $user->promo()
. ';' . $user->bestEmail()
;
if ($admin && $user->hasProfile()) {
$line .= ';' . $user->profile()->getMainJob()->company->name . ';' . $user->profile()->getMainJob()->description;
} else {
if ($admin && $user->hasProfile()) {
$line .= ';' . $user->profile()->getMainJob()->company->name . ';' . $user->profile()->getMainJob()->description;
} else {
@@
-576,10
+582,10
@@
class XnetEventsModule extends PLModule
}
}
}
}
- // events with no sub-event: add a sub-event with
no
name
+ // events with no sub-event: add a sub-event with
default
name
if ($nb_moments == 0) {
XDB::execute("INSERT INTO group_event_items
if ($nb_moments == 0) {
XDB::execute("INSERT INTO group_event_items
- VALUES ({?}, {?}, '', '', 0)", $eid, 1);
+ VALUES ({?}, {?}, '
Événement
', '', 0)", $eid, 1);
}
if (!$error) {
}
if (!$error) {
@@
-749,6
+755,9
@@
class XnetEventsModule extends PLModule
GROUP BY p.uid', $evt['eid']);
$ofs = Env::i('offset');
GROUP BY p.uid', $evt['eid']);
$ofs = Env::i('offset');
+ $part = get_event_participants($evt, $item_id, UserFilter::sortByName(),
+ NB_PER_PAGE, $ofs * NB_PER_PAGE);
+
$nbp = ceil($evt['user_count'] / NB_PER_PAGE);
if ($nbp > 1) {
$links = array();
$nbp = ceil($evt['user_count'] / NB_PER_PAGE);
if ($nbp > 1) {
$links = array();
@@
-765,11
+774,9
@@
class XnetEventsModule extends PLModule
}
$page->assign('absents', $absents);
}
$page->assign('absents', $absents);
- $page->assign('participants',
- get_event_participants($evt, $item_id, UserFilter::sortByName(),
- NB_PER_PAGE, $ofs * NB_PER_PAGE));
+ $page->assign('participants', $part);
}
}
}
}
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker
f
enc=utf-8:
?>
?>