bfg-common 1.4.264 → 1.4.266

package/components/common/pages/scheduledTasks/modals/common/frequency/end/End.vue

@@ -35,6 +35,7 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
 import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
+import { validateDate } from '~/components/common/pages/scheduledTasks/modals/common/frequency/lib/utils'
 import { frequencyEndTimeFunc } from '~/components/common/pages/scheduledTasks/modals/common/frequency/end/lib/config/endOptions'
 
 const modelFrequencyLocal = defineModel<UI_I_ScheduleNewTasksForm>({
@@ -51,9 +52,10 @@ const frequencyEndTimeOptions = computed<UI_I_SelectInputItem[]>(() =>
 const selectedFrequencyEndMode = ref<'never' | 'on'>('never')
 
 const schedulerEndDateErrorText = computed<string>(() => {
-  return !modelFrequencyLocal.value.frg_end_time
+  const { frg_end_time, frg_start_on_time } = modelFrequencyLocal.value
+  return !frg_end_time
     ? localization.value.common.fieldRequired
-    : ''
+    : validateDate(localization.value, frg_end_time, frg_start_on_time)
 })
 watch(
   [schedulerEndDateErrorText, selectedFrequencyEndMode],

package/components/common/pages/scheduledTasks/modals/common/frequency/lib/utils.ts

@@ -87,14 +87,26 @@ export const validateField = (
 export const validateDate = (
   localization: UI_I_Localization,
   date: string,
-  _predefinedDate?: string
+  predefinedDate?: string
 ): string => {
   const currentDateTime = new Date()
   const thresholdDate = subMinutes(currentDateTime, 4) // Используем date-fns для вычитания 4 минут
 
   const selectedDate = parseISO(date) // Начало дня выбранной даты theValueLargeThanStartTime
 
-  return isBefore(selectedDate, thresholdDate)
-    ? localization.common.theValueTooSmall
-    : ''
+  const comparisonDate = predefinedDate
+    ? parseISO(predefinedDate)
+    : thresholdDate
+
+  if (predefinedDate) {
+    if (isBefore(comparisonDate, subMinutes(selectedDate, 1))) {
+      return localization.common.theValueLargeThanStartTime
+    }
+  }
+
+  if (isBefore(selectedDate, comparisonDate)) {
+    return localization.common.theValueTooSmall
+  }
+
+  return ''
 }

package/components/common/pages/scheduledTasks/modals/common/frequency/startOn/StartOn.vue

@@ -24,8 +24,10 @@
 </template>
 
 <script lang="ts" setup>
+import { format } from 'date-fns'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
+import { validateDate } from '~/components/common/pages/scheduledTasks/modals/common/frequency/lib/utils'
 
 const modelFrequencyLocal = defineModel<UI_I_ScheduleNewTasksForm>({
   required: true,
@@ -37,7 +39,10 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 const schedulerStartOnErrorText = computed<string>(() => {
   return !modelFrequencyLocal.value.frg_start_on_time
     ? localization.value.common.fieldRequired
-    : ''
+    : validateDate(
+        localization.value,
+        modelFrequencyLocal.value.frg_start_on_time
+      )
 })
 watch(
   schedulerStartOnErrorText,
@@ -47,19 +52,16 @@ watch(
   { immediate: true }
 )
 
-// const onUpdateDateTo = (val: number): void => {
-//   if (!val) return
-//
-//   modelTimeLocal.value = val // milliseconds
-//
-//   currentDateLocal.value = $formattedDate(new Date(val), 'MM.dd.yyyy, hh:mm')
-// }
-//
-// watch(currentDateLocal, (newValue) => {
-//   $isDate(newValue) &&
-//     (calendarDefaultDate.value = modelTimeLocal.value =
-//       $getUnixByDate(newValue))
-// })
+onMounted(() => {
+  setDefaultDateTime()
+})
+const setDefaultDateTime = () => {
+  const currentDateTime = new Date()
+  modelFrequencyLocal.value.frg_start_on_time = format(
+    currentDateTime,
+    "yyyy-MM-dd'T'HH:mm"
+  )
+}
 </script>
 
 <style lang="scss" scoped>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.4.264",
+  "version": "1.4.266",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",