bfg-common 1.3.362 → 1.3.363

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

@@ -1,4 +1,5 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
+import { UI_I_ArbitraryObject } from '~/lib/models/interfaces'
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 
 export const timespanFunc = (
@@ -37,10 +38,16 @@ export const customTimeFunc = (
 ): UI_I_OptionItem[] => {
   const isLangRu = lang === 'ru_RU'
 
-  const hourText = isLangRu ? getCorrectHourForm(hour) : localization.hours2
-  const dayText = isLangRu ? getCorrectDayForm(hour) : localization.days2
-  const weekText = isLangRu ? getCorrectWeekForm(hour) : localization.weeks2
-  const monthText = isLangRu ? getCorrectMonthForm(hour) : localization.months2
+  const hourText = isLangRu
+    ? getCorrectRuForm(hour, 'hour')
+    : localization.hours2
+  const dayText = isLangRu ? getCorrectRuForm(hour, 'day') : localization.days2
+  const weekText = isLangRu
+    ? getCorrectRuForm(hour, 'week')
+    : localization.weeks2
+  const monthText = isLangRu
+    ? getCorrectRuForm(hour, 'month')
+    : localization.months2
 
   return [
     {
@@ -75,89 +82,30 @@ export const chartTypeFunc = (
   },
 ]
 
-const getCorrectHourForm = (hours: number): string => {
-  let text: string
-
-  if (!hours) {
-    return getCorrectHourForm.text
-  }
-
-  if (hours % 10 === 1 && hours % 100 !== 11) {
-    text = 'Час'
-  } else if (
-    [2, 3, 4].includes(hours % 10) &&
-    ![12, 13, 14].includes(hours % 100)
-  ) {
-    text = 'Часа'
-  } else {
-    text = 'Часов'
-  }
-
-  getCorrectHourForm.text = text
-  return text
-}
-
-const getCorrectDayForm = (days: number): string => {
-  let text: string
-
-  if (!days) {
-    return getCorrectDayForm.text
-  }
-
-  if (days % 10 === 1 && days % 100 !== 11) {
-    text = 'День'
-  } else if (
-    [2, 3, 4].includes(days % 10) &&
-    ![12, 13, 14].includes(days % 100)
-  ) {
-    text = 'Дня'
-  } else {
-    text = 'Дней'
+const getCorrectRuForm = (value: number, type: string): string => {
+  const forms: UI_I_ArbitraryObject<string[]> = {
+    hour: ['Час', 'Часа', 'Часов'],
+    day: ['День', 'Дня', 'Дней'],
+    week: ['Неделя', 'Недели', 'Недель'],
+    month: ['Месяц', 'Месяца', 'Месяцев'],
   }
 
-  getCorrectDayForm.text = text
-  return text
-}
-const getCorrectWeekForm = (weeks: number): string => {
   let text: string
 
-  if (!weeks) {
-    return getCorrectWeekForm.text
+  if (!value) {
+    return getCorrectRuForm[type]
   }
 
-  if (weeks % 10 === 1 && weeks % 100 !== 11) {
-    text = 'Неделя'
+  if (value % 10 === 1 && value % 100 !== 11) {
+    text = forms[type][0]
   } else if (
-    [2, 3, 4].includes(weeks % 10) &&
-    ![12, 13, 14].includes(weeks % 100)
+    [2, 3, 4].includes(value % 10) &&
+    ![12, 13, 14].includes(value % 100)
   ) {
-    text = 'Недели'
+    text = forms[type][1]
   } else {
-    text = 'Недель'
+    text = forms[type][2]
   }
-
-  getCorrectWeekForm.text = text
-  return text
-}
-
-const getCorrectMonthForm = (months: number): string => {
-  let text: string
-
-  if (!months) {
-    return getCorrectMonthForm.text
-  }
-
-  if (months % 10 === 1 && months % 100 !== 11) {
-    text = 'Месяц'
-  } else if (
-    [2, 3, 4].includes(months % 10) &&
-    ![12, 13, 14].includes(months % 100)
-  ) {
-    text = 'Месяца'
-  } else {
-    text = 'Месяцев'
-  }
-
-  getCorrectMonthForm.text = text
+  getCorrectRuForm[type] = text
   return text
 }

package/package.json

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