bfg-common 1.4.298 → 1.4.300

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/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)

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

@@ -146,25 +146,40 @@ const generateOnceCronExpression = (date: Date): any => {
   // Генерируем cron-выражение
   return `${minutes} ${hours} ${day} ${month} ${dayOfWeek} once`
 }
-const generateHourlyCronExpression = (delay: string, date: Date): any => {
+const generateHourlyCronExpression = (
+  data: UI_I_ScheduleNewTasksForm
+): string => {
   if (!date) return
 
+  const startOnTimestamp = Math.floor(
+    new Date(data.frg_start_on_time).getTime() / 1000
+  )
+  const endTimestamp = Math.floor(new Date(data.frg_end_time).getTime() / 1000)
+
   // const minutes = date.getMinutes()
   // const hours = date.getHours()
 
   // Генерируем cron-выражение
   // return `${minutes} ${hours}/${delay} * * *`
-  return `0 */${delay} * * *`
+  return endTimestamp
+    ? `0 */${data.frg_interval} * * * start=${startOnTimestamp},end=${endTimestamp}`
+    : `0 */${data.frg_interval} * * * start=${startOnTimestamp}`
 }
-const generateDaylyCronExpression = (delay: string, date: Date): string => {
+const generateDaylyCronExpression = (
+  data: UI_I_ScheduleNewTasksForm
+): string => {
   if (!date) return
 
-  // const minutes = date.getMinutes()
-  // const hours = date.getHours()
-  // const day = date.getDate()
+  const startOnTimestamp = 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 `0 0 */${delay} * *`
+  return endTimestamp
+    ? `0 0 */${data.frg_interval} * * start=${startOnTimestamp},end=${endTimestamp}`
+    : `0 0 */${data.frg_interval} * * start=${startOnTimestamp}`
+
   // return `${minutes} ${hours} ${day}/${delay} * *`
 }
 const generateWeeklyCronExpression = (
@@ -172,21 +187,39 @@ const generateWeeklyCronExpression = (
 ): string => {
   const { frg_on_week_days } = data
 
-  // Генерируем cron-выражение
-  return `* * * * ${frg_on_week_days.join(',')}`
+  const startOnTimestamp = Math.floor(
+    new Date(data.frg_start_on_time).getTime() / 1000
+  )
+  const endTimestamp = Math.floor(new Date(data.frg_end_time).getTime() / 1000)
+
+  return endTimestamp
+    ? `* * * * ${frg_on_week_days.join(',')}/${
+        data.frg_interval
+      } start=${startOnTimestamp},end=${endTimestamp}`
+    : `* * * * ${frg_on_week_days.join(',')}/${
+        data.frg_interval
+      } start=${startOnTimestamp}`
 }
+
 const generateMonthlyCronExpression = (
   data: UI_I_ScheduleNewTasksForm
 ): string => {
-  const { frg_interval, frg_monthly_day } = data
+  const { frg_interval, frg_monthly_day, frq_week_day, frq_ordinal_number } =
+    data
 
-  const startOn = new Date(data.frg_start_on_time)
-  const end = new Date(data.frg_end_time)
+  const startOnTimestamp = Math.floor(
+    new Date(data.frg_start_on_time).getTime() / 1000
+  )
+  const endTimestamp = Math.floor(new Date(data.frg_end_time).getTime() / 1000)
 
-  console.log(startOn, end)
+  const month = data.frg_monthly_mode === 'week' ? '*' : frg_monthly_day
+  const cronWeekly = `${frq_week_day}#${frq_ordinal_number}`
+  const dayOfWeek = data.frg_monthly_mode === 'week' ? cronWeekly : '*'
 
   // Генерируем cron-выражение
-  return `* * ${frg_monthly_day} */${frg_interval} *`
+  return endTimestamp
+    ? `* * ${month} */${frg_interval} ${dayOfWeek} start=${startOnTimestamp},end=${endTimestamp}`
+    : `* * ${month} */${frg_interval} ${dayOfWeek} start=${startOnTimestamp}`
 }
 
 const generateCronExpression = (
@@ -208,18 +241,10 @@ const generateCronExpression = (
       cronExpression = `0 0 0 0 0 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 = generateHourlyCronExpression(interval)
       break
     case 'day':
-      const dayDelay = interval.frg_interval
-      cronExpression = generateDaylyCronExpression(
-        dayDelay,
-        new Date(interval.frg_start_on_time)
-      )
+      cronExpression = generateDaylyCronExpression(interval)
       break
     case 'week':
       cronExpression = generateWeeklyCronExpression(interval)

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

@@ -13,6 +13,7 @@ export const scheduledTaskDefaultFormFunc = (): UI_I_ScheduleNewTasksForm => {
     frg_interval: 1,
     frg_end_time: '',
     frg_start_on_time: '',
+    frg_monthly_mode: 'day',
     frg_monthly_day: 0,
     frq_week_day: '',
     frq_ordinal_number: '',

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

@@ -11,6 +11,7 @@ export interface UI_I_ScheduleNewTasksForm {
   frg_interval: number
   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

package/package.json

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