bfg-common 1.4.732 → 1.4.734

package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/form/lib/config/dateForm.ts

@@ -0,0 +1,114 @@
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import type { UI_I_ArbitraryObject } from '~/lib/models/interfaces'
+
+export const timespanFunc = (
+  localization: UI_I_Localization
+): UI_I_OptionItem[] => [
+  {
+    text: localization.inventoryMonitor.realTime,
+    value: 'real_time',
+  },
+  {
+    text: localization.inventoryMonitor.lastDay,
+    value: 'last_day',
+  },
+  {
+    text: localization.inventoryMonitor.lastWeek,
+    value: 'last_week',
+  },
+  {
+    text: localization.inventoryMonitor.lastMonth,
+    value: 'last_month',
+  },
+  // {
+  //   text: localization.inventoryMonitor.lastYear,
+  //   value: 'last_year',
+  // },
+  {
+    text: localization.inventoryMonitor.customInterval,
+    value: 'custom_interval',
+  },
+]
+
+export const customTimeFunc = (
+  localization: UI_I_Localization,
+  value: number,
+  lang: string
+): UI_I_OptionItem[] => {
+  const isLangRu = lang === 'ru_RU'
+
+  const hourText = isLangRu
+    ? getCorrectRuForm(value, 'hour')
+    : localization.common.hours2
+  const dayText = isLangRu
+    ? getCorrectRuForm(value, 'day')
+    : localization.common.days2
+  const weekText = isLangRu
+    ? getCorrectRuForm(value, 'week')
+    : localization.common.weeks2
+  const monthText = isLangRu
+    ? getCorrectRuForm(value, 'month')
+    : localization.common.months2
+
+  return [
+    {
+      text: hourText,
+      value: 'hours',
+    },
+    {
+      text: dayText,
+      value: 'days',
+    },
+    {
+      text: weekText,
+      value: 'weeks',
+    },
+    {
+      text: monthText,
+      value: 'months',
+    },
+  ]
+}
+
+export const chartTypeFunc = (
+  localization: UI_I_Localization
+): UI_I_OptionItem[] => [
+  {
+    text: localization.inventoryMonitor.lineGraph,
+    value: 'line_graph',
+  },
+  {
+    text: localization.inventoryMonitor.stackedGraph,
+    value: 'stacked_graph',
+  },
+]
+
+const getCorrectRuForm = (value: number, type: string): string => {
+  // TODO поправить используя correctRuUnit из плагина date
+  const forms: UI_I_ArbitraryObject<string[]> = {
+    hour: ['Час', 'Часа', 'Часов'],
+    day: ['День', 'Дня', 'Дней'],
+    week: ['Неделя', 'Недели', 'Недель'],
+    month: ['Месяц', 'Месяца', 'Месяцев'],
+  }
+
+  let text: string
+
+  if (!value) {
+    return getCorrectRuForm[type]
+  }
+
+  if (value % 10 === 1 && value % 100 !== 11) {
+    text = forms[type][0]
+  } else if (
+    [2, 3, 4].includes(value % 10) &&
+    ![12, 13, 14].includes(value % 100)
+  ) {
+    text = forms[type][1]
+  } else {
+    text = forms[type][2]
+  }
+  getCorrectRuForm[type] = text
+  return text
+}

package/components/common/monitor/overview/filters/Filters.vue

@@ -51,12 +51,10 @@
   </div>
 
   <common-monitor-overview-filters-custom-interval-modal
-    v-if="props.validDateEnd"
     v-show="isShowIntervalModal"
     :selected-periods="props.selectedPeriods"
     :format-date="props.formatDate"
     :current-lang="props.currentLang"
-    :valid-date-end="props.validDateEnd"
     @hide="onHideIntervalModal"
     @submit="onSubmitIntervalModal"
   />
@@ -84,7 +82,6 @@ const props = defineProps<{
   selectedPeriods: number[]
   formatDate: string
   currentLang: string
-  validDateEnd: number
   formatTime?: string
 }>()
 

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

