bfg-common 1.4.256 → 1.4.258

package/components/common/pages/scheduledTasks/modals/common/frequency/Frequency.vue

@@ -24,7 +24,7 @@
 
     <common-pages-scheduled-tasks-modals-common-frequency-end
       v-if="showTimeInterval"
-      v-model="model.frg_end_time"
+      v-model="model"
     />
   </div>
 </template>

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

@@ -9,23 +9,23 @@
       :class="selectedFrequencyEndMode === 'on' && 'enabled'"
     >
       <template #options>
-        <div
+        <label
           v-if="selectedFrequencyEndMode === 'on'"
-          class="datepicker__input-inner"
+          for="frequency-end-date"
+          class="tooltip tooltip-validation tooltip-xs tooltip-top-left frequency-end-date"
+          :class="schedulerEndDateErrorText && 'invalid'"
         >
           <input
-            id="current-date-to-input"
-            v-model.lazy="currentDateLocal"
-            data-id="current-date-to-input"
-            placeholder="mm.dd.yyyy, --:--"
-            type="text"
+            id="frequency-end-date"
+            v-model.lazy="modelFrequencyLocal.frg_end_time"
+            data-id="frequency-end-date-input"
+            type="datetime-local"
           />
-          <atoms-datepicker
-            v-model="calendarDefaultDate"
-            :lang="language"
-            @update="onUpdateDateTo"
-          />
-        </div>
+
+          <span class="tooltip-content">
+            {{ schedulerEndDateErrorText }}
+          </span>
+        </label>
       </template>
     </common-select-input>
   </div>
@@ -34,12 +34,15 @@
 <script lang="ts" setup>
 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 { frequencyEndTimeFunc } from '~/components/common/pages/scheduledTasks/modals/common/frequency/end/lib/config/endOptions'
 
-const modelTimeLocal = defineModel<number | null>({ required: true })
+const modelFrequencyLocal = defineModel<UI_I_ScheduleNewTasksForm>({
+  required: true,
+})
 
 const localization = computed<UI_I_Localization>(() => useLocal())
-const { $store, $formattedDate, $isDate, $getUnixByDate }: any = useNuxtApp()
+// const { $store, $formattedDate, $isDate, $getUnixByDate }: any = useNuxtApp()
 
 const frequencyEndTimeOptions = computed<UI_I_SelectInputItem[]>(() =>
   frequencyEndTimeFunc(localization.value)
@@ -47,26 +50,18 @@ const frequencyEndTimeOptions = computed<UI_I_SelectInputItem[]>(() =>
 
 const selectedFrequencyEndMode = ref<'never' | 'on'>('never')
 
-const calendarDefaultDate = ref<number>(new Date().getTime())
-const currentDateLocal = ref<string>('')
-
-const language = computed<string>(() => $store.getters['main/getInterfaceLang'])
-const onUpdateDateTo = (milliseconds: number): void => {
-  if (!milliseconds) return
-
-  modelTimeLocal.value = milliseconds
-
-  currentDateLocal.value = $formattedDate(
-    new Date(milliseconds),
-    'MM.dd.yyyy, hh:mm'
-  )
-}
-
-watch(currentDateLocal, (newValue) => {
-  $isDate(newValue) &&
-    (calendarDefaultDate.value = modelTimeLocal.value =
-      $getUnixByDate(newValue))
+const schedulerEndDateErrorText = computed<string>(() => {
+  return !modelFrequencyLocal.value.frg_end_time
+    ? localization.value.common.fieldRequired
+    : ''
 })
+watch(
+  schedulerEndDateErrorText,
+  (newValue: string) => {
+    modelFrequencyLocal.value.isValid = !!newValue
+  },
+  { immediate: true }
+)
 </script>
 
 <style lang="scss" scoped>
@@ -92,11 +87,13 @@ watch(currentDateLocal, (newValue) => {
       max-width: 80px !important;
     }
   }
-}
-.datepicker {
-  &__input-inner {
-    @include flex($align: center);
+  .frequency-end-date {
     margin-left: 15px;
   }
 }
+.tooltip {
+  & > .tooltip-content {
+    width: 200px;
+  }
+}
 </style>

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

@@ -27,7 +27,7 @@
         <label
           for="monthly-by-day-field"
           class="tooltip tooltip-validation tooltip-xs tooltip-top-left"
-          :class="timeIntervalErrorText && 'invalid'"
+          :class="schedulerOnDayErrorText && 'invalid'"
         >
           <input
             id="monthly-by-day-field"
@@ -41,7 +41,7 @@
           />
 
           <span class="tooltip-content">
-            {{ timeIntervalErrorText }}
+            {{ schedulerOnDayErrorText }}
           </span>
         </label>
       </div>
@@ -129,12 +129,19 @@ const isInitTimeIntervalValidation = ref<boolean>(false)
 const onInitTimeIntervalValidation = (): void => {
   isInitTimeIntervalValidation.value = true
 }
-const timeIntervalErrorText = computed<string>(() => {
+const schedulerOnDayErrorText = computed<string>(() => {
   if (!isInitTimeIntervalValidation.value || isDisabledMonthlyDayField.value)
     return ''
 
-  return validateField(localization.value, model.value.frg_monthly_day)
+  return validateField(localization.value, model.value.frg_monthly_day, true)
 })
+watch(
+  schedulerOnDayErrorText,
+  (newValue: string) => {
+    model.value.isValid = !!newValue
+  },
+  { immediate: true }
+)
 
 const schedulerAtOnceErrorText = computed<string>(() => {
   return !model.value.frg_on_time ? localization.value.common.fieldRequired : ''

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

@@ -76,4 +76,9 @@ watch(
     }
   }
 }
+.tooltip {
+  & > .tooltip-content {
+    width: 200px;
+  }
+}
 </style>

package/package.json

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