Fixed issue #15195: Expiration date can be set before start date (#2551)

Co-authored-by: encuestabizdevgit <devgit@encuesta.biz>

application/controllers/admin/surveyadmin.php

@@ -2096,6 +2096,7 @@ public function getUrlParamsJSON($iSurveyID)
      */
     private function _registerScriptFiles()
     {
+        App()->getClientScript()->registerScriptFile(App()->getConfig('adminscripts') . 'surveysettings.js', LSYii_ClientScript::POS_BEGIN);
         App()->getClientScript()->registerPackage('jquery-json');
         App()->getClientScript()->registerPackage('bootstrap-switch');
 

application/models/Survey.php

@@ -497,7 +497,8 @@ public function rules()
             array('running', 'safe', 'on'=>'search'),
             array('expires', 'date','format' => ['yyyy-M-d H:m:s.???','yyyy-M-d H:m:s','yyyy-M-d H:m'],'allowEmpty' => true),
             array('startdate', 'date','format' => ['yyyy-M-d H:m:s.???','yyyy-M-d H:m:s','yyyy-M-d H:m'],'allowEmpty' => true),
-            array('datecreated', 'date','format' => ['yyyy-M-d H:m:s.???','yyyy-M-d H:m:s','yyyy-M-d H:m'],'allowEmpty' => true)
+            array('datecreated', 'date','format' => ['yyyy-M-d H:m:s.???','yyyy-M-d H:m:s','yyyy-M-d H:m'],'allowEmpty' => true),
+            array('expires', 'checkExpireAfterStart'),
         );
     }
 
@@ -1999,4 +2000,16 @@ public function getOwnerUserName()
         return isset($this->owner["users_name"]) ? $this->owner["users_name"] : "";
     }
 
+    /**
+     * Validates the Expiration Date is not lower than the Start Date
+     */
+    public function checkExpireAfterStart($attributes, $params)
+    {
+        if(empty($this->startdate) || empty($this->expires)) {
+            return true;
+        }
+        if ($this->expires < $this->startdate) {
+            $this->addError('expires', gT("Expiration date can't be lower than the start date", 'unescaped'));
+        }
+    }
 }

application/views/admin/survey/editLocalSettings_main_view.php

@@ -69,6 +69,10 @@
 
 $('#".$entryData['name']."').on('submit.editLocalsettings', function(e){
     e.preventDefault();
+    if (!validateSettingsForm($(this))) {
+        $('#in_survey_common').trigger('lsStopLoading');  // Remove the 'loading' state
+        return false;
+    }
     var data = $(this).serializeArray();
     var uri = $(this).attr('action');
     $.ajax({

application/views/admin/survey/subview/accordion/_publication_panel.php

@@ -17,6 +17,7 @@
     var sAdminEmailAddressNeeded = '".gT("If you are using token functions or notifications emails you need to set an administrator email address.",'js')."'
     var sURLParameters = '';
     var sAddParam = '';
+    var expirationLowerThanStartError = '" . gT("Expiration date can't be lower than the start date") . "';
 ", LSYii_ClientScript::POS_BEGIN);
 ?>
 <!-- Publication panel -->

assets/scripts/admin/surveysettings.js

@@ -0,0 +1,33 @@
+/**
+ * Validate settings form depending on form name
+ */
+ function validateSettingsForm($form) {
+    switch ($form.attr('id')) {
+        case 'publication':
+            return validateEndDateHigherThanStart(
+                $('#startdate_datetimepicker').data('DateTimePicker'),
+                $('#expires_datetimepicker').data('DateTimePicker'),
+                expirationLowerThanStartError
+            );
+        default:
+            return true;
+    }
+}
+
+/**
+ * Validates that an end date is not lower than a start date
+ */
+function validateEndDateHigherThanStart(startDatePicker, endDatePicker, errorMessage) {
+    if (!startDatePicker || !startDatePicker.date()) {
+        return true;
+    }
+    if (!endDatePicker || !endDatePicker.date()) {
+        return true;
+    }
+    const difference = endDatePicker.date().diff(startDatePicker.date());
+    if (difference >= 0) {
+        return true;
+    }
+    LS.LsGlobalNotifier.create(errorMessage, 'well-lg bg-danger');
+    return false;
+}