ルールの修正

traPtitech · Mar 1, 2024 · 760599a · 760599a
1 parent c7dec2b
commit 760599a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/src/components/event/EventFormTimeAndPlaceInstant.vue b/src/components/event/EventFormTimeAndPlaceInstant.vue
@@ -10,29 +10,35 @@
       v-model="dateStartMem"
       filled
       label="開催日"
-      :rules="$rules.eventDate"
+      :rules="
+        $rules.eventDate &&
+        $rules.eventTimeInstant(timeStartInput, timeEndInput)
+      "
       type="date"
       @blur="setDefaultDateEnd"
     />
     <v-text-field
       v-model="timeStartMem"
       filled
       label="開始時刻"
-      :rules="$rules.eventTimeStartInstant(timeEndMem)"
+      :rules="$rules.eventTimeInstant(timeStartInput, timeEndInput)"
       type="time"
     />
     <v-text-field
       v-model="dateEndMem"
       filled
       label="終了日"
-      :rules="$rules.eventDate"
+      :rules="
+        $rules.eventDate &&
+        $rules.eventTimeInstant(timeStartInput, timeEndInput)
+      "
       type="date"
     />
     <v-text-field
       v-model="timeEndMem"
       filled
       label="終了時刻"
-      :rules="$rules.eventTimeEndInstant(timeStartMem)"
+      :rules="$rules.eventTimeInstant(timeStartInput, timeEndInput)"
       type="time"
     />
   </v-form>

diff --git a/src/workers/rules.ts b/src/workers/rules.ts
@@ -53,14 +53,12 @@ const rules = {
       (v >= roomStartTime! && v <= roomEndTime!) ||
       '進捗部屋の利用可能な時間を選択してください',
   ],
-  eventTimeStartInstant: (endTime: string) => [
-    (v: string) => !!v || '開始時刻は必須です',
-    (v: string) =>
-      !endTime || v < endTime || '開始時刻は終了時刻よりも早くしてください',
-  ],
-  eventTimeEndInstant: (startTime: string) => [
-    (v: string) => !!v || '終了時刻は必須です',
-    (v: string) => v > startTime || '終了時刻は開始時刻よりも遅くしてください',
+  eventTimeInstant: (startTime: string, endTime: string) => [
+    () =>
+      !startTime ||
+      !endTime ||
+      startTime < endTime ||
+      '終了日時が開始日時よりも遅くなるようにしてください',
   ],
 }