@@ -113,7 +113,6 @@ const props = defineProps<{
   formatDate: string
   selectedPeriods: number[]
   currentLang: string
-  validDateEnd: number
 }>()
 
 const emits = defineEmits<{
@@ -148,10 +147,11 @@ const currentTimeTo = ref<string>('')
 const getCurrentTime = (): void => {
   if (!props.selectedPeriods.length) {
     currentDateFrom.value = $formattedDate(yesterday, props.formatDate)
-    currentDateTo.value = $formattedDate(props.validDateEnd, props.formatDate)
+    currentDateTo.value = $formattedDate(new Date(), props.formatDate)
 
-    currentTimeFrom.value = format(new Date(), 'H:mm:ss')
-    currentTimeTo.value = format(props.validDateEnd, 'H:mm:ss')
+    const currentTime = format(new Date(), 'H:mm:ss')
+    currentTimeFrom.value = currentTime
+    currentTimeTo.value = currentTime
 
     return
   }
@@ -204,9 +204,7 @@ const onSubmit = (): void => {
     currentDateFrom.value,
     currentDateTo.value,
     currentTimeFrom.value,
-    currentTimeTo.value,
-    props.validDateEnd,
-    props.formatDate
+    currentTimeTo.value
   )
 
   if (typeof result === 'string') {
@@ -219,14 +217,6 @@ const onSubmit = (): void => {
   onHide()
 }
 
-watch(
-  () => [props.selectedPeriods, props.currentLang],
-  (): void => {
-    getCurrentTime()
-  },
-  { deep: true }
-)
-
 onMounted(() => {
   selectedItem.value = location.hostname
   getCurrentTime()

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

@@ -1,13 +1,16 @@
 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
+  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 = (
@@ -15,9 +18,7 @@ export const checkDateFunc = (
   dateFrom: string,
   dateTo: string,
   timeFrom: string,
-  timeTo: string,
-  unixValidEnd: number,
-  formatDate: string
+  timeTo: string
 ): string | number[] => {
   const { $isDate, $getUnixByDate } = useNuxtApp()
 
@@ -37,20 +38,9 @@ export const checkDateFunc = (
     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)
+  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

package/components/common/pages/hardwareHealth/HardwareHealth.vue

@@ -51,8 +51,6 @@
         :is-dark-mode="props.isDarkMode"
         :get-date-format="props.getDateFormat"
         :main-selected-row="selectedRow"
-        :valid-date-end="props.validDateEnd"
-        :format-date="props.formatDate"
         @update-tools="onUpdateHistoryTestimonyTools"
       />
 
@@ -78,13 +76,12 @@ import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/model
 import type { UI_I_StorageSensorsAlert } from '~/components/common/pages/hardwareHealth/lib/models/interfaces'
 import type { UI_T_HardwareHealthTabMode } from '~/components/common/pages/hardwareHealth/lib/models/types'
 import { hardwareHealthTabsFunc } from '~/components/common/pages/hardwareHealth/lib/config/tabsPannel'
-import type { UI_I_HardwareHealthHistoryTestimonyTools } from '~/components/common/pages/hardwareHealth/historyTestimony/lib/models/interfaces'
+import type {
+  UI_I_HardwareHealthHistoryTestimonyTools
+} from "~/components/common/pages/hardwareHealth/historyTestimony/lib/models/interfaces";
 
 const emits = defineEmits<{
-  (
-    event: 'update-history-testimony-tools',
-    value: UI_I_HardwareHealthHistoryTestimonyTools
-  ): void
+  (event: 'update-history-testimony-tools', value: UI_I_HardwareHealthHistoryTestimonyTools): void
 }>()
 const props = defineProps<{
   data: UI_I_HardwareHealthSensors[]
@@ -97,8 +94,6 @@ const props = defineProps<{
   formattedDatetime: any
   getDateFormat: any
   language: string
-  validDateEnd: number
-  formatDate: string
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
@@ -173,9 +168,7 @@ watch(activeTab, () => {
   uniqueKey.value++
 })
 
-const onUpdateHistoryTestimonyTools = (
-  tools: UI_I_HardwareHealthHistoryTestimonyTools
-): void => {
+const onUpdateHistoryTestimonyTools = (tools: UI_I_HardwareHealthHistoryTestimonyTools): void => {
   emits('update-history-testimony-tools', tools)
 }