bfg-common 1.4.322 → 1.4.324

package/components/common/layout/theHeader/helpMenu/About.vue

@@ -1,110 +1,42 @@
 <template>
   <Teleport to="body">
-    <atoms-modal
-      width="864px"
-      :show="true"
-      :title="`${brandName}® ${props.projectName}`"
-      test-id="about-modal"
-    >
-      <template #modalHeader>
-        <div class="flex-align-center">
-          <h3 class="modal-title">{{ brandName }}® {{ props.projectName }}</h3>
-          <span class="separator" />
-          <h4 class="secondary-title">
-            {{ props.projectName }} Web Client, version: {{ version }}
-          </h4>
-          <span
-            v-if="props.isBetaVersion"
-            class="beta-version badge badge-info"
-            >{{ localization.common.beta }}</span
-          >
-          <span v-else-if="isDev" class="beta-version badge badge-info"
-            >Dev</span
-          >
-        </div>
-        <button id="about-modal-button-close" class="close">
-          <atoms-the-icon
-            data-id="about-modal-button-close-icon"
-            class="close-icon"
-            name="close"
-            @click="() => emits('hide')"
-          />
-        </button>
-      </template>
-
-      <template #modalBody>
-        <div class="about-vsphere-dialog-legal-section">
-          <p>{{ aboutHeadingText }}</p>
-          <p>{{ localization.layout.aboutSubtitle }}</p>
-        </div>
-
-        <div class="about-vsphere-dialog-legal-section description">
-          {{ aboutDesc1 }}
-          (<a
-            id="about-description-link"
-            data-id="about-description-link"
-            :href="url"
-            target="_blank"
-            >{{ url }}</a
-          >){{ aboutDesc2 }}
-        </div>
-      </template>
-
-      <template #modalFooter>
-        <span></span>
-      </template>
-    </atoms-modal>
+    <common-layout-the-header-help-menu-about-new
+      v-if="isNewView"
+      :version="props.version"
+      :is-beta-version="props.isBeta"
+      :is-dev="props.isDev"
+      :project-name="props.projectName"
+      :url="companyWebSitePath"
+      @hide="emits('hide')"
+    />
+
+    <common-layout-the-header-help-menu-about-old
+      v-else
+      :version="props.version"
+      :is-beta-version="props.isBeta"
+      :is-dev="props.isDev"
+      :project-name="props.projectName"
+      :url="companyWebSitePath"
+      @hide="emits('hide')"
+    />
   </Teleport>
 </template>
 
 <script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
 const props = defineProps<{
   version: string
-  isBetaVersion: boolean
+  isBeta: boolean
   isDev: boolean
   projectName: string
 }>()
-
 const emits = defineEmits<{
   (event: 'hide'): void
 }>()
 
-const config = useRuntimeConfig()
+const { $store }: any = useNuxtApp()
 
-const brandName = computed<string>(
-  () => config.public[`TRADEMARK_${useEnvLanguage()}`]
-)
-const companyName = computed<string>(
-  () => config.public[`COMPANY_NAME_${useEnvLanguage()}`]
-)
-const aboutHeadingText = computed<string>(() =>
-  localization.value.layout.aboutHeading.replaceAll('{companyName}', companyName.value)
-)
-const aboutDesc1 = computed<string>(() =>
-  localization.value.layout.aboutDesc1
-    .replaceAll('{companyName}', companyName.value)
-    .replaceAll('{trademark}', brandName.value)
-)
-const aboutDesc2 = computed<string>(() =>
-  localization.value.layout.aboutDesc2
-    .replaceAll('{companyName}', companyName.value)
-    .replaceAll('{trademark}', brandName.value)
-)
 
-const localization = computed<UI_I_Localization>(() => useLocal())
+const companyWebSitePath = ref<string>('https://iridium-soft.com/')
 
-const url = ref<string>('https://iridium-soft.com/')
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 </script>
-
-<style lang="scss" scoped>
-.modal-title {
-  color: var(--main-color-mode);
-}
-.description {
-  padding-top: 10px;
-  font-size: 13px;
-  line-height: 19px;
-}
-</style>

package/components/common/layout/theHeader/helpMenu/HelpMenu.vue

@@ -11,7 +11,7 @@
   <common-layout-the-header-help-menu-about
     v-if="isShowAbout"
     :version="version"
-    :is-beta-version="isBeta"
+    :is-beta="isBeta"
     :is-dev="isDev"
     :project-name="props.projectName"
     @hide="isShowAbout = false"

