Skip to content
This repository has been archived by the owner on Aug 20, 2024. It is now read-only.

Commit

Permalink
Completed ghFixed the Bug where a relative end could be set before th…
Browse files Browse the repository at this point in the history
…e relative start. Now it displays an error message. Additionally, the error messages for the relative schedule have been fixed and they display properly now.
  • Loading branch information
AdPat-Redlink committed Feb 2, 2024
1 parent 87703df commit 63a73e8
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 6 deletions.
33 changes: 29 additions & 4 deletions src/components/shared/RelativeScheduler.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
} from '../../generated-sources/openapi';
import { useI18n } from 'vue-i18n';
import { MoreTableChoice } from '../../models/MoreTableModel';
import {expectTypeOf} from "vitest";

Check warning on line 16 in src/components/shared/RelativeScheduler.vue

View workflow job for this annotation

GitHub Actions / Run Tests

Replace `expectTypeOf}·from·"vitest"` with `·expectTypeOf·}·from·'vitest'`

Check warning on line 16 in src/components/shared/RelativeScheduler.vue

View workflow job for this annotation

GitHub Actions / Run Tests

'expectTypeOf' is defined but never used
const { t } = useI18n();
const dialogRef: any = inject('dialogRef');
Expand Down Expand Up @@ -151,7 +152,7 @@
) {
errors.value.push({
label: 'dtstart',
value: t('schedule.relativeSchedule.error.dtstart.addOffset'),
value: t('scheduler.dialog.relativeSchedule.error.dtstart.addOffset'),
});
}
if (
Expand All @@ -160,7 +161,31 @@
) {
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

Check warning on line 171 in src/components/shared/RelativeScheduler.vue

View workflow job for this annotation

GitHub Actions / Run Tests

Insert `··`
) {
errors.value.push({
label: 'dtend',
value: t('scheduler.dialog.relativeSchedule.error.dtend.EndBeforeStart'),

Check warning on line 175 in src/components/shared/RelativeScheduler.vue

View workflow job for this annotation

GitHub Actions / Run Tests

Replace `'scheduler.dialog.relativeSchedule.error.dtend.EndBeforeStart'` with `⏎··········'scheduler.dialog.relativeSchedule.error.dtend.EndBeforeStart'⏎········`
});
}
if (
returnSchedule.value.dtstart.time &&
returnSchedule.value.dtend.time &&
(returnSchedule.value.dtstart.offset?.value ==

Check warning on line 181 in src/components/shared/RelativeScheduler.vue

View workflow job for this annotation

GitHub Actions / Run Tests

Delete `(`

Check failure on line 181 in src/components/shared/RelativeScheduler.vue

View workflow job for this annotation

GitHub Actions / Run Tests

Expected '===' and instead saw '=='
returnSchedule.value.dtend.offset?.value) &&

Check warning on line 182 in src/components/shared/RelativeScheduler.vue

View workflow job for this annotation

GitHub Actions / Run Tests

Delete `)`
returnSchedule.value.dtstart.time >=

Check warning on line 183 in src/components/shared/RelativeScheduler.vue

View workflow job for this annotation

GitHub Actions / Run Tests

Delete `⏎·····`
returnSchedule.value.dtend.time
) {
errors.value.push({
label: 'dtend',
value: t('scheduler.dialog.relativeSchedule.error.dtend.EndBeforeStart'),

Check warning on line 188 in src/components/shared/RelativeScheduler.vue

View workflow job for this annotation

GitHub Actions / Run Tests

Replace `'scheduler.dialog.relativeSchedule.error.dtend.EndBeforeStart'` with `⏎··········'scheduler.dialog.relativeSchedule.error.dtend.EndBeforeStart'⏎········`
});
}
if (repeatChecked.value) {
Expand All @@ -170,7 +195,7 @@
) {
errors.value.push({
label: 'rrruleFreq',
value: t('schedule.relativeSchedule.error.rrrule.frequency'),
value: t('scheduler.dialog.relativeSchedule.error.rrrule.frequency'),
});
}
if (
Expand All @@ -179,7 +204,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) {
Expand Down
3 changes: 2 additions & 1 deletion src/i18n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down
3 changes: 2 additions & 1 deletion src/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down

0 comments on commit 63a73e8

Please # to comment.