romanov73/time-series-smoothing
1
0
Fork 0
Code Issues 4 Pull Requests 1 Projects Releases Wiki Activity

#3 -- fix ui

Browse Source
This commit is contained in:
Anton Romanov 2022-04-20 17:32:58 +04:00
parent 59b5d2bde3
commit 4417fc2ceb
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/resources/templates/index.html
View File

@ -97,8 +97,8 @@
</script> </script>
<form action="#" th:action="chart" th:object="${chartForm}"> <form action="#" th:action="chart" th:object="${chartForm}">
<div class="row"> <div class="row">
<div class="col-3"> <div class="col-md-12 col-sm-12 col-lg-6">
<select id="select-set" class="selectpicker" data-live-search="true" th:field="*{set}" <select id="select-set" class="selectpicker form-group" data-live-search="true" th:field="*{set}"
data-width="90%" onchange="$('#select-ts').val(''); form.submit();"> data-width="90%" onchange="$('#select-ts').val(''); form.submit();">
<option value="">Набор временных рядов</option> <option value="">Набор временных рядов</option>
<option th:each="set : ${sets}" <option th:each="set : ${sets}"
@ -112,7 +112,8 @@
</script> </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();"> data-width="90%" onchange="form.submit();">
<option value="">Временной ряд</option> <option value="">Временной ряд</option>
<option th:each="ts : ${listTimeSeries}" <option th:each="ts : ${listTimeSeries}"
@ -123,6 +124,7 @@
<script th:inline="javascript" th:if="*{timeSeriesMeta != null}"> <script th:inline="javascript" th:if="*{timeSeriesMeta != null}">
$('#select-ts').val([[*{timeSeriesMeta.key}]]); $('#select-ts').val([[*{timeSeriesMeta.key}]]);
$('#select-ts').selectpicker('refresh'); $('#select-ts').selectpicker('refresh');
</script> </script>
<div th:if="${forecastDescription != null && forecastDescription.timeSeriesMethod != null}"> <div th:if="${forecastDescription != null && forecastDescription.timeSeriesMethod != null}">
@ -130,8 +132,8 @@
<p> Оценка: <span th:text="${forecastDescription.score.value}"> </span> <p> Оценка: <span th:text="${forecastDescription.score.value}"> </span>
</div> </div>
</div> </div>
<div class="col-9"> <div class="col-md-12 col-sm-12 col-lg-6">
<div id="chart" style="width: 550px; height: 400px; margin: 0 auto"></div> <div id="chart" style="width: 600px; height: 500px;"></div>
</div> </div>
</div> </div>
</form> </form>

15
src/main/resources/templates/method.html
View File

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