From 95e4ffc75360d03c96a14fc0257fa5a11336ecfb Mon Sep 17 00:00:00 2001
From: Maksim Zakharov <m.zakharov@IBS.RU>
Date: Mon, 25 Jul 2022 14:07:51 +0300
Subject: add datePicker, divider for motherboard

---
 .../Motherboard/Dynamic/MotherboardDynamicPage.vue | 114 +++++++++++++--------
 .../Processors/Dynamic/ProcessorsDynamicPage.vue   |   9 +-
 2 files changed, 77 insertions(+), 46 deletions(-)

(limited to 'src/views')

diff --git a/src/views/_sila/Motherboard/Dynamic/MotherboardDynamicPage.vue b/src/views/_sila/Motherboard/Dynamic/MotherboardDynamicPage.vue
index e08fab38..9c92a974 100644
--- a/src/views/_sila/Motherboard/Dynamic/MotherboardDynamicPage.vue
+++ b/src/views/_sila/Motherboard/Dynamic/MotherboardDynamicPage.vue
@@ -1,49 +1,77 @@
 <template>
   <b-container fluid="xl">
     <page-title :description="$t('appPageTitle.dynamicInformation')" />
-
-    <chart
-      type="motherboard"
-      :colors="colors"
-      :data="filteredSensors"
-      :warning="temperatureWarning"
-      :non-normal="temperatureNonNormal"
-      :critical-start="temperatureCriticalStart"
-    ></chart>
-    <b-table
-      v-if="items && items.length > 0"
-      responsive="md"
-      show-empty
-      table-variant="accessory"
-      hover
-      :items="items"
-      :fields="fields"
-      :empty-text="$t('global.table.emptyMessage')"
-    >
-      <template #cell(name)="{ value, index }">
-        <div
-          class="item-color"
-          :style="`background-color: ${colors[index]}`"
-        ></div>
-        {{ value }}
-      </template>
-      <template #cell(minDate)="{ value }">
-        <span style="color: rgb(12, 28, 41)">
-          {{ value.time }}
-        </span>
-        <span>
-          {{ value.date }}
-        </span>
-      </template>
-      <template #cell(maxDate)="{ value }">
-        <span style="color: rgb(12, 28, 41)">
-          {{ value.time }}
-        </span>
-        <span>
-          {{ value.date }}
-        </span>
-      </template>
-    </b-table>
+    <div class="custom-divider" style="margin-top: -2rem">
+      <b-button
+        v-b-toggle="id"
+        variant="collapse"
+        class="d-flex flex-nowrap justify-content-start"
+      >
+        <img src="@/assets/images/_sila/collapsed/temperature.svg" />
+        {{ $t('pageMotherboard.temperature') }}
+      </b-button>
+      <b-row class="align-items-end p-2">
+        <b-col xs="12" md="3" class="pt-2">
+          <b-form-group :label="$t('pageMotherboard.labels.warning')">
+            <b-form-input> </b-form-input>
+          </b-form-group>
+        </b-col>
+        <b-col xs="12" md="6" class="pt-2">
+          <b-button variant="primary" style="height: 35px">
+            {{ 'Сохранить' }}
+          </b-button>
+        </b-col>
+      </b-row>
+      <chart
+        type="motherboard"
+        :colors="colors"
+        :data="filteredSensors"
+        :warning="temperatureWarning"
+        :non-normal="temperatureNonNormal"
+        :critical-start="temperatureCriticalStart"
+      ></chart>
+      <b-table
+        v-if="items && items.length > 0"
+        responsive="md"
+        show-empty
+        table-variant="accessory"
+        hover
+        :items="items"
+        :fields="fields"
+        :empty-text="$t('global.table.emptyMessage')"
+      >
+        <template #cell(name)="{ value, index }">
+          <div
+            class="item-color"
+            :style="`background-color: ${colors[index]}`"
+          ></div>
+          {{ value }}
+        </template>
+        <template #cell(minDate)="{ value }">
+          <span style="color: rgb(12, 28, 41)">
+            {{ value.time }}
+          </span>
+          <span>
+            {{ value.date }}
+          </span>
+        </template>
+        <template #cell(maxDate)="{ value }">
+          <span style="color: rgb(12, 28, 41)">
+            {{ value.time }}
+          </span>
+          <span>
+            {{ value.date }}
+          </span>
+        </template>
+      </b-table>
+      <chart
+        type="motherboard"
+        :data="filteredSensors"
+        :warning="temperatureWarning"
+        :non-normal="temperatureNonNormal"
+        :critical-start="temperatureCriticalStart"
+      ></chart>
+    </div>
   </b-container>
 </template>
 
diff --git a/src/views/_sila/Processors/Dynamic/ProcessorsDynamicPage.vue b/src/views/_sila/Processors/Dynamic/ProcessorsDynamicPage.vue
index 1d6dc597..63133249 100644
--- a/src/views/_sila/Processors/Dynamic/ProcessorsDynamicPage.vue
+++ b/src/views/_sila/Processors/Dynamic/ProcessorsDynamicPage.vue
@@ -1,16 +1,17 @@
 <template>
   <b-container fluid="xl">
     <page-title :description="$t('appPageTitle.dynamicInformation')" />
+    <table-date-picker style="margin: -2rem 0 0 -2rem" />
     <collapse
       id="collapse_1"
       :title="$t('pageProcessors.temperature')"
-      style="margin-top: -2rem"
+      style="margin-top: 0"
     >
       <template #image>
         <img src="@/assets/images/_sila/collapsed/temperature.svg" />
       </template>
       <page-section>
-        <b-row class="align-items-end pt-2">
+        <b-row class="align-items-end p-2">
           <b-col xs="12" md="6" lg="3" class="pt-2">
             <b-form-group :label="$t('pageProcessors.labels.notNormal')">
               <b-form-input
@@ -105,6 +106,7 @@ import Chart from '@/components/_sila/Global/Chart';
 import PageSection from '@/components/Global/PageSection';
 
 import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin';
+import TableDatePicker from '@/components/_sila/Global/TableDatePicker';
 import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
 import TableFilterMixin from '@/components/_sila/Mixins/TableFilterMixin';
 import Collapse from '@/components/_sila/Global/Collapse';
@@ -112,7 +114,7 @@ import Collapse from '@/components/_sila/Global/Collapse';
 import { getItems } from '@/utilities/_sila/metricProperties';
 
 export default {
-  components: { PageTitle, Collapse, PageSection, Chart },
+  components: { PageTitle, Collapse, PageSection, Chart, TableDatePicker },
   mixins: [DataFormatterMixin, LoadingBarMixin, TableFilterMixin],
   data() {
     return {
@@ -135,6 +137,7 @@ export default {
         {
           key: 'name',
           label: this.$t('pageProcessors.table.name'),
+          thStyle: { width: '25%' },
         },
         {
           key: 'current',
-- 
cgit v1.2.3