bfg-common 1.4.719 → 1.4.720

package/components/common/monitor/overview/filters/customIntervalModal/CustomIntervalModal.vue

@@ -1,242 +1,240 @@
-<template>
-  <atoms-modal
-    width="580px"
-    class="add-permission"
-    :show="true"
-    :title="titleIntervalModal"
-    :second-title="selectedItem"
-    test-id="overview-custom-interval-modal"
-    @hide="onHide"
-    @submit="onSubmit"
-  >
-    <template #modalBody>
-      <atoms-alert
-        v-show="alertShow"
-        status="alert-danger"
-        :items="alertItems"
-        test-id="overview-alert"
-        @remove="alertShow = false"
-      />
-
-      <table>
-        <tbody>
-          <tr>
-            <td class="text-right">
-              <label class="custom-time-label">
-                <span class="custom-time-label-text text-capitalize">
-                  {{ localization.common.from }}:
-                </span>
-              </label>
-            </td>
-            <td>
-              <div class="flex-align-center input-row-container">
-                <input
-                  id="current-date-from"
-                  v-model.lazy="currentDateFrom"
-                  data-id="current-date-from-input"
-                  type="text"
-                  class="chart-option-setting-row custom-time-input first-from"
-                />
-                <div class="section-datepicker">
-                  <atoms-datepicker
-                    v-model="dateFrom"
-                    :lang="props.currentLang"
-                    class="chart-option-setting-row custom-time-input"
-                    test-id="overview-first-date-datepicker"
-                    @update="onUpdateDateFrom"
-                  />
-                </div>
-                <input
-                  id="current-time-from"
-                  v-model="currentTimeFrom"
-                  data-id="current-time-from-input"
-                  type="text"
-                  class="chart-option-setting-row custom-time-input"
-                />
-              </div>
-            </td>
-          </tr>
-          <tr>
-            <td class="text-right">
-              <label class="custom-time-label">
-                <span class="custom-time-label-text text-capitalize">
-                  {{ localization.common.to }}:
-                </span>
-              </label>
-            </td>
-            <td>
-              <div class="flex-align-center input-row-container">
-                <input
-                  id="current-date-to"
-                  v-model.lazy="currentDateTo"
-                  data-id="current-date-to-input"
-                  type="text"
-                  class="chart-option-setting-row custom-time-input first-from"
-                />
-                <div class="section-datepicker">
-                  <atoms-datepicker
-                    v-model="dateTo"
-                    :lang="props.currentLang"
-                    class="chart-option-setting-row custom-time-input"
-                    test-id="overview-first-date-to-datepicker"
-                    @update="onUpdateDateTo"
-                  />
-                </div>
-                <input
-                  id="current-time-to"
-                  v-model="currentTimeTo"
-                  data-id="current-time-to-input"
-                  type="text"
-                  class="chart-option-setting-row custom-time-input"
-                />
-              </div>
-            </td>
-          </tr>
-          <tr>
-            <td></td>
-            <td class="text-format-date">
-              (date and time are in ISO 8601 format)
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </template>
-  </atoms-modal>
-</template>
-
-<script setup lang="ts">
-import { format } from 'date-fns'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import { checkDateFunc } from '~/components/common/monitor/overview/filters/customIntervalModal/lib/config/dateChecker'
-
-const props = defineProps<{
-  formatDate: string
-  selectedPeriods: number[]
-  currentLang: string
-  validDateEnd: number
-}>()
-
-const emits = defineEmits<{
-  (event: 'hide'): void
-  (event: 'submit', value: number[]): void
-}>()
-
-const { $formattedDate, $formattedTime, $isDate, $getUnixByDate } = useNuxtApp()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const titleIntervalModal = ref<string>(
-  `${localization.value.common.timeRange}:`
-)
-
-const selectedItem = ref<string>('')
-
-const onHide = (): void => {
-  getCurrentTime()
-  emits('hide')
-}
-
-const yesterday = new Date().setDate(new Date().getDate() - 1)
-const dateFrom = ref<number>(yesterday)
-const dateTo = ref<number>(new Date().getTime())
-
-const currentDateFrom = ref<string>('')
-const currentDateTo = ref<string>('')
-const currentTimeFrom = ref<string>('')
-const currentTimeTo = ref<string>('')
-
-const getCurrentTime = (): void => {
-  if (!props.selectedPeriods.length) {
-    currentDateFrom.value = $formattedDate(yesterday, props.formatDate)
-    currentDateTo.value = $formattedDate(props.validDateEnd, props.formatDate)
-
-    currentTimeFrom.value = format(new Date(), 'H:mm:ss')
-    currentTimeTo.value = format(props.validDateEnd, 'H:mm:ss')
-
-    return
-  }
-
-  currentDateFrom.value = $formattedDate(
-    props.selectedPeriods[0],
-    props.formatDate
-  )
-  currentDateTo.value = $formattedDate(
-    props.selectedPeriods[1],
-    props.formatDate
-  )
-  currentTimeFrom.value = $formattedTime(props.selectedPeriods[0], '', true)
-  currentTimeTo.value = $formattedTime(props.selectedPeriods[1], '', true)
-}
-
-const onUpdateDateFrom = (val: number): void => {
-  if (!val) return
-
-  currentDateFrom.value = $formattedDate(new Date(val), props.formatDate)
-}
-watch(currentDateFrom, (newValue) => {
-  if (!newValue) return
-
-  if ($isDate(newValue)) dateFrom.value = $getUnixByDate(newValue)
-})
-
-const onUpdateDateTo = (val: number): void => {
-  if (!val) return
-
-  currentDateTo.value = $formattedDate(new Date(val), props.formatDate)
-}
-watch(currentDateTo, (newValue) => {
-  if (!newValue) return
-
-  if ($isDate(newValue)) dateTo.value = $getUnixByDate(newValue)
-})
-
-const alertShow = ref<boolean>(false)
-const alertItems = ref<string[]>([])
-
-const onSubmit = (): void => {
-  alertItems.value = []
-  alertShow.value = false
-
-  if (!dateFrom.value || !dateTo.value) return
-
-  const result = checkDateFunc(
-    localization.value,
-    currentDateFrom.value,
-    currentDateTo.value,
-    currentTimeFrom.value,
-    currentTimeTo.value,
-    props.validDateEnd,
-    props.formatDate
-  )
-
-  if (typeof result === 'string') {
-    alertShow.value = true
-    alertItems.value.push(result)
-    return
-  }
-
-  emits('submit', [result[0], result[1]])
-  onHide()
-}
-
-onMounted(() => {
-  selectedItem.value = location.hostname
-  getCurrentTime()
-  onSubmit()
-})
-</script>
-
-<style scoped lang="scss">
-.input-row-container {
-  padding-left: 5px;
-
-  .custom-time-input {
-    max-width: 120px;
-    margin-right: 15px;
-  }
-}
-.text-format-date {
-  display: inline-block;
-  margin-top: 5px;
-}
-</style>
+<template>
+  <atoms-modal
+    width="580px"
+    class="add-permission"
+    :show="true"
+    :title="titleIntervalModal"
+    :second-title="selectedItem"
+    test-id="overview-custom-interval-modal"
+    @hide="onHide"
+    @submit="onSubmit"
+  >
+    <template #modalBody>
+      <atoms-alert
+        v-show="alertShow"
+        status="alert-danger"
+        :items="alertItems"
+        test-id="overview-alert"
+        @remove="alertShow = false"
+      />
+
+      <table>
+        <tbody>
+          <tr>
+            <td class="text-right">
+              <label class="custom-time-label">
+                <span class="custom-time-label-text text-capitalize">
+                  {{ localization.common.from }}:
+                </span>
+              </label>
+            </td>
+            <td>
+              <div class="flex-align-center input-row-container">
+                <input
+                  id="current-date-from"
+                  v-model.lazy="currentDateFrom"
+                  data-id="current-date-from-input"
+                  type="text"
+                  class="chart-option-setting-row custom-time-input first-from"
+                />
+                <div class="section-datepicker">
+                  <atoms-datepicker
+                    v-model="dateFrom"
+                    :lang="props.currentLang"
+                    class="chart-option-setting-row custom-time-input"
+                    test-id="overview-first-date-datepicker"
+                    @update="onUpdateDateFrom"
+                  />
+                </div>
+                <input
+                  id="current-time-from"
+                  v-model="currentTimeFrom"
+                  data-id="current-time-from-input"
+                  type="text"
+                  class="chart-option-setting-row custom-time-input"
+                />
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td class="text-right">
+              <label class="custom-time-label">
+                <span class="custom-time-label-text text-capitalize">
+                  {{ localization.common.to }}:
+                </span>
+              </label>
+            </td>
+            <td>
+              <div class="flex-align-center input-row-container">
+                <input
+                  id="current-date-to"
+                  v-model.lazy="currentDateTo"
+                  data-id="current-date-to-input"
+                  type="text"
+                  class="chart-option-setting-row custom-time-input first-from"
+                />
+                <div class="section-datepicker">
+                  <atoms-datepicker
+                    v-model="dateTo"
+                    :lang="props.currentLang"
+                    class="chart-option-setting-row custom-time-input"
+                    test-id="overview-first-date-to-datepicker"
+                    @update="onUpdateDateTo"
+                  />
+                </div>
+                <input
+                  id="current-time-to"
+                  v-model="currentTimeTo"
+                  data-id="current-time-to-input"
+                  type="text"
+                  class="chart-option-setting-row custom-time-input"
+                />
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td></td>
+            <td class="text-format-date">
+              (date and time are in ISO 8601 format)
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </template>
+  </atoms-modal>
+</template>
+
+<script setup lang="ts">
+import { format } from 'date-fns'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import { checkDateFunc } from '~/components/common/monitor/overview/filters/customIntervalModal/lib/config/dateChecker'
+
+const props = defineProps<{
+  formatDate: string
+  selectedPeriods: number[]
+  currentLang: string
+}>()
+
+const emits = defineEmits<{
+  (event: 'hide'): void
+  (event: 'submit', value: number[]): void
+}>()
+
+const { $formattedDate, $formattedTime, $isDate, $getUnixByDate } = useNuxtApp()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const titleIntervalModal = ref<string>(
+  `${localization.value.common.timeRange}:`
+)
+
+const selectedItem = ref<string>('')
+
+const onHide = (): void => {
+  getCurrentTime()
+  emits('hide')
+}
+
+const yesterday = new Date().setDate(new Date().getDate() - 1)
+const dateFrom = ref<number>(yesterday)
+const dateTo = ref<number>(new Date().getTime())
+
+const currentDateFrom = ref<string>('')
+const currentDateTo = ref<string>('')
+const currentTimeFrom = ref<string>('')
+const currentTimeTo = ref<string>('')
+
+const getCurrentTime = (): void => {
+  if (!props.selectedPeriods.length) {
+    currentDateFrom.value = $formattedDate(yesterday, props.formatDate)
+    currentDateTo.value = $formattedDate(new Date(), props.formatDate)
+
+    const currentTime = format(new Date(), 'H:mm:ss')
+    currentTimeFrom.value = currentTime
+    currentTimeTo.value = currentTime
+
+    return
+  }
+
+  currentDateFrom.value = $formattedDate(
+    props.selectedPeriods[0],
+    props.formatDate
+  )
+  currentDateTo.value = $formattedDate(
+    props.selectedPeriods[1],
+    props.formatDate
+  )
+  currentTimeFrom.value = $formattedTime(props.selectedPeriods[0], '', true)
+  currentTimeTo.value = $formattedTime(props.selectedPeriods[1], '', true)
+}
+
+const onUpdateDateFrom = (val: number): void => {
+  if (!val) return
+
+  currentDateFrom.value = $formattedDate(new Date(val), props.formatDate)
+}
+watch(currentDateFrom, (newValue) => {
+  if (!newValue) return
+
+  if ($isDate(newValue)) dateFrom.value = $getUnixByDate(newValue)
+})
+
+const onUpdateDateTo = (val: number): void => {
+  if (!val) return
+
+  currentDateTo.value = $formattedDate(new Date(val), props.formatDate)
+}
+watch(currentDateTo, (newValue) => {
+  if (!newValue) return
+
+  if ($isDate(newValue)) dateTo.value = $getUnixByDate(newValue)
+})
+
+const alertShow = ref<boolean>(false)
+const alertItems = ref<string[]>([])
+
+const onSubmit = (): void => {
+  alertItems.value = []
+  alertShow.value = false
+
+  if (!dateFrom.value || !dateTo.value) return
+
+  const result = checkDateFunc(
+    localization.value,
+    currentDateFrom.value,
+    currentDateTo.value,
+    currentTimeFrom.value,
+    currentTimeTo.value
+  )
+
+  if (typeof result === 'string') {
+    alertShow.value = true
+    alertItems.value.push(result)
+    return
+  }
+
+  emits('submit', [result[0], result[1]])
+  onHide()
+}
+
+onMounted(() => {
+  selectedItem.value = location.hostname
+  getCurrentTime()
+  onSubmit()
+})
+</script>
+
+<style scoped lang="scss">
+.input-row-container {
+  padding-left: 5px;
+
+  .custom-time-input {
+    max-width: 120px;
+    margin-right: 15px;
+  }
+}
+.text-format-date {
+  display: inline-block;
+  margin-top: 5px;
+}
+</style>

