bfg-common 1.4.260 → 1.4.261

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

@@ -1,3 +1,4 @@
+import { isBefore, startOfDay } from 'date-fns'
 import type {
   UI_I_Localization,
   UI_I_ArbitraryObject,
@@ -83,3 +84,14 @@ export const validateField = (
 
   return ''
 }
+export const validateDate = (
+  localization: UI_I_Localization,
+  date: string
+): string => {
+  const currentDateTime = startOfDay(new Date())
+  const selectedDate = startOfDay(new Date(date)) // Начало дня выбранной даты
+
+  return isBefore(selectedDate, currentDateTime)
+    ? localization.common.theValueLargeThanStartTime
+    : ''
+}

package/components/common/pages/scheduledTasks/modals/common/frequency/on/On.vue

@@ -95,14 +95,18 @@
 </template>
 
 <script lang="ts" setup>
+import { format } from 'date-fns'
 import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
 import {
-  frequencyOnWeeksDaysFunc,
   frequencyOnOrdinalNumberFunc,
+  frequencyOnWeeksDaysFunc,
 } from '~/components/common/pages/scheduledTasks/modals/common/frequency/on/lib/config/options'
-import { validateField } from '~/components/common/pages/scheduledTasks/modals/common/frequency/lib/utils'
+import {
+  validateDate,
+  validateField,
+} from '~/components/common/pages/scheduledTasks/modals/common/frequency/lib/utils'
 
 const props = defineProps<{
   type: string
@@ -110,7 +114,6 @@ const props = defineProps<{
 const model = defineModel<UI_I_ScheduleNewTasksForm>({ required: true })
 
 const localization = computed<UI_I_Localization>(() => useLocal())
-const { $store, $formattedDate, $isDate, $getUnixByDate }: any = useNuxtApp()
 
 const selectedTimeMode = ref<'day' | 'week'>('day')
 
@@ -144,7 +147,9 @@ watch(
 )
 
 const schedulerAtOnceErrorText = computed<string>(() => {
-  return !model.value.frg_on_time ? localization.value.common.fieldRequired : ''
+  return !model.value.frg_on_time
+    ? localization.value.common.fieldRequired
+    : validateDate(localization.value, model.value.frg_on_time)
 })
 watch(
   schedulerAtOnceErrorText,
@@ -154,23 +159,13 @@ watch(
   { immediate: true }
 )
 
-// const calendarDefaultDate = ref<number>(new Date().getTime())
-// const currentDateLocal = ref<string>('')
-
-// const language = computed<string>(() => $store.getters['main/getInterfaceLang'])
-// const onUpdateDateTo = (val: number): void => {
-//   if (!val) return
-//
-//   model.value.frg_on_time = val // milliseconds
-//
-//   currentDateLocal.value = $formattedDate(new Date(val), 'MM.dd.yyyy, hh:mm')
-// }
-
-// watch(currentDateLocal, (newValue) => {
-//   $isDate(newValue) &&
-//     (calendarDefaultDate.value = model.value.frg_on_time =
-//       $getUnixByDate(newValue))
-// })
+onMounted(() => {
+  props.type === 'once' && setDefaultDateTime()
+})
+const setDefaultDateTime = () => {
+  const currentDateTime = new Date()
+  model.value.frg_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.260",
+  "version": "1.4.261",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",