bfg-common 1.4.861 → 1.4.862

package/assets/localization/local_en.json

@@ -2319,7 +2319,8 @@
     "submit": "Submit",
     "up": "Up",
     "speed": "Speed",
-    "incorrectConfirmation": "Incorrect confirmation. Please type “{0}” to proceed."
+    "incorrectConfirmation": "Incorrect confirmation. Please type “{0}” to proceed.",
+    "options": "Options"
   },
   "auth": {
     "welcomeTo": "Welcome to",
@@ -2758,7 +2759,9 @@
     "totalCapacity": "Total Capacity",
     "usedReservation": "Used Reservation",
     "availableCapacity": "Available Capacity",
-    "dateTimeIsoFormat": "Date and time are in ISO 8601 format."
+    "dateTimeIsoFormat": "Date and time are in ISO 8601 format.",
+    "deleteConfirmationChartOption": "Delete Confirmation",
+    "deleteConfirmationChartOptionDesc": "Are you sure you want to remove chart options “{0}” from “Default”."
   },
   "inventoryTabs": {
     "summary": "Summary",

package/assets/localization/local_hy.json

@@ -2319,7 +2319,8 @@
     "submit": "Ներկայացնել",
     "up": "Վեր",
     "speed": "Արագություն",
-    "incorrectConfirmation": "Սխալ հաստատում: Շարունակելու համար խնդրում ենք մուտքագրել \" {0}\":"
+    "incorrectConfirmation": "Սխալ հաստատում: Շարունակելու համար խնդրում ենք մուտքագրել \" {0}\":",
+    "options": "Ընտրանքներ"
   },
   "auth": {
     "welcomeTo": "Բարի գալուստ",
@@ -2758,7 +2759,9 @@
     "totalCapacity": "Ընդհանուր տարածություն",
     "usedReservation": "Օգտագործված ամրագրում",
     "availableCapacity": "Առկա տարածություն",
-    "dateTimeIsoFormat": "Ամսաթիվը եւ ժամը ISO 8601 ձեւաչափով են:"
+    "dateTimeIsoFormat": "Ամսաթիվը եւ ժամը ISO 8601 ձեւաչափով են:",
+    "deleteConfirmationChartOption": "Ջնջել հաստատումը",
+    "deleteConfirmationChartOptionDesc": "Համոզվա՞ծ եք, որ ցանկանում եք հեռացնել «{0}» գծապատկերի ընտրանքները «Լռակյացից»:"
   },
   "inventoryTabs": {
     "summary": "Ամփոփում",

package/assets/localization/local_kk.json

@@ -2318,7 +2318,8 @@
     "submit": "Бағыну",
     "up": "Бойымен",
     "speed": "Жылдамдық",
-    "incorrectConfirmation": "Қате растау. Жалғастыру үшін \"{0}\" теріңіз."
+    "incorrectConfirmation": "Қате растау. Жалғастыру үшін \"{0}\" теріңіз.",
+    "options": "Параметрлер"
   },
   "auth": {
     "welcomeTo": "Қош келдіңіз",
@@ -2757,7 +2758,9 @@
     "totalCapacity": "Жалпы Сыйымдылығы",
     "usedReservation": "Пайдаланылған Брондау",
     "availableCapacity": "Қолжетімді Сыйымдылық",
-    "dateTimeIsoFormat": "Күн мен уақыт ISO 8601. форматында"
+    "dateTimeIsoFormat": "Күн мен уақыт ISO 8601. форматында",
+    "deleteConfirmationChartOption": "Растауды жою",
+    "deleteConfirmationChartOptionDesc": "\"{0}\" диаграмма опцияларын \"Әдепкіден\" өшіргіңіз келетініне сенімдісіз бе."
   },
   "inventoryTabs": {
     "summary": "Түйіндеме",

package/assets/localization/local_ru.json

@@ -2320,7 +2320,8 @@
     "submit": "Представлять на рассмотрение",
     "up": "Вверх",
     "speed": "Скорость",
-    "incorrectConfirmation": "Неверное подтверждение. Пожалуйста, введите “{0}”, чтобы продолжить."
+    "incorrectConfirmation": "Неверное подтверждение. Пожалуйста, введите “{0}”, чтобы продолжить.",
+    "options": "Параметры"
   },
   "auth": {
     "welcomeTo": "Добро пожаловать в",
@@ -2759,7 +2760,9 @@
     "totalCapacity": "Общая вместимость",
     "usedReservation": "Использованное бронирование",
     "availableCapacity": "Доступная емкость",
-    "dateTimeIsoFormat": "Дата и время в формате ISO 8601."
+    "dateTimeIsoFormat": "Дата и время в формате ISO 8601.",
+    "deleteConfirmationChartOption": "Подтверждение удаления",
+    "deleteConfirmationChartOptionDesc": "Вы уверены, что хотите удалить параметры диаграммы «{0}» из «По умолчанию»?"
   },
   "inventoryTabs": {
     "summary": "Сводка",

package/assets/localization/local_zh.json

@@ -2317,7 +2317,8 @@
     "submit": "提交",
     "up": "向上",
     "speed": "速度",
-    "incorrectConfirmation": "不正确的确认。 请输入\"{0}\"继续。"
+    "incorrectConfirmation": "不正确的确认。 请输入\"{0}\"继续。",
+    "options": "选项"
   },
   "auth": {
     "welcomeTo": "欢迎来到",
@@ -2756,7 +2757,9 @@
     "totalCapacity": "总容量",
     "usedReservation": "已使用的预订",
     "availableCapacity": "可用容量",
-    "dateTimeIsoFormat": "日期和时间为ISO 8601格式。"
+    "dateTimeIsoFormat": "日期和时间为ISO 8601格式。",
+    "deleteConfirmationChartOption": "删除确认",
+    "deleteConfirmationChartOptionDesc": "您确定要从“默认”中删除图表选项“{0}”吗？"
   },
   "inventoryTabs": {
     "summary": "概括",

package/components/common/chartOptionsModal/counters/timespan/form/Form.vue

@@ -1,223 +1,39 @@
 <template>
-  <div class="chart-option-timespan-split">
-    <div class="vertical-flex-container">
-      <div class="timespan-objects-section-direction">
-        <label for="chart-timespan-type-select"
-          >{{ localization.inventoryMonitor.timespan }}:</label
-        >
-        <div class="vertical-flex-container chart-option-timespan-settings">
-          <div class="timespan-select chart-option-setting-row">
-            <div class="view-select-label horizontal-flex-container">
-              <div class="select">
-                <select
-                  id="chart-timespan-type-select"
-                  v-model="localSelectedTimespan"
-                  data-id="chart-timespan-type-select"
-                >
-                  <option
-                    v-for="(item, index) in timespanOptions"
-                    :key="index"
-                    :value="item.value"
-                  >
-                    {{ item.text }}
-                  </option>
-                </select>
-              </div>
-            </div>
-          </div>
-          <div
-            :class="[
-              'custom-timespan-settings-container',
-              { active: localSelectedTimespan === 'custom_interval' },
-            ]"
-          >
-            <table>
-              <tbody>
-                <tr>
-                  <td class="relative">
-                    <input
-                      id="custom-time-lastInput"
-                      v-model="localPeriodType"
-                      data-id="custom-time-lastInput"
-                      type="radio"
-                      value="last"
-                      class="custom-radio-button"
-                      name="lastFrom"
-                    />
-                    <label
-                      for="custom-time-lastInput"
-                      class="custom-radio-label"
-                    >
-                      {{ periodTypeText }}:
-                    </label>
-                  </td>
-                  <td>
-                    <div
-                      :class="[
-                        'custom-timespan-type-last-container',
-                        { active: localPeriodType === 'last' },
-                      ]"
-                    >
-                      <input
-                        id="chart-option-setting-row"
-                        v-model="localLast"
-                        data-id="chart-option-setting-row"
-                        type="number"
-                        class="chart-option-setting-row custom-time-input"
-                      />
-                      <div
-                        class="chart-option-setting-row custom-time-input inline-block"
-                      >
-                        <div
-                          class="view-select-label horizontal-flex-container"
-                        >
-                          <div class="select">
-                            <select
-                              id="chart-timespan-type-select"
-                              v-model="localSelectedCustomTime"
-                              data-id="chart-timespan-type-select"
-                            >
-                              <option
-                                v-for="(item, index) in customTimeOptions"
-                                :key="index"
-                                :value="item.value"
-                              >
-                                {{ item.text }}
-                              </option>
-                            </select>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </td>
-                </tr>
-                <tr>
-                  <td class="relative">
-                    <input
-                      id="custom-time-fromInput"
-                      v-model="localPeriodType"
-                      data-id="custom-time-from-input"
-                      type="radio"
-                      value="period"
-                      class="custom-radio-button"
-                      name="lastFrom"
-                    />
-                    <label
-                      for="custom-time-fromInput"
-                      class="custom-radio-label text-capitalize text-right"
-                      >{{ localization.common.from2 }}:
-                    </label>
-                  </td>
-                  <td>
-                    <div
-                      :class="[
-                        'date-container-row disabled-container calendar-date-row',
-                        { active: localPeriodType === 'period' },
-                      ]"
-                    >
-                      <input
-                        id="current-date-from"
-                        v-model.lazy="localCurrentDateFrom"
-                        data-id="current-date-from-input"
-                        type="text"
-                        class="chart-option-setting-row custom-time-input first-from"
-                      />
-                      <div class="section-datepicker">
-                        <atoms-datepicker
-                          v-model="dateFrom"
-                          :lang="props.language"
-                          class="calendar-from calendar-popup btn-show-hide-calendar"
-                          @update="onUpdateDateFrom"
-                        />
-                      </div>
-                      <input
-                        id="current-time-from"
-                        v-model="currentTimeFrom"
-                        data-id="current-time-from-input"
-                        type="text"
-                        class="chart-option-setting-row custom-time-input"
-                      />
-                    </div>
-                  </td>
-                </tr>
-                <tr>
-                  <td class="custom-time-label-text text-right">
-                    {{ localization.common.to2 }}:
-                  </td>
-                  <td>
-                    <div
-                      :class="[
-                        'date-container-row disabled-container calendar-date-row',
-                        { active: localPeriodType === 'period' },
-                      ]"
-                    >
-                      <input
-                        id="current-date-to"
-                        v-model.lazy="currentDateTo"
-                        data-id="current-date-to-input"
-                        type="text"
-                        class="chart-option-setting-row custom-time-input first-to"
-                      />
-                      <div class="section-datepicker">
-                        <atoms-datepicker
-                          v-model="dateTo"
-                          :lang="props.language"
-                          class="calendar-from calendar-popup btn-show-hide-calendar"
-                          @update="onUpdateDateTo"
-                        />
-                      </div>
-                      <input
-                        id="current-time-to"
-                        v-model="currentTimeTo"
-                        data-id="current-time-to-input"
-                        type="text"
-                        class="chart-option-setting-row custom-time-input"
-                      />
-                    </div>
-                  </td>
-                </tr>
-                <tr>
-                  <td></td>
-                  <td
-                    :class="[
-                      'disabled-container',
-                      { active: localPeriodType === 'period' },
-                    ]"
-                  >
-                    <span>
-                      ({{ localization.inventoryMonitor.isoTimeFormat }})
-                    </span>
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-        </div>
-      </div>
-      <div class="horizontal-flex-container chart-type-container">
-        <div class="view-select-label horizontal-flex-container">
-          <label for="chart-type-select" class="label-select"
-            >{{ localization.inventoryMonitor.chartType }}:</label
-          >
-          <div class="select">
-            <select
-              id="chart-type-select"
-              v-model="chartType"
-              data-id="chart-type-select"
-            >
-              <option
-                v-for="(item, index) in chartTypeOptions"
-                :key="index"
-                :value="item.value"
-              >
-                {{ item.text }}
-              </option>
-            </select>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
+  <common-chart-options-modal-counters-timespan-form-new
+    v-if="isNewView"
+    v-model:local-selected-timespan="localSelectedTimespan"
+    v-model:local-period-type="localPeriodType"
+    v-model:local-last="localLast"
+    v-model:local-selected-custom-time="localSelectedCustomTime"
+    v-model:local-current-date-from="localCurrentDateFrom"
+    v-model:current-time-from="currentTimeFrom"
+    v-model:current-time-to="currentTimeTo"
+    v-model:current-date-to="currentDateTo"
+    :timespan-options="timespanOptions"
+    :custom-time-options="customTimeOptions"
+    :language="props.language"
+  />
+  <common-chart-options-modal-counters-timespan-form-old
+    v-else
+    v-model:local-selected-timespan="localSelectedTimespan"
+    v-model:local-period-type="localPeriodType"
+    v-model:local-last="localLast"
+    v-model:local-selected-custom-time="localSelectedCustomTime"
+    v-model:local-current-date-from="localCurrentDateFrom"
+    v-model:date-from="dateFrom"
+    v-model:current-date-to="currentDateTo"
+    v-model:date-to="dateTo"
+    v-model:current-time-to="currentTimeTo"
+    v-model:chart-type="chartType"
+    :timespan-options="timespanOptions"
+    :period-type-text="periodTypeText"
+    :custom-time-options="customTimeOptions"
+    :language="props.language"
+    :current-time-from="currentTimeFrom"
+    :chart-type-options="chartTypeOptions"
+    @update-date-from="onUpdateDateFrom"
+    @update-date-to="onUpdateDateTo"
+  />
 </template>
 
 <script setup lang="ts">