package/components/common/monitor/overview/filters/customIntervalModal/lib/config/dateChecker.ts

@@ -1,62 +1,52 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
-const isMoreThanOneMonth = (startDate: number, endDate: number): boolean => {
-  const date1 = new Date(startDate)
-  const date2 = new Date(endDate)
-
-  const nextMonth = new Date(date1)
-  nextMonth.setMonth(date1.getMonth() + 1)
-
-  return nextMonth < date2
-}
-
-export const checkDateFunc = (
-  localization: UI_I_Localization,
-  dateFrom: string,
-  dateTo: string,
-  timeFrom: string,
-  timeTo: string,
-  unixValidEnd: number,
-  formatDate: string
-): string | number[] => {
-  const { $isDate, $getUnixByDate } = useNuxtApp()
-
-  let result = ''
-  const startDate = dateFrom + ' ' + timeFrom
-  const unixStartDate = $getUnixByDate(startDate)
-  const endDate = dateTo + ' ' + timeTo
-  const unixEndDate = $getUnixByDate(endDate)
-
-  if (
-    !$isDate(unixStartDate) ||
-    !$isDate(unixEndDate) ||
-    !timeFrom ||
-    !timeTo
-  ) {
-    result = localization.inventoryMonitor.invalidTimeEntry
-    return result
-  }
-
-  if (unixEndDate > unixValidEnd) {
-    const { $formattedDatetime } = useNuxtApp()
-
-    const currentShowValidEnd = $formattedDatetime(
-      new Date(unixValidEnd),
-      formatDate,
-      true
-    )
-    result =
-      localization.inventoryMonitor.timeRangeShouldNotBeMoreThanValidTo.replace(
-        '{0}',
-        currentShowValidEnd
-      )
-  } else if (unixEndDate === unixStartDate)
-    result = localization.inventoryMonitor.timeToShouldBeLaterTimeFrom
-  else if (unixEndDate - unixStartDate <= 3600000)
-    result = localization.inventoryMonitor.timeRangeShouldNotBeSmallerThanHour
-  else if (isMoreThanOneMonth(unixStartDate, unixEndDate))
-    result = localization.inventoryMonitor.timeRangeShouldNotBeMoreThanMonth
-  else return [unixStartDate, unixEndDate]
-
-  return result
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const isMoreThanOneMonth = (startDate: number, endDate: number): boolean => {
+  const start = new Date(startDate)
+  const end = new Date(endDate)
+  const yearDiff = end.getFullYear() - start.getFullYear()
+  const monthDiff = end.getMonth() - start.getMonth()
+
+  return (
+    yearDiff > 0 ||
+    (yearDiff === 0 && monthDiff > 1) ||
+    (yearDiff === 0 && monthDiff === 1 && end.getDate() >= start.getDate())
+  )
+}
+
+export const checkDateFunc = (
+  localization: UI_I_Localization,
+  dateFrom: string,
+  dateTo: string,
+  timeFrom: string,
+  timeTo: string
+): string | number[] => {
+  const { $isDate, $getUnixByDate } = useNuxtApp()
+
+  let result = ''
+  const startDate = dateFrom + ' ' + timeFrom
+  const unixStartDate = $getUnixByDate(startDate)
+  const endDate = dateTo + ' ' + timeTo
+  const unixEndDate = $getUnixByDate(endDate)
+
+  if (
+    !$isDate(unixStartDate) ||
+    !$isDate(unixEndDate) ||
+    !timeFrom ||
+    !timeTo
+  ) {
+    result = localization.inventoryMonitor.invalidTimeEntry
+    return result
+  }
+
+  if (unixEndDate > new Date().getTime())
+    result = localization.inventoryMonitor.oneOfSelectedDatesIsInTheFuture
+  else if (unixEndDate === unixStartDate)
+    result = localization.inventoryMonitor.timeToShouldBeLaterTimeFrom
+  else if (unixEndDate - unixStartDate <= 3600000)
+    result = localization.inventoryMonitor.timeRangeShouldNotBeSmallerThanHour
+  else if (isMoreThanOneMonth(unixStartDate, unixEndDate))
+    result = localization.inventoryMonitor.timeRangeShouldNotBeMoreThanMonth
+  else return [unixStartDate, unixEndDate]
+
+  return result
+}