Changeset 113968 in spip-zone

Timestamp:

Feb 19, 2019, 4:22:06 PM (10 months ago)

Author:

abelass@…

Message:

v1.30.0 nouvelle référence unique

Location:

_plugins_/reservation_evenement/branches/v1

Files:

• . (modified) (1 prop)
• inc/reservation_enregistrer.php (modified) (4 diffs)
• inc/reservation_reference.php (modified) (1 diff)
• paquet.xml (modified) (1 diff)

_plugins_/reservation_evenement/branches/v1/inc/reservation_enregistrer.php

@@ -9 +9 @@
         include_spip('inc/config');
         include_spip('inc/session');
+        include_spip('action/editer_reservation');
 
         $config = lire_config('reservation_evenement');
@@ -18 +19 @@
 
         // Créer la réservation
-        $action = charger_fonction('editer_objet', 'action');
+        $id_reservation = reservation_inserer();
 
-        // La référence
+
+
+        // Génération de la référence.
         $fonction_reference = charger_fonction('reservation_reference', 'inc/');
+        $reference = $fonction_reference($id_reservation);
 
+        // Ajouter à l'environnement pour l'actualisation par la suite.
+        set_request('reference', $reference);
         set_request('statut', $statut);
-        $reference = $fonction_reference($id_auteur);
-        set_request('reference', $reference);
+
 
         if (_request('enregistrer')) {
@@ -58 +63 @@
                         }
                 }
+
                 // mettre les valeurs dans la session pour garder les éventuelles modifications
                 session_set('nom', _request('nom'));
@@ -73 +79 @@
         }
 
-        $id_reservation = $action('new', 'reservation');
+        // On actualise la réservation avec les données collectés.
+        $action = charger_fonction('editer_objet', 'action');
+        $reservation = $action($id_reservation, 'reservation');
 
         // On ajoute l'id à la session
-        $id_reservation = $id_reservation[0];
+
         if (!_request('id_reservation_source'))
                 session_set('id_reservation', $id_reservation);

_plugins_/reservation_evenement/branches/v1/inc/reservation_reference.php

@@ -4 +4 @@
 if (!defined('_ECRIRE_INC_VERSION')) return;
 
-function inc_reservation_reference_dist($id_auteur=0){
-        return time();
+function inc_reservation_reference_dist($id_reservation){
+        if ($date = sql_getfetsel('date', 'spip_reservations', 'id_reservation=' . intval($id_reservation))) {
+                $t = strtotime($date);
+        }
+        else {
+                $t = $_SERVER['REQUEST_TIME'];
+        }
+
+        // format YYYYMMDDNNNNNN
+        $reference = date('Ymd', $t) . str_pad(intval($id_reservation), 6, '0', STR_PAD_LEFT);
+
+        return $reference;
 }
-
-?>

_plugins_/reservation_evenement/branches/v1/paquet.xml

@@ -2 +2 @@
         prefix="reservation_evenement"
         categorie="date"
-        version="1.29.10"
+        version="1.30.0"
         etat="stable"
         compatibilite="[3.0.16;3.2.*]"