@@ -256,7 +72,10 @@ const emits = defineEmits<{
   (event: 'update-custom-time-to', value: string): void
 }>()
 
-const { $formattedDate, $isDate, $getTimeFormat, $getUnixByDate } = useNuxtApp()
+const { $store, $formattedDate, $isDate, $getTimeFormat, $getUnixByDate }: any =
+  useNuxtApp()
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
@@ -449,96 +268,4 @@ onMounted(() => {
 })
 </script>
 
-<style scoped lang="scss">
-.chart-option-timespan-split {
-  overflow-x: auto;
-  //flex-basis: 56%;
-  padding: 5px;
-
-  .timespan-objects-section-direction {
-    display: flex;
-    flex-direction: row;
-    align-items: flex-start;
-
-    .chart-option-timespan-settings {
-      margin-left: 15px;
-
-      .chart-option-setting-row {
-        width: 150px;
-        margin-bottom: 5px;
-      }
-
-      .custom-radio-button {
-        position: absolute;
-        opacity: 0;
-
-        &:checked + .custom-radio-label:before {
-          box-shadow: inset 0 0 0 6px #0079b8;
-          border: none;
-        }
-      }
-      .custom-radio-label {
-        display: block;
-        position: relative;
-        min-height: 19.2px;
-        padding-left: 23px;
-        cursor: pointer;
-        line-height: 19.2px;
-        //color: #454545;
-
-        &:before {
-          position: absolute;
-          top: 3px;
-          left: 0;
-          content: '';
-          display: inline-block;
-          height: 16px;
-          width: 16px;
-          border: 0.8px solid #565656;
-          border-radius: 50%;
-        }
-      }
-
-      .calendar-date-row {
-        display: flex;
-        align-items: center;
-
-        .custom-time-input.first-from,
-        .custom-time-input.first-to {
-          max-width: 114px;
-        }
-        .btn-show-hide-calendar {
-          margin: 0 9px;
-          cursor: pointer;
-        }
-      }
-
-      .custom-time-input {
-        margin-left: 8px;
-        margin-right: 8px;
-        max-width: 140px;
-      }
-    }
-
-    .custom-timespan-settings-container:not(.active),
-    .custom-timespan-type-last-container:not(.active),
-    .disabled-container:not(.active) {
-      opacity: 0.6;
-      pointer-events: none;
-    }
-  }
-
-  .chart-type-container {
-    margin-top: 15px;
-
-    .horizontal-flex-container {
-      display: flex;
-      flex-direction: row;
-
-      .select {
-        margin-left: 15px;
-      }
-    }
-  }
-}
-</style>
+<style scoped lang="scss"></style>