Fix end time and date validations

OrifInformatique · May 6, 2024 · b6bdd02 · b6bdd02
1 parent b41008e
commit b6bdd02
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 5 deletions.
diff --git a/orif/timbreuse/Language/fr/tim_lang.php b/orif/timbreuse/Language/fr/tim_lang.php
@@ -192,4 +192,6 @@
     'btn_hard_delete_user' => 'Supprimer définitivement cet utilisateur',
     'siteAccountNotLinked' => 'Ce compte utilisateur de la timbreuse n\'est pas lié à un compte de l\'application web.',
     'fillFieldsToCreateAccount' => 'Complétez les champs ci-dessous et enregistrez pour lui créer un compte dans l\'application.',
+    'msg_err_end_time_greater_than' => 'L\'heure de fin doit être supérieur à l\'heure de début.',
+    'msg_err_end_date_greater_than' => 'La date de fin doit être supérieur à la date de début.',
 ];
diff --git a/orif/timbreuse/Models/EventPlanningsModel.php b/orif/timbreuse/Models/EventPlanningsModel.php
@@ -71,7 +71,7 @@ public function __construct(ConnectionInterface &$db = null, ValidationInterface
             'end_time' =>
             [
                 'label' => lang('tim_lang.field_event_end_time'),
-                'rules' => 'required|valid_date'
+                'rules' => 'required|valid_date|cb_date_time_greater_than[start_time]'
             ],
             'is_work_time' =>
             [
@@ -80,7 +80,11 @@ public function __construct(ConnectionInterface &$db = null, ValidationInterface
             ],
         ];
 
-        $this->validationMessages = [];
+        $this->validationMessages = [
+            'end_time' => [
+                'cb_date_time_greater_than' => lang('tim_lang.msg_err_end_time_greater_than')
+            ]
+        ];
 
         parent::__construct($db, $validation);
     }

diff --git a/orif/timbreuse/Models/EventSeriesModel.php b/orif/timbreuse/Models/EventSeriesModel.php
@@ -43,7 +43,7 @@ public function __construct(ConnectionInterface &$db = null, ValidationInterface
             'end_date' =>
             [
                 'label' => lang('tim_lang.field_end_date'),
-                'rules' => 'required|valid_date'
+                'rules' => 'required|valid_date|cb_date_time_greater_than[start_date]'
             ],
             'recurrence_frequency' =>
             [
@@ -62,7 +62,11 @@ public function __construct(ConnectionInterface &$db = null, ValidationInterface
             ],
         ];
 
-        $this->validationMessages = [];
+        $this->validationMessages = [
+            'end_date' => [
+                'cb_date_time_greater_than' => lang('tim_lang.msg_err_end_date_greater_than')
+            ]
+        ];
 
         parent::__construct($db, $validation);
     }

diff --git a/orif/timbreuse/Validation/TimbreuseRules.php b/orif/timbreuse/Validation/TimbreuseRules.php
@@ -136,5 +136,19 @@ public function cb_valid_array($array) : bool {
     public function cb_array_not_empty($array) : bool {
         return count($array) > 0;
     }
+
+    /**
+     * Compares two date-time values to check if the end date-time is greater than the start date-time.
+     *
+     * @param  mixed $endTime
+     * @param  mixed $fieldToCompare
+     * @param  mixed $values
+     * @return bool
+     */
+    public function cb_date_time_greater_than($end, $fieldToCompare, $values) : bool {
+        $start = strtotime($values[$fieldToCompare]);
+        $end = strtotime($end);
 
+        return $start < $end;
+    }
 }
diff --git a/orif/timbreuse/Views/eventPlannings/group/save_form.php b/orif/timbreuse/Views/eventPlannings/group/save_form.php
@@ -30,6 +30,7 @@
                 <?= form_input('', $userGroup['name'] ?? '', [
                     'class' => 'form-control', 'id' => 'linked_user_group', 'disabled' => ''
                 ]); ?>
+                <span class="text-danger"><?= isset($errors['fk_user_group_id']) ? esc($errors['fk_user_group_id']) : ''; ?></span>
                 <?= form_submit('select_user_group', lang('tim_lang.select_user_group'), ['class' => 'mt-3 w-100 btn btn-secondary']); ?>
             </div>
         </div>

diff --git a/orif/timbreuse/Views/eventPlannings/personal/save_form.php b/orif/timbreuse/Views/eventPlannings/personal/save_form.php
@@ -34,7 +34,7 @@
                 <?= form_input('', !is_null($user) ? "{$user['name']} {$user['surname']}" : '', [
                     'class' => 'form-control', 'id' => 'linked_user', 'disabled' => ''
                 ]); ?>
-                <span class="text-danger"><?= isset($errors['end_time']) ? esc($errors['end_time']) : ''; ?></span>
+                <span class="text-danger"><?= isset($errors['fk_user_sync_id']) ? esc($errors['fk_user_sync_id']) : ''; ?></span>
                 <?php if (url_is('*admin*')) : ?>
                     <?= form_submit('select_linked_user', lang('tim_lang.btn_select_linked_user'), ['class' => 'mt-3 w-100 btn btn-secondary']); ?>
                 <?php endif; ?>