From e196150d3c672bd14e31271d428ed0bcd8040aba Mon Sep 17 00:00:00 2001
From: ArtemDzhereleiko <dgerik2015@gmail.com>
Date: Thu, 28 Oct 2021 11:21:03 +0300
Subject: [PATCH] Transfer units and dicimals fields to data tab

---
 .../widget/widget-config.component.html       | 31 ++++++++++++-------
 .../assets/locale/locale.constant-en_US.json  |  5 +--
 .../assets/locale/locale.constant-ru_RU.json  |  3 +-
 .../assets/locale/locale.constant-uk_UA.json  |  3 +-
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/widget/widget-config.component.html b/ui-ngx/src/app/modules/home/components/widget/widget-config.component.html
index 4f379d95d4..0121b07cf6 100644
--- a/ui-ngx/src/app/modules/home/components/widget/widget-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/widget-config.component.html
@@ -290,6 +290,26 @@
         </div>
       </mat-expansion-panel>
     </div>
+    <div [formGroup]="widgetSettings" class="mat-content mat-padding" fxLayout="column" fxLayoutGap="8px">
+      <mat-expansion-panel>
+        <mat-expansion-panel-header>
+          <mat-panel-title translate>widget-config.data-settings</mat-panel-title>
+        </mat-expansion-panel-header>
+        <ng-template matExpansionPanelContent>
+          <div fxLayout.xs="column" fxLayoutAlign.xs="center" fxLayout="row" fxLayoutAlign="start center"
+               fxLayoutGap="8px">
+            <mat-form-field fxFlex>
+              <mat-label translate>widget-config.units</mat-label>
+              <input matInput formControlName="units">
+            </mat-form-field>
+            <mat-form-field fxFlex>
+              <mat-label translate>widget-config.decimals</mat-label>
+              <input matInput formControlName="decimals" type="number" min="0" max="15" step="1">
+            </mat-form-field>
+          </div>
+        </ng-template>
+      </mat-expansion-panel>
+    </div>
   </mat-tab>
   <mat-tab label="{{ 'widget-config.settings' | translate }}">
     <div class="mat-content mat-padding" fxLayout="column">
@@ -447,17 +467,6 @@
             </ng-template>
           </mat-expansion-panel>
         </fieldset>
-        <div fxLayout.xs="column" fxLayoutAlign.xs="center" fxLayout="row" fxLayoutAlign="start center"
-             fxLayoutGap="8px">
-          <mat-form-field fxFlex>
-            <mat-label translate>widget-config.units</mat-label>
-            <input matInput formControlName="units">
-          </mat-form-field>
-          <mat-form-field fxFlex>
-            <mat-label translate>widget-config.decimals</mat-label>
-            <input matInput formControlName="decimals" type="number" min="0" max="15" step="1">
-          </mat-form-field>
-        </div>
       </div>
     </div>
   </mat-tab>
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index dd719d3258..7451e2c1b9 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -3028,7 +3028,7 @@
         "general-settings": "General settings",
         "display-title": "Display widget title",
         "drop-shadow": "Drop shadow",
-        "enable-fullscreen": "Allow fullscreen",
+        "enable-fullscreen": "Enable fullscreen",
         "background-color": "Background color",
         "text-color": "Text color",
         "padding": "Padding",
@@ -3076,7 +3076,8 @@
         "display-icon": "Display title icon",
         "icon-color": "Icon color",
         "icon-size": "Icon size",
-        "advanced-settings": "Advanced settings"
+        "advanced-settings": "Advanced settings",
+        "data-settings": "Data settings"
     },
     "widget-type": {
         "import": "Import widget type",
diff --git a/ui-ngx/src/assets/locale/locale.constant-ru_RU.json b/ui-ngx/src/assets/locale/locale.constant-ru_RU.json
index 65381458ce..d6fefd0e55 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ru_RU.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ru_RU.json
@@ -1678,7 +1678,8 @@
         "display-icon": "Показывать иконку в названии виджета",
         "icon-color": "Цвет иконки",
         "icon-size": "Размер иконки",
-        "advanced-settings": "Расширенные настройки"
+        "advanced-settings": "Расширенные настройки",
+        "data-settings": "Настройки данных"
     },
     "widget-type": {
         "import": "Импортировать тип виджета",
diff --git a/ui-ngx/src/assets/locale/locale.constant-uk_UA.json b/ui-ngx/src/assets/locale/locale.constant-uk_UA.json
index b4620a937d..0031ca2ad0 100644
--- a/ui-ngx/src/assets/locale/locale.constant-uk_UA.json
+++ b/ui-ngx/src/assets/locale/locale.constant-uk_UA.json
@@ -2250,7 +2250,8 @@
         "display-icon": "Показувати іконку у назві віджету",
         "icon-color": "Колір іконки",
         "icon-size": "Розмір іконки",
-        "advanced-settings": "Розширені налаштування"
+        "advanced-settings": "Розширені налаштування",
+        "data-settings": "Налаштування даних"
     },
     "widget-type": {
         "import": "Імпортувати тип віджета",