Merge pull request #402 from redlink-gmbh/TT-161-Relative-End-before-…

…Start-Bug Tt 161 relative end before start bug
MORE-Platform · Feb 5, 2024 · 667ea4d · 667ea4d
2 parents 5cfb7bd + 1389552
commit 667ea4d
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 6 deletions.
diff --git a/src/components/shared/RelativeScheduler.vue b/src/components/shared/RelativeScheduler.vue
@@ -151,7 +151,7 @@
     ) {
       errors.value.push({
         label: 'dtstart',
-        value: t('schedule.relativeSchedule.error.dtstart.addOffset'),
+        value: t('scheduler.dialog.relativeSchedule.error.dtstart.addOffset'),
       });
     }
     if (
@@ -160,7 +160,34 @@
     ) {
       errors.value.push({
         label: 'dtend',
-        value: t('schedule.relativeSchedule.error.dtend.addOffset'),
+        value: t('scheduler.dialog.relativeSchedule.error.dtend.addOffset'),
+      });
+    }
+    if (
+      returnSchedule.value.dtend.offset?.value &&
+      returnSchedule.value.dtstart.offset?.value &&
+      returnSchedule.value.dtstart.offset?.value >
+        returnSchedule.value.dtend.offset?.value
+    ) {
+      errors.value.push({
+        label: 'dtend',
+        value: t(
+          'scheduler.dialog.relativeSchedule.error.dtend.EndBeforeStart'
+        ),
+      });
+    }
+    if (
+      returnSchedule.value.dtstart.time &&
+      returnSchedule.value.dtend.time &&
+      returnSchedule.value.dtstart.offset?.value ===
+        returnSchedule.value.dtend.offset?.value &&
+      returnSchedule.value.dtstart.time >= returnSchedule.value.dtend.time
+    ) {
+      errors.value.push({
+        label: 'dtend',
+        value: t(
+          'scheduler.dialog.relativeSchedule.error.dtend.EndBeforeStart'
+        ),
       });
     }
     if (repeatChecked.value) {
@@ -170,7 +197,7 @@
       ) {
         errors.value.push({
           label: 'rrruleFreq',
-          value: t('schedule.relativeSchedule.error.rrrule.frequency'),
+          value: t('scheduler.dialog.relativeSchedule.error.rrrule.frequency'),
         });
       }
       if (
@@ -179,7 +206,7 @@
       ) {
         errors.value.push({
           label: 'rrruleEndAfter',
-          value: t('schedule.relativeSchedule.error.rrrule.endAfter'),
+          value: t('scheduler.dialog.relativeSchedule.error.rrrule.endAfter'),
         });
       }
       if (frequencyXTimes.value && frequencyXTimes.value <= 0) {

diff --git a/src/i18n/de.json b/src/i18n/de.json
@@ -941,7 +941,8 @@
             "addOffset": "Befülle den Offset des relativen Startzeitraum."
           },
           "dtend": {
-            "addOffset": "Befülle den Offset des relativen Endzeitraum."
+            "addOffset": "Befülle den Offset des relativen Endzeitraum.",
+            "EndBeforeStart": "Bitte setzen Sie den relativen Startzeitpunkt vor dem Endzeitpunkt"
           },
           "rrrule": {
             "frequency": "Fülle die Widerholungsrate ein.",

diff --git a/src/i18n/en.json b/src/i18n/en.json
@@ -944,7 +944,8 @@
             "addOffset": "Fill in the offset of the relative start period."
           },
           "dtend": {
-            "addOffset": "Fill in the offset of the relative end period."
+            "addOffset": "Fill in the offset of the relative end period.",
+            "EndBeforeStart": "Please Set the relative start period before the end period"
           },
           "rrrule": {
             "frequency": "Fill in the repetition rate.",