bfg-common 1.4.326 → 1.4.328

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

@@ -1,42 +1,110 @@
 <template>
   <Teleport to="body">
-    <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')"
-    />
+    <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>
   </Teleport>
 </template>
 
 <script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
 const props = defineProps<{
   version: string
-  isBeta: boolean
+  isBetaVersion: boolean
   isDev: boolean
   projectName: string
 }>()
+
 const emits = defineEmits<{
   (event: 'hide'): void
 }>()
 
-const { $store }: any = useNuxtApp()
+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 companyWebSitePath = ref<string>('https://iridium-soft.com/')
+const localization = computed<UI_I_Localization>(() => useLocal())
 
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+const url = ref<string>('https://iridium-soft.com/')
 </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="isBeta"
+    :is-beta-version="isBeta"
     :is-dev="isDev"
     :project-name="props.projectName"
     @hide="isShowAbout = false"

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

@@ -25,7 +25,7 @@ export const generateWeeklyCronExpression = (
   const daysOfWeek = frg_on_week_days.join(',')
 
   return endTimestamp
-    ? `* * * * ${daysOfWeek} ${startTimestamp}-${endTimestamp}:0-0-0-${data.frg_interval}`
+    ? `* * * * ${daysOfWeek} ${startTimestamp}-${endTimestamp}:0-0-${data.frg_interval}-0`
     : `* * * * ${daysOfWeek} ${startTimestamp}:0-0-0-${data.frg_interval}`
 }
 
@@ -54,7 +54,7 @@ export const generateMonthlyCronExpression = (
   )
   const endTimestamp = Math.floor(new Date(data.frg_end_time).getTime() / 1000)
 
-  const daysOfWeek = `${frq_week_day}#${frq_ordinal_number}`
+  const ordinaryDaysOfWeek = `${frq_ordinal_number}`
 
   const timestamp = endTimestamp
     ? `${startTimestamp}-${endTimestamp}`
@@ -62,6 +62,6 @@ export const generateMonthlyCronExpression = (
 
   // Генерируем cron-выражение
   return data.frg_monthly_mode === 'week'
-    ? `* * * * * ${timestamp}:0-0-${frg_interval}-${daysOfWeek}`
-    : `* * ${frg_monthly_day} */${frg_interval} * ${timestamp}:0-0-0-0`
+    ? `* * * * ${frq_week_day} ${timestamp}:0-0-${ordinaryDaysOfWeek}-${frg_interval}`
+    : `* * ${frg_monthly_day} * * ${timestamp}:0-0-0-${frg_interval}`
 }

package/package.json

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

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

@@ -1,114 +0,0 @@
-<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 class="about-modal__text">
-          <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"
-            class="about-modal__description-link"
-          >
-            {{ props.url }} </a
-          >)
-
-          {{ aboutDesc2 }}
-        </div>
-      </ui-modal-block-standard>
-    </template>
-    <template #footerContent><span /></template>
-    <template #footerLeftContent><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 {
-  &__text {
-    color: #4d5d69;
-    font-size: 13px;
-    font-weight: 400;
-    line-height: 15.73px;
-    p:last-child {
-      margin: 16px 0;
-    }
-  }
-  &__description {
-    color: #4d5d69;
-    font-size: 13px;
-    font-weight: 400;
-    line-height: 15.73px;
-    &-link {
-      color: #0786d2;
-      &:hover {
-        color: #0081c1;
-      }
-    }
-  }
-}
-:deep(.title-wrapper__subtitle) {
-  max-width: 400px;
-}
-</style>

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

@@ -1,110 +0,0 @@
-<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>