bfg-common 1.5.912 → 1.5.913

package/assets/localization/local_be.json

@@ -3401,7 +3401,9 @@
     "once": "Адзін раз",
     "selectFrequency": "Выберыце частату",
     "frequency": "Частата",
-    "delayMinutes": "Затрымка (хвілін)"
+    "delayMinutes": "Затрымка (хвілін)",
+    "selectPosition": "Выберыце пазіцыю",
+    "selectDay": "Выберыце дзень"
   },
   "license": {
     "limits": "Мяжа",

package/assets/localization/local_en.json

@@ -3405,7 +3405,9 @@
     "once": "Once",
     "selectFrequency": "Select Frequency",
     "frequency": "Frequency",
-    "delayMinutes": "Delay (Minutes)"
+    "delayMinutes": "Delay (Minutes)",
+    "selectPosition": "Select Position",
+    "selectDay": "Select Day"
   },
   "license": {
     "limits": "Limits",

package/assets/localization/local_hy.json

@@ -3405,7 +3405,9 @@
     "once": "Մեկ անգամ",
     "selectFrequency": "Ընտրեք հաճախականությունը",
     "frequency": "Հաճախականություն",
-    "delayMinutes": "Ժամանակաձգում (րոպե)"
+    "delayMinutes": "Ժամանակաձգում (րոպե)",
+    "selectPosition": "Ընտրեք դիրքը",
+    "selectDay": "Ընտրեք օրը"
   },
   "license": {
     "limits": "Սահմանները",

package/assets/localization/local_kk.json

@@ -3404,7 +3404,9 @@
     "once": "Бір рет",
     "selectFrequency": "Жиілікті таңдаңыз",
     "frequency": "Жиілік",
-    "delayMinutes": "Кешігу (минут)"
+    "delayMinutes": "Кешігу (минут)",
+    "selectPosition": "Орынды таңдаңыз",
+    "selectDay": "Күнді таңдаңыз"
   },
   "license": {
     "limits": "Шектеулер",

package/assets/localization/local_ru.json

@@ -3404,7 +3404,9 @@
     "once": "Один раз",
     "selectFrequency": "Выберите частоту",
     "frequency": "Частота",
-    "delayMinutes": "Задержка (минут)"
+    "delayMinutes": "Задержка (минут)",
+    "selectPosition": "Выберите позицию",
+    "selectDay": "Выберите день"
   },
   "license": {
     "limits": "Пределы",

package/assets/localization/local_zh.json

@@ -3402,7 +3402,9 @@
     "once": "一次",
     "selectFrequency": "选择频率",
     "frequency": "频率",
-    "delayMinutes": "延迟（分钟）"
+    "delayMinutes": "延迟（分钟）",
+    "selectPosition": "选择位置",
+    "selectDay": "选择日期"
   },
   "license": {
     "limits": "限制",

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

@@ -7,7 +7,7 @@
       v-model="scheduledTaskFormLocal"
     />
 
-    <div class="frequency-monthly-days">
+    <div v-if="props.type === 'month'" class="frequency-monthly-days">
       <div class="frequency-on-date__radios">
         <ui-radio
           v-for="(option, key) in props.frequencyMonthlyMode"
@@ -32,6 +32,28 @@
         type="number"
         @input="onInitValidation"
       ></ui-input>
+
+      <div
+        v-if="scheduledTaskFormLocal.frg_monthly_mode === 'week'"
+        class="frequency-monthly-days__week"
+      >
+        <ui-select
+          v-model="scheduledTaskFormLocal.frq_ordinal_number"
+          :items="frequencyOrdinalNumberLocal"
+          test-id="frequency-monthly-ordinary-day"
+          :placeholder="localization.scheduledTasks.selectPosition"
+          size="md"
+          select-width="100%"
+        />
+        <ui-select
+          v-model="scheduledTaskFormLocal.frq_week_day"
+          :items="frequencyWeeksDaysLocal"
+          test-id="frequency-monthly-week-day"
+          :placeholder="localization.scheduledTasks.selectDay"
+          size="md"
+          select-width="100%"
+        />
+      </div>
     </div>
 
     <ui-input-with-datepicker
@@ -48,10 +70,11 @@
 </template>
 
 <script lang="ts" setup>
+import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/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 { getUiDatepickerFormatByLanguage } from '~/lib/utils/date'
 import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
+import { getUiDatepickerFormatByLanguage } from '~/lib/utils/date'
 
 const scheduledTaskFormLocal = defineModel<UI_I_ScheduleNewTasksForm>({
   required: true,
@@ -59,8 +82,8 @@ const scheduledTaskFormLocal = defineModel<UI_I_ScheduleNewTasksForm>({
 const props = defineProps<{
   type: string
   frequencyMonthlyMode: UI_I_SelectInputItem[]
-  frequencyOnWeeksDays: UI_I_SelectInputItem[]
   frequencyOnOrdinalNumber: UI_I_SelectInputItem[]
+  frequencyOnWeeksDays: UI_I_SelectInputItem[]
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
@@ -68,6 +91,20 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 const datepickerFormat = computed<string>(
   () => getUiDatepickerFormatByLanguage('en_US') // TODO из пропс должен приходить язык
 )
+
+const frequencyOrdinalNumberLocal = computed<UI_I_Dropdown[]>(() =>
+  props.frequencyOnOrdinalNumber.map((item: UI_I_SelectInputItem) => ({
+    ...item,
+    text: item.label,
+  }))
+)
+
+const frequencyWeeksDaysLocal = computed<UI_I_Dropdown[]>(() =>
+  props.frequencyOnWeeksDays.map((item: UI_I_SelectInputItem) => ({
+    ...item,
+    text: item.label,
+  }))
+)
 </script>
 
 <style lang="scss" scoped>
@@ -88,5 +125,13 @@ const datepickerFormat = computed<string>(
     line-height: 18px;
     margin-bottom: 12px;
   }
+
+  .frequency-monthly-days {
+    &__week {
+      display: grid;
+      grid-template-columns: repeat(2, 1fr);
+      column-gap: 16px;
+    }
+  }
 }
 </style>

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

@@ -3,8 +3,8 @@
     :is="currentComponent"
     v-model="model"
     :frequency-monthly-mode="frequencyMonthlyMode"
-    :frequency-on-weeks-days="frequencyOnWeeksDays"
     :frequency-on-ordinal-number="frequencyOnOrdinalNumber"
+    :frequency-on-weeks-days="frequencyOnWeeksDays"
     :type="type"
     @vue:mounted="onSetDefaultDateTime"
   />
@@ -43,12 +43,12 @@ const currentComponent = computed(() =>
 const frequencyMonthlyMode = computed<UI_I_SelectInputItem[]>(() => {
   return frequencyMonthlyModeFunc(localization.value)
 })
-const frequencyOnWeeksDays = computed<UI_I_SelectInputItem[]>(() => {
-  return frequencyOnWeeksDaysFunc(localization.value)
-})
 const frequencyOnOrdinalNumber = computed<UI_I_SelectInputItem[]>(() => {
   return frequencyOnOrdinalNumberFunc(localization.value)
 })
+const frequencyOnWeeksDays = computed<UI_I_SelectInputItem[]>(() => {
+  return frequencyOnWeeksDaysFunc(localization.value)
+})
 
 const isDisabledMonthlyDayField = computed<boolean>(
   () => model.value.frg_monthly_mode === 'week'

package/package.json

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