From 4417fc2ceb25710c561044031b31d9b952662cc5 Mon Sep 17 00:00:00 2001
From: Anton Romanov <a.romanov@ulstu.ru>
Date: Wed, 20 Apr 2022 17:32:58 +0400
Subject: [PATCH] #3 -- fix ui

---
 src/main/resources/templates/index.html  | 12 +++++++-----
 src/main/resources/templates/method.html | 15 +++++++++------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 00d1cd3..ee61663 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -97,8 +97,8 @@
     </script>
     <form action="#" th:action="chart" th:object="${chartForm}">
         <div class="row">
-            <div class="col-3">
-                <select id="select-set" class="selectpicker" data-live-search="true" th:field="*{set}"
+            <div class="col-md-12 col-sm-12 col-lg-6">
+                <select id="select-set" class="selectpicker form-group" data-live-search="true" th:field="*{set}"
                         data-width="90%" onchange="$('#select-ts').val(''); form.submit();">
                     <option value="">Набор временных рядов</option>
                     <option th:each="set : ${sets}"
@@ -112,7 +112,8 @@
 
                 </script>
 
-                <select id="select-ts" class="selectpicker" data-live-search="true" th:field="*{timeSeriesMeta}"
+                <select id="select-ts" class="selectpicker form-group" data-live-search="true"
+                        th:field="*{timeSeriesMeta}"
                         data-width="90%" onchange="form.submit();">
                     <option value="">Временной ряд</option>
                     <option th:each="ts : ${listTimeSeries}"
@@ -123,6 +124,7 @@
                 <script th:inline="javascript" th:if="*{timeSeriesMeta != null}">
                     $('#select-ts').val([[*{timeSeriesMeta.key}]]);
                     $('#select-ts').selectpicker('refresh');
+
                 </script>
 
                 <div th:if="${forecastDescription != null && forecastDescription.timeSeriesMethod != null}">
@@ -130,8 +132,8 @@
                     <p> Оценка: <span th:text="${forecastDescription.score.value}"> </span>
                 </div>
             </div>
-            <div class="col-9">
-                <div id="chart" style="width: 550px; height: 400px; margin: 0 auto"></div>
+            <div class="col-md-12 col-sm-12 col-lg-6">
+                <div id="chart" style="width: 600px; height: 500px;"></div>
             </div>
         </div>
     </form>
diff --git a/src/main/resources/templates/method.html b/src/main/resources/templates/method.html
index 9ee0aa4..bdf89a4 100644
--- a/src/main/resources/templates/method.html
+++ b/src/main/resources/templates/method.html
@@ -102,8 +102,8 @@
     </script>
     <form action="#" th:action="chartMethod" th:object="${chartForm}">
         <div class="row">
-            <div class="col-3">
-                <select id="select-set" class="selectpicker" data-live-search="true" th:field="*{set}"
+            <div class="col-md-12 col-sm-12 col-lg-6">
+                <select id="select-set" class="selectpicker form-group" data-live-search="true" th:field="*{set}"
                         data-width="90%" onchange="$('#select-ts').val(''); form.submit();">
                     <option value="">Набор временных рядов</option>
                     <option th:each="set : ${sets}"
@@ -118,7 +118,8 @@
 
                 </script>
 
-                <select id="select-ts" class="selectpicker" data-live-search="true" th:field="*{timeSeriesMeta}"
+                <select id="select-ts" class="selectpicker form-group" data-live-search="true"
+                        th:field="*{timeSeriesMeta}"
                         data-width="90%" onchange="form.submit();">
                     <option value="">Временной ряд</option>
                     <option th:each="ts : ${listTimeSeries}"
@@ -132,7 +133,8 @@
 
                 </script>
 
-                <select id="select-method" class="selectpicker" data-live-search="true" th:field="*{methodClassName}"
+                <select id="select-method" class="selectpicker form-group" data-live-search="true"
+                        th:field="*{methodClassName}"
                         data-width="90%" onchange="form.submit();">
                     <option value="">Метод прогнозирования</option>
                     <option th:each="method : ${methods}"
@@ -144,6 +146,7 @@
                     $('#select-method').val([[*{methodClassName}]]);
                     $('#select-method').selectpicker('refresh');
 
+
                 </script>
 
                 <div th:if="${forecastDescription != null && forecastDescription.timeSeriesMethod != null}">
@@ -151,8 +154,8 @@
                     <p> Оценка: <span th:text="${forecastDescription.score.value}"> </span>
                 </div>
             </div>
-            <div class="col-9">
-                <div id="chart" style="width: 550px; height: 400px; margin: 0 auto"></div>
+            <div class="col-md-12 col-sm-12 col-lg-6">
+                <div id="chart" style="width: 600px; height: 500px;"></div>
             </div>
         </div>
     </form>