From: x2001corpet <x2001corpet@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Sun, 31 Jul 2005 19:33:46 +0000 (+0000)
Subject: modifications et ameliorations des evenements
X-Git-Tag: xorg/0.9.9~184
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=b479e26bec66a862d0ea855eada2d70cd19364ff;p=platal.git

modifications et ameliorations des evenements

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@11 839d8a87-29fc-0310-9880-83ba4fa771e5
---

diff --git a/htdocs.net/groupe/evenements.php b/htdocs.net/groupe/evenements.php
index 8f5ab63..f3fd9c0 100644
--- a/htdocs.net/groupe/evenements.php
+++ b/htdocs.net/groupe/evenements.php
@@ -108,7 +108,7 @@ if (may_update() && Post::get('intitule')) {
 		$p = new PayReq(Session::get('uid'), Post::get('intitule')." - ".$globals->asso('nom'), Post::get('site'), $money_defaut, Post::get('confirmation'),0, 999, $globals->asso('id'), $eid);
 		$p->submit();
 	}
-	
+
 	// events with no sub-event
 	if ($nb_moments == 0)
 		$globals->xdb->execute("INSERT INTO groupex.evenements_items VALUES ({?}, {?}, '', '', 0)", $eid, 1);
@@ -124,6 +124,9 @@ if (may_update() && Env::has('sup') && $eid) {
 	// deletes the event mailing aliases
 	if ($infos['short_name'])
 		$globals->xdb->execute("DELETE FROM virtual WHERE type = 'evt' AND alias LIKE {?}", $infos['short_name']."-%");
+	// delete the requests for payments
+	require_once('validations.inc.php');
+	$globals->xdb->execute("DELETE FROM requests WHERE type = 'paiements' AND data  LIKE {?}", PayReq::same_event($eid, $globals->asso('id')));
 }
 
 if (may_update() && (Env::has('add') || (Env::has('mod') && $eid))) {
@@ -141,6 +144,13 @@ if ($eid) {
 		   FROM	groupex.evenements
 		  WHERE eid = {?}", $eid);
 	$evt = $res->fetchOneAssoc();
+	require_once('validations.inc.php');
+	$res = $globals->xdb->query("SELECT stamp FROM requests WHERE type = 'paiements' AND data LIKE {?}", PayReq::same_event($eid, $globals->asso('id')));
+	$stamp = $res->fetchOneCell();
+	if ($stamp) {
+		$evt['paiement_id'] = -2;
+		$evt['paiement_req'] = $stamp;
+	}
 	$page->assign('evt', $evt);
 }
 
@@ -157,7 +167,7 @@ if (may_update() && Env::has('mod') && $eid) {
 } else {
 
 	$evenements = $globals->xdb->iterator(
-	"SELECT  e.eid, e.intitule, e.descriptif, e.debut, e.fin, e.show_participants, u.nom, u.prenom, u.promo, a.alias, MAX(ep.nb)>=1 AS inscrit,
+	"SELECT  e.eid, e.intitule, e.descriptif, e.debut, e.fin, e.show_participants, u.nom, u.prenom, u.promo, a.alias, MAX(ep.nb) AS inscrit,
 		 e.short_name
 	      FROM  groupex.evenements AS e
 	INNER JOIN  x4dat.auth_user_md5 AS u ON u.user_id = e.organisateur_uid
diff --git a/htdocs.net/groupe/evt-admin.php b/htdocs.net/groupe/evt-admin.php
index 7fc5a6c..26f093e 100644
--- a/htdocs.net/groupe/evt-admin.php
+++ b/htdocs.net/groupe/evt-admin.php
@@ -69,6 +69,7 @@ if ($admin && Env::get('adm') == 'nbs' && $member) {
 		$u = $res->fetchOneCell();
 		subscribe_lists_event($u, $member, $evt['participant_list'], $evt['absent_list']);
 	}
+	$evt = get_event_detail(Env::get('eid'), Env::get('item_id'));
 }
 
 $page->assign('admin', $admin);
diff --git a/htdocs.net/groupe/evt-detail.php b/htdocs.net/groupe/evt-detail.php
index 3907385..bf49dbe 100644
--- a/htdocs.net/groupe/evt-detail.php
+++ b/htdocs.net/groupe/evt-detail.php
@@ -1,6 +1,6 @@
 <?php
 
-require 'xnet.inc.php';
+require_once 'xnet.inc.php';
 
 new_group_page('xnet/groupe/evt-detail.tpl');
 
@@ -49,6 +49,7 @@ require_once('xnet/evenements.php');
 $evt = get_event_detail(Env::get('eid'));
 if (Env::has('ins')) {
     subscribe_lists_event($participate, Session::get("uid"), $evt['participant_list'], $evt['absent_list']);
+    header("Location: evenements.php?backfrom=".Env::get('eid'));
 }
 
 $page->assign('participate', $participate);
diff --git a/include/validations/paiements.inc.php b/include/validations/paiements.inc.php
index 8ec5de5..c00e45d 100644
--- a/include/validations/paiements.inc.php
+++ b/include/validations/paiements.inc.php
@@ -67,16 +67,23 @@ class PayReq extends Validate
     }
 
     // }}}
+  // {{{ function same_event()
+    function same_event($evt, $asso_id)
+    {
+        $wevt = 's:3:"evt";s:'.strlen($evt+"").':"'.$evt.'"';
+        $wassoid = 's:7:"asso_id";s:'.strlen($asso_id + "").':"'.$asso_id.'"';
+        $where = "%".$wassoid."%".$wevt."%";
+        return $where;
+    }
+  // }}}
   // {{{ function submit() 
   // supprime les demandes de paiments pour le meme evenement
     function submit()
     {
         global $globals;
-        $evt = 's:3:"evt";s:'.strlen($this->evt+"").':"'.$this->evt.'"';
-        $assoid = 's:7:"asso_id";s:'.strlen($this->asso_id + "").':"'.$this->asso_id.'"';
         if ($this->evt)
         {
-            $globals->xdb->execute('DELETE FROM requests WHERE type={?} AND data LIKE {?}', 'paiements', "%".$assoid."%".$evt."%");
+            $globals->xdb->execute('DELETE FROM requests WHERE type={?} AND data LIKE {?}', 'paiements', PayReq::same_event($this->evt, $this->asso_id));
         }
         Validate::submit();
     }
diff --git a/templates/xnet/groupe/evenements.tpl b/templates/xnet/groupe/evenements.tpl
index deb2718..a2a637a 100644
--- a/templates/xnet/groupe/evenements.tpl
+++ b/templates/xnet/groupe/evenements.tpl
@@ -85,11 +85,13 @@ Ev
       <td class="titre">
         <a href='evt-detail.php?eid={$e.eid}'>Détails...</a> 
       </td>
-      <td>
+      <td {if $smarty.request.backfrom eq $e.eid}class="erreur"{/if}>
         {if $e.inscrit}
-        <small>tu es inscrit à cet événément !</small>
+        <small>tu es inscrit à cet événément.
+          {if $e.inscrit > 1}(avec&nbsp;{$e.inscrit - 1}&nbsp;invité{if $e.inscrit > 2}s{/if}){/if}
+        </small>
         {else}
-        <small>tu n'es pas encore inscrit à cet événément !</small>
+        <small>tu n'es pas inscrit à cet événément.</small>
         {/if}
       </td>
     </tr>
diff --git a/templates/xnet/groupe/evt-admin.tpl b/templates/xnet/groupe/evt-admin.tpl
index 8287cd9..2c7d187 100644
--- a/templates/xnet/groupe/evt-admin.tpl
+++ b/templates/xnet/groupe/evt-admin.tpl
@@ -99,9 +99,13 @@ Ils ont pay
     <th>Promo</th>
     <th>Info</th>
     {if $tout}
-      {foreach from=$moments item=m}
-        <th>{$m.titre}</th>
-      {/foreach}
+      {if $moments}
+        {foreach from=$moments item=m}
+          <th>{$m.titre}</th>
+        {/foreach}
+      {else}
+        <th>Nombre</th>
+      {/if}
       {if $admin && $money}
         <th>Montant</th>
         <th>Payé</th>
@@ -128,9 +132,13 @@ Ils ont pay
       {/if}
     </td>
     {if $tout}
-      {foreach from=$moments item=i}
-        <td>{$m[$i.item_id]}</td>
-      {/foreach}
+      {if $moments}
+        {foreach from=$moments item=i}
+          <td>{$m[$i.item_id]}</td>
+        {/foreach}
+      {else}
+        <td>{$m[1]}</td>
+      {/if}
       {if $admin && $money}
         <td {if $m.montant > $m.paid}class="erreur"{/if}>{$m.montant}&euro;</td>
         <td>{$m.paid}&euro;</td>
@@ -174,9 +182,13 @@ nombre de participants.
   <input type="hidden" name="item_id" value="{$smarty.request.item_id}" />
   {$evt.titre}: <input name="nb{$smarty.request.item_id}" size="1" value="1" />
   {else}
-  {foreach from=$moments item=m}
-  {$m.titre}: <input name="nb{$m.item_id}" size="1" value="1"/>
-  {/foreach}
+    {if $moments}
+      {foreach from=$moments item=m}
+        {$m.titre}: <input name="nb{$m.item_id}" size="1" value="1"/>
+      {/foreach}
+    {else}
+      Nombre: <input name="nb1" size="1" value="1" />
+    {/if}
   {/if}
   <input type="submit" />
   </p>
diff --git a/templates/xnet/groupe/form_evenement.tpl b/templates/xnet/groupe/form_evenement.tpl
index 4b0f97b..f6f2d3a 100644
--- a/templates/xnet/groupe/form_evenement.tpl
+++ b/templates/xnet/groupe/form_evenement.tpl
@@ -94,6 +94,9 @@
       </td>
       <td>
         <select name="paiement" onchange="document.getElementById('new_pay').style.display=(value &lt; 0?'block':'none')">
+          {if $evt.paiement_id eq -2}
+          <option value='-2'>Paiement en attente de validation</option>
+          {/if}
           <option value=''>Pas de paiement</option>
           <option value='-1'>- Nouveau paiement -</option>
           {html_options options=$paiements selected=$evt.paiement_id}