Fix event type dropdown on create / update personal and group, also w…

…ip eventSerie
OrifInformatique · Mar 13, 2024 · 14eef80 · 14eef80
1 parent 4984c0d
commit 14eef80
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/orif/timbreuse/Controllers/EventPlannings.php b/orif/timbreuse/Controllers/EventPlannings.php
@@ -134,7 +134,7 @@ public function updateGroup(int $id, ?int $userGroupId = 0) : string|RedirectRes
             return redirect()->to(base_url($_SESSION['_ci_previous_url']));
         }
         $userGroupId = $userGroupId !== 0 ?: $eventPlanning['fk_user_group_id'];
-        $eventTypes = $this->eventTypesModel->where('is_personal_event_type', true)->findAll();
+        $eventTypes = $this->eventTypesModel->where('is_group_event_type', true)->findAll();
 
         $userGroup = $this->userGroupsModel->find($userGroupId);
 

diff --git a/orif/timbreuse/Controllers/EventSeries.php b/orif/timbreuse/Controllers/EventSeries.php
@@ -9,6 +9,7 @@
 use DateInterval;
 use DateTime;
 use Psr\Log\LoggerInterface;
+use Timbreuse\Models\EventPlanningsModel;
 use Timbreuse\Models\EventSeriesModel;
 
 class EventSeries extends BaseController
@@ -45,7 +46,7 @@ public function getCreateSeriesHTML() : string {
         $data = [
             'daysOfWeek' => $this->getDaysOfWeek(),
             'eventSerie' => null,
-            'recurrenceFrequencies' => $this->getEnumValues(),
+            'recurrenceFrequencies' => $this->getEnumValues()
         ];
 
         return json_encode(view('\Timbreuse\Views\eventSeries\create_series.php', $data));
@@ -70,15 +71,26 @@ private function getEnumValues() : array|bool {
     }
 
     public function create(array $eventSerie, array $eventPlanning) {
-        $model = model(EventSeriesModel::class);
+        $errors = [];
 
-        $id = $model->insert($eventSerie, true);
+        $eventSeriesModel = model(EventSeriesModel::class);
+        $eventPlanningModel = model(EventPlanningsModel::class);
 
-        $newEventSerie = $model->find($id);
+        $isEventSerieValid = $eventSeriesModel->validate($eventSerie);
+        $iseventPlanningValid = $eventPlanningModel->validate($eventPlanning);
 
-        $this->createEventPlannings($newEventSerie);
+        if (!$isEventSerieValid || !$iseventPlanningValid) {
+            $errors += $eventSeriesModel->errors();
+            $errors += $eventPlanningModel->errors();
+        } else {
+            $id = $eventSeriesModel->insert($eventSerie, true);
+
+            $newEventSerie = $eventSeriesModel->find($id);
+
+            $this->createEventPlannings($newEventSerie);
+        }
 
-        return $model->errors();
+        return $errors;
     }
 
     private function createEventPlannings(array $eventSerie) {

diff --git a/orif/timbreuse/Views/eventPlannings/group/save_form.php b/orif/timbreuse/Views/eventPlannings/group/save_form.php
@@ -17,7 +17,7 @@
         <div class="col-sm-6">
             <div class="form-group">
                 <?= form_label(lang('tim_lang.event_type'), 'event_type', ['class' => 'form-label']); ?>
-                <?= form_dropdown('fk_event_type_id', $eventTypes, $sessionEventPlanning['fk_event_type_id'] ?? [], [
+                <?= form_dropdown('fk_event_type_id', $eventTypes, $sessionEventPlanning['fk_event_type_id'] ?? $eventPlanning['fk_event_type_id'] ?? set_value('fk_event_type_id'), [
                     'class' => 'form-control', 'id' => 'event_type'
                 ]); ?>
                 <span class="text-danger"><?= isset($errors['fk_event_type_id']) ? esc($errors['fk_event_type_id']) : ''; ?></span>

diff --git a/orif/timbreuse/Views/eventPlannings/personal/save_form.php b/orif/timbreuse/Views/eventPlannings/personal/save_form.php
@@ -21,7 +21,7 @@
         <div class="col-sm-6">
             <div class="form-group">
                 <?= form_label(lang('tim_lang.event_type'), 'event_type', ['class' => 'form-label']); ?>
-                <?= form_dropdown('fk_event_type_id', $eventTypes, $sessionEventPlanning['fk_event_type_id'] ?? [], [
+                <?= form_dropdown('fk_event_type_id', $eventTypes, $sessionEventPlanning['fk_event_type_id'] ?? $eventPlanning['fk_event_type_id'] ?? set_value('fk_event_type_id'), [
                     'class' => 'form-control', 'id' => 'event_type'
                 ]); ?>
                 <span class="text-danger"><?= isset($errors['fk_event_type_id']) ? esc($errors['fk_event_type_id']) : ''; ?></span>