package/components/common/layout/theHeader/helpMenu/aboutNew/AboutNew.vue

@@ -0,0 +1,90 @@
+<template>
+  <ui-modal
+    test-id="about-modal"
+    width="720px"
+    :title="`${brandName}® ${props.projectName}`"
+    :subtitle="`${props.projectName} Web Client, version: ${props.version}`"
+    class="about-modal"
+    @hide="onHideModal"
+  >
+    <template #content>
+      <ui-modal-block-standard>
+        <div>
+          <p>{{ aboutHeadingText }}</p>
+
+          <p>{{ localization.layout.aboutSubtitle }}</p>
+        </div>
+
+        <div class="about-modal__description">
+          {{ aboutDesc1 }}
+
+          (<a
+            id="about-description-link"
+            data-id="about-description-link"
+            :href="url"
+            target="_blank"
+          >
+            {{ props.url }} </a
+          >)
+
+          {{ aboutDesc2 }}
+        </div>
+      </ui-modal-block-standard>
+    </template>
+    <template #footerContent><span /></template>
+  </ui-modal>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const props = defineProps<{
+  version: string
+  isBetaVersion: boolean
+  isDev: boolean
+  projectName: string
+  url: string
+}>()
+const emits = defineEmits<{
+  (event: 'hide'): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+const config = useRuntimeConfig()
+
+const brandName = computed<string>(
+  () => config.public[`TRADEMARK_${useEnvLanguage()}`]
+)
+const companyName = computed<string>(
+  () => config.public[`COMPANY_NAME_${useEnvLanguage()}`]
+)
+
+const aboutHeadingText = computed<string>(() =>
+  localization.value.layout.aboutHeading.replaceAll(
+    '{companyName}',
+    companyName.value
+  )
+)
+
+const aboutDesc1 = computed<string>(() =>
+  localization.value.layout.aboutDesc1
+    .replaceAll('{companyName}', companyName.value)
+    .replaceAll('{trademark}', brandName.value)
+)
+const aboutDesc2 = computed<string>(() =>
+  localization.value.layout.aboutDesc2
+    .replaceAll('{companyName}', companyName.value)
+    .replaceAll('{trademark}', brandName.value)
+)
+
+const onHideModal = (): void => {
+  emits('hide')
+}
+</script>
+
+<style lang="scss" scoped>
+.about-modal {
+  &__description {
+  }
+}
+</style>

package/components/common/layout/theHeader/helpMenu/aboutOld/AboutOld.vue

@@ -0,0 +1,110 @@
+<template>
+  <Teleport to="body">
+    <atoms-modal
+      width="864px"
+      :show="true"
+      :title="`${brandName}® ${props.projectName}`"
+      test-id="about-modal"
+    >
+      <template #modalHeader>
+        <div class="flex-align-center">
+          <h3 class="modal-title">{{ brandName }}® {{ props.projectName }}</h3>
+          <span class="separator" />
+          <h4 class="secondary-title">
+            {{ props.projectName }} Web Client, version: {{ version }}
+          </h4>
+          <span
+            v-if="props.isBetaVersion"
+            class="beta-version badge badge-info"
+            >{{ localization.common.beta }}</span
+          >
+          <span v-else-if="isDev" class="beta-version badge badge-info"
+            >Dev</span
+          >
+        </div>
+        <button id="about-modal-button-close" class="close">
+          <atoms-the-icon
+            data-id="about-modal-button-close-icon"
+            class="close-icon"
+            name="close"
+            @click="() => emits('hide')"
+          />
+        </button>
+      </template>
+
+      <template #modalBody>
+        <div class="about-vsphere-dialog-legal-section">
+          <p>{{ aboutHeadingText }}</p>
+          <p>{{ localization.layout.aboutSubtitle }}</p>
+        </div>
+
+        <div class="about-vsphere-dialog-legal-section description">
+          {{ aboutDesc1 }}
+          (<a
+            id="about-description-link"
+            data-id="about-description-link"
+            :href="url"
+            target="_blank"
+            >{{ props.url }}</a
+          >){{ aboutDesc2 }}
+        </div>
+      </template>
+
+      <template #modalFooter>
+        <span></span>
+      </template>
+    </atoms-modal>
+  </Teleport>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const props = defineProps<{
+  version: string
+  isBetaVersion: boolean
+  isDev: boolean
+  projectName: string
+  url: string
+}>()
+const emits = defineEmits<{
+  (event: 'hide'): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+const config = useRuntimeConfig()
+
+const brandName = computed<string>(
+  () => config.public[`TRADEMARK_${useEnvLanguage()}`]
+)
+const companyName = computed<string>(
+  () => config.public[`COMPANY_NAME_${useEnvLanguage()}`]
+)
+const aboutHeadingText = computed<string>(() =>
+  localization.value.layout.aboutHeading.replaceAll(
+    '{companyName}',
+    companyName.value
+  )
+)
+const aboutDesc1 = computed<string>(() =>
+  localization.value.layout.aboutDesc1
+    .replaceAll('{companyName}', companyName.value)
+    .replaceAll('{trademark}', brandName.value)
+)
+const aboutDesc2 = computed<string>(() =>
+  localization.value.layout.aboutDesc2
+    .replaceAll('{companyName}', companyName.value)
+    .replaceAll('{trademark}', brandName.value)
+)
+</script>
+
+<style lang="scss" scoped>
+.modal-title {
+  color: var(--main-color-mode);
+}
+.description {
+  padding-top: 10px;
+  font-size: 13px;
+  line-height: 19px;
+}
+</style>

package/components/common/layout/theHeader/userMenu/UserMenu.vue

@@ -14,7 +14,6 @@
     <common-layout-the-header-user-menu-modals-change-password
       v-if="isShowChangePasswordModal"
       v-model="isShowChangePasswordModal"
-      :new-view="props.newView"
       :hostname="props.hostname"
       :project="props.project"
     />

package/components/common/layout/theHeader/userMenu/modals/changePassword/ChangePassword.vue

@@ -1,6 +1,6 @@
 <template>
   <common-layout-the-header-user-menu-modals-change-password-new
-    v-if="newView"
+    v-if="isNewView"
     v-model="form"
     :subtitle="props.hostname"
     :project="props.project"
@@ -29,7 +29,6 @@ import type { UI_T_Project } from '~/lib/models/types'
 import {} from '#build/components/common/layout/theHeader/userMenu/modals/changePassword/lib/models/interfaces'
 
 const props = defineProps<{
-  newView: boolean
   hostname: string
   project: UI_T_Project
 }>()
@@ -43,6 +42,8 @@ const form = ref<UI_I_ChangePasswordForm>({
   new_password: '',
   confirm_password: '',
 })
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 const onChangePassword = async (): Promise<void> => {
   const { current_password, new_password } = form.value
 

package/components/common/layout/theHeader/userMenu/modals/changePassword/ChangePasswordNew.vue

@@ -32,7 +32,7 @@
             :error="passwordErrorText"
             type="password"
             :autocomplete="'new-password'"
-          ></ui-input>
+          />
 
           <ui-input
             v-model="modelLocal.new_password"
@@ -40,7 +40,7 @@
             :label="localization.common.newPassword"
             :error="newPasswordErrorText"
             type="password"
-          ></ui-input>
+          />
 
           <ui-input
             v-model="modelLocal.confirm_password"
@@ -48,7 +48,7 @@
             :label="localization.common.confirmPassword"
             :error="confirmPasswordErrorText"
             type="password"
-          ></ui-input>
+          />
         </div>
       </ui-modal-block-standard>
     </template>

package/components/common/monitor/advanced/tools/chartOptionsModal/metrics/lib/config/optionsMetrics.ts

@@ -152,11 +152,11 @@ export const metricsFunc = (
         value: 'memory',
         testId: 'metric-item-memory-button',
       },
-      {
-        text: localization.common.datastore,
-        value: 'datastore',
-        testId: 'metric-item-datastore-button',
-      },
+      // {
+      //   text: localization.common.datastore,
+      //   value: 'datastore',
+      //   testId: 'metric-item-datastore-button',
+      // },
       // {
       //   text: localization.common.power,
       //   value: 'power',

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

@@ -62,6 +62,8 @@ watch(
   ([newValue1, newValue2]: [string, 'never' | 'on']) => {
     modelFrequencyLocal.value.isValid =
       newValue2 === 'never' ? false : !!newValue1
+
+    newValue2 === 'never' && (modelFrequencyLocal.value.frg_end_time = '')
   }
 )
 </script>

package/components/common/pages/scheduledTasks/modals/common/frequency/lib/utils.ts

@@ -62,7 +62,8 @@ const getCorrectRuForm = (value: number | string, type: string): string => {
 export const validateField = (
   localization: UI_I_Localization,
   value: string,
-  checkZero: boolean = false
+  checkZero: boolean = false,
+  checkDayRange: boolean = false // параметр для проверки диапазона дней
 ): string => {
   // Если поле пустое
   if (!value) {
@@ -74,7 +75,7 @@ export const validateField = (
     return localization.common.theValueTooSmall
   }
 
-  if (value.length > 3) {
+  if (value.length > 3 ) {
     return localization.common.theValueTooLarge
   }
   // Если значение не является цифрой
@@ -82,6 +83,10 @@ export const validateField = (
     return localization.common.inputContainsInvalidCharacters
   }
 
+  if (checkDayRange && !/^([1-9]|[1-2][0-9]|3[0-1])$/.test(value)) {
+    return localization.common.theValueTooLarge
+  }
+
   return ''
 }
 export const validateDate = (

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

@@ -9,11 +9,11 @@
       v-model="model"
     />
 
-    <div v-if="props.type === 'month'" class="">
+    <div v-if="props.type === 'month'">
       <div class="on-time__radio radio">
         <input
           id="on-time-monthly-by-day"
-          v-model="selectedTimeMode"
+          v-model="model.frg_monthly_mode"
           data-id="on-time-monthly-by-day"
           type="radio"
           value="day"
@@ -49,7 +49,7 @@
       <div class="on-time__radio radio">
         <input
           id="on-time-monthly-by-week"
-          v-model="selectedTimeMode"
+          v-model="model.frg_monthly_mode"
           data-id="on-time-monthly-by-week"
           type="radio"
           value="week"
@@ -115,8 +115,6 @@ const model = defineModel<UI_I_ScheduleNewTasksForm>({ required: true })
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const selectedTimeMode = ref<'day' | 'week'>('day')
-
 const frequencyOnWeeksDays = computed<UI_I_SelectInputItem[]>(() => {
   return frequencyOnWeeksDaysFunc(localization.value)
 })
@@ -125,7 +123,7 @@ const frequencyOnOrdinalNumber = computed<UI_I_SelectInputItem[]>(() => {
 })
 
 const isDisabledMonthlyDayField = computed<boolean>(
-  () => selectedTimeMode.value === 'week'
+  () => model.value.frg_monthly_mode === 'week'
 )
 
 const isInitTimeIntervalValidation = ref<boolean>(false)
@@ -136,7 +134,12 @@ const schedulerOnDayErrorText = computed<string>(() => {
   if (!isInitTimeIntervalValidation.value || isDisabledMonthlyDayField.value)
     return ''
 
-  return validateField(localization.value, model.value.frg_monthly_day, true)
+  return validateField(
+    localization.value,
+    model.value.frg_monthly_day,
+    true,
+    true
+  )
 })
 watch(
   schedulerOnDayErrorText,

package/components/common/pages/scheduledTasks/modals/common/frequency/on/lib/config/options.ts

@@ -7,31 +7,31 @@ export const frequencyOnWeeksDaysFunc = (
   return [
     {
       label: localization.common.sunday,
-      value: 'sunday',
+      value: 6,
     },
     {
       label: localization.common.monday,
-      value: 'monday',
+      value: 1,
     },
     {
       label: localization.common.tuesday,
-      value: 'tuesday',
+      value: 2,
     },
     {
       label: localization.common.wednesday,
-      value: 'wednesday',
+      value: 3,
     },
     {
       label: localization.common.thursday,
-      value: 'thursday',
+      value: 4,
     },
     {
       label: localization.common.friday,
-      value: 'friday',
+      value: 5,
     },
     {
       label: localization.common.saturday,
-      value: 'saturday',
+      value: 0,
     },
   ]
 }
@@ -42,23 +42,23 @@ export const frequencyOnOrdinalNumberFunc = (
   return [
     {
       label: localization.scheduledTasks.first,
-      value: '',
+      value: 1,
     },
     {
       label: localization.scheduledTasks.second,
-      value: 'once',
+      value: 2,
     },
     {
       label: localization.scheduledTasks.third,
-      value: 'after-startup',
+      value: 3,
     },
     {
       label: localization.scheduledTasks.fourth,
-      value: 'hour',
+      value: 4,
     },
     {
       label: localization.common.last,
-      value: 'day',
+      value: 5,
     },
   ]
 }

package/components/common/pages/scheduledTasks/modals/common/newTaskForm/NewTaskForm.vue

@@ -101,6 +101,7 @@ import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/
 import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
 import type { UI_I_InitialValidationFields } from '~/components/common/pages/scheduledTasks/modals/common/newTaskForm/lib/models/interfaces'
 import type { UI_T_FrequencyType } from '~/components/common/pages/scheduledTasks/modals/common/frequency/lib/models/types'
+import * as cron from '~/components/common/pages/scheduledTasks/modals/common/newTaskForm/lib/utils'
 import { frequencyMethodFunc } from '~/components/common/pages/scheduledTasks/modals/common/frequency/lib/config/frequencyOptions'
 
 const props = defineProps<{
@@ -133,57 +134,6 @@ watch(
   },
   { deep: true }
 )
-/* TODO рефакторинг все методы надо рефакторить */
-const generateOnceCronExpression = (date: Date): any => {
-  if (!date) return
-
-  const minutes = date.getMinutes()
-  const hours = date.getHours()
-  const day = date.getDate()
-  const month = date.getMonth() + 1 // В cron месяцы начинаются с 1 (январь = 1)
-  const dayOfWeek = '*' // Для одноразовой задачи день недели неважен
-
-  // Генерируем cron-выражение
-  return `${minutes} ${hours} ${day} ${month} ${dayOfWeek} once`
-}
-const generateHourlyCronExpression = (delay: string, date: Date): any => {
-  if (!date) return
-
-  const minutes = date.getMinutes()
-  const hours = date.getHours()
-
-  // Генерируем cron-выражение
-  return `${minutes} ${hours}/${delay} * * *`
-}
-const generateDaylyCronExpression = (delay: string, date: Date): string => {
-  if (!date) return
-
-  const minutes = date.getMinutes()
-  const hours = date.getHours()
-  const day = date.getDate()
-
-  // Генерируем cron-выражение
-  return `${minutes} ${hours} ${day}/${delay} * *`
-}
-const generateWeeklyCronExpression = (
-  data: UI_I_ScheduleNewTasksForm
-): string => {
-  const { frg_on_week_days } = data
-
-  // Генерируем cron-выражение
-  return `* * * * ${frg_on_week_days.join(',')}`
-}
-const generateMonthlyCronExpression = (delay: string, date: Date): string => {
-  if (!date) return
-
-  const minutes = date.getMinutes()
-  const hours = date.getHours()
-  const day = date.getDate()
-  const month = date.getMonth() + 1
-
-  // Генерируем cron-выражение
-  return `${minutes} ${hours} ${day} ${month}/${delay} *`
-}
 
 const generateCronExpression = (
   runType: UI_T_FrequencyType,
@@ -194,40 +144,27 @@ const generateCronExpression = (
   // Генерируем cron-выражение на основе runType
   switch (runType) {
     case 'once':
-      cronExpression = generateOnceCronExpression(
-        new Date(interval.frg_on_time)
+      const timestamp = Math.floor(
+        new Date(interval.frg_on_time).getTime() / 1000
       )
+      cronExpression = `* * * * * ${timestamp}:0-0-0-0:once`
       break
     case 'after-startup':
-      const delay =
-        interval.frg_after_startup === 0
-          ? '*'
-          : `*/${interval.frg_after_startup}`
-      cronExpression = `${delay} * * * * after_procurator_startup` // Выполняется каждые N минут после запуска  procurator_startup
+      const suffixDelay =
+        interval.frg_after_startup === 0 ? '' : `-${interval.frg_after_startup}`
+      cronExpression = `* * * * * after_procurator_startup${suffixDelay}` // Выполняется после запуска procurator_startup с задержой N минут
       break
     case 'hour':
-      const hourlyDelay = interval.frg_interval
-      cronExpression = generateHourlyCronExpression(
-        hourlyDelay,
-        new Date(interval.frg_start_on_time)
-      )
+      cronExpression = cron.generateHourlyCronExpression(interval)
       break
     case 'day':
-      const dayDelay = interval.frg_interval
-      cronExpression = generateDaylyCronExpression(
-        dayDelay,
-        new Date(interval.frg_start_on_time)
-      )
+      cronExpression = cron.generateDailyCronExpression(interval)
       break
     case 'week':
-      cronExpression = generateWeeklyCronExpression(interval)
+      cronExpression = cron.generateWeeklyCronExpression(interval)
       break
     case 'month':
-      const monthDelay = interval.frg_interval
-      cronExpression = generateMonthlyCronExpression(
-        monthDelay,
-        new Date(interval.frg_start_on_time)
-      )
+      cronExpression = cron.generateMonthlyCronExpression(interval)
       break
     default:
       cronExpression = '* * * * *'

package/components/common/pages/scheduledTasks/modals/common/newTaskForm/lib/utils.ts

@@ -0,0 +1,67 @@
+import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
+
+export const generateHourlyCronExpression = (
+  data: UI_I_ScheduleNewTasksForm
+): string => {
+  const startTimestamp = Math.floor(
+    new Date(data.frg_start_on_time).getTime() / 1000
+  )
+  const endTimestamp = Math.floor(new Date(data.frg_end_time).getTime() / 1000)
+
+  // Генерируем cron-выражение
+  return endTimestamp
+    ? `* * * * * ${startTimestamp}-${endTimestamp}:${data.frg_interval}-0-0-0`
+    : `* * * * * ${startTimestamp}:${data.frg_interval}-0-0-0`
+}
+export const generateWeeklyCronExpression = (
+  data: UI_I_ScheduleNewTasksForm
+): string => {
+  const { frg_on_week_days } = data
+
+  const startTimestamp = Math.floor(
+    new Date(data.frg_start_on_time).getTime() / 1000
+  )
+  const endTimestamp = Math.floor(new Date(data.frg_end_time).getTime() / 1000)
+  const daysOfWeek = frg_on_week_days.join(',')
+
+  return endTimestamp
+    ? `* * * * ${daysOfWeek} ${startTimestamp}-${endTimestamp}:0-0-0-${data.frg_interval}`
+    : `* * * * ${daysOfWeek} ${startTimestamp}:0-0-0-${data.frg_interval}`
+}
+
+export const generateDailyCronExpression = (
+  data: UI_I_ScheduleNewTasksForm
+): string => {
+  const startTimestamp = Math.floor(
+    new Date(data.frg_start_on_time).getTime() / 1000
+  )
+  const endTimestamp = Math.floor(new Date(data.frg_end_time).getTime() / 1000)
+
+  // Генерируем cron-выражение
+  return endTimestamp
+    ? `* * * * * ${startTimestamp}-${endTimestamp}:0-${data.frg_interval}-0-0`
+    : `* * * * * ${startTimestamp}:0-${data.frg_interval}-0-0`
+}
+
+export const generateMonthlyCronExpression = (
+  data: UI_I_ScheduleNewTasksForm
+): string => {
+  const { frg_interval, frg_monthly_day, frq_week_day, frq_ordinal_number } =
+    data
+
+  const startTimestamp = Math.floor(
+    new Date(data.frg_start_on_time).getTime() / 1000
+  )
+  const endTimestamp = Math.floor(new Date(data.frg_end_time).getTime() / 1000)
+
+  const daysOfWeek = `${frq_week_day}#${frq_ordinal_number}`
+
+  const timestamp = endTimestamp
+    ? `${startTimestamp}-${endTimestamp}`
+    : startTimestamp
+
+  // Генерируем cron-выражение
+  return data.frg_monthly_mode === 'week'
+    ? `* * * * * ${timestamp}:0-0-${frg_interval}-${daysOfWeek}`
+    : `* * ${frg_monthly_day} */${frg_interval} * ${timestamp}:0-0-0-0`
+}

package/components/common/pages/scheduledTasks/modals/lib/config/createScheduledTask.ts

@@ -11,12 +11,13 @@ export const scheduledTaskDefaultFormFunc = (): UI_I_ScheduleNewTasksForm => {
     frequency: '',
     frg_after_startup: 0,
     frg_interval: 1,
-    frg_end_time: null,
-    frg_start_on_time: null,
-    frg_monthly_day: 0,
+    frg_end_time: '',
+    frg_start_on_time: '',
+    frg_monthly_mode: 'day',
+    frg_monthly_day: 1,
     frq_week_day: '',
     frq_ordinal_number: '',
-    frg_on_time: null,
+    frg_on_time: '',
     frg_on_week_days: [],
   }
 }

package/components/common/pages/scheduledTasks/modals/lib/models/interfaces.ts

@@ -9,12 +9,13 @@ export interface UI_I_ScheduleNewTasksForm {
   toggle: boolean
   frg_after_startup: number
   frg_interval: number
-  frg_end_time: number | null
-  frg_start_on_time: number | null
+  frg_end_time: string
+  frg_start_on_time: string
+  frg_monthly_mode: 'day' | 'week'
   frg_monthly_day: number
   frq_ordinal_number: string
   frq_week_day: UI_T_FrequencyWeeksDays
-  frg_on_time: number | null
+  frg_on_time: string
   frg_on_week_days: number[]
   cron: string
 }

package/package.json

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