From 13ff304369cd2f46ee437694ea8e9ca5e56108f6 Mon Sep 17 00:00:00 2001
From: Anton Romanov <a.romanov@ulstu.ru>
Date: Wed, 1 Feb 2023 22:50:04 +0400
Subject: [PATCH] #84 -- change page content

---
 .../controller/RecommendationController.java  |  2 +-
 src/main/resources/templates/assessments.html | 21 ++++++++++++++-----
 src/main/resources/templates/default.html     |  2 +-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/main/java/ru/ulstu/extractor/recommendation/controller/RecommendationController.java b/src/main/java/ru/ulstu/extractor/recommendation/controller/RecommendationController.java
index cb53532..750ef57 100644
--- a/src/main/java/ru/ulstu/extractor/recommendation/controller/RecommendationController.java
+++ b/src/main/java/ru/ulstu/extractor/recommendation/controller/RecommendationController.java
@@ -26,7 +26,7 @@ public class RecommendationController {
     }
 
     @GetMapping(ASSESSMENTS)
-    public String getRecommendations(Model model, @RequestParam Optional<Integer> branchId) {
+    public String getAssessments(Model model, @RequestParam Optional<Integer> branchId) {
         model.addAttribute("branches", branchService.findAll());
         if (branchId.isPresent()) {
             model.addAttribute("assessments", fuzzyInferenceService.getAssessments(branchId.get()));
diff --git a/src/main/resources/templates/assessments.html b/src/main/resources/templates/assessments.html
index 7d43881..c2cbb47 100644
--- a/src/main/resources/templates/assessments.html
+++ b/src/main/resources/templates/assessments.html
@@ -7,7 +7,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <div class="container" layout:fragment="content">
-    <form action="#" th:action="${@route.RECOMMENDATIONS}" th:object="${filterBranchForm}" method="get">
+    <form action="#" th:action="${@route.ASSESSMENTS}" th:object="${filterBranchForm}" method="get">
         <div class="row">
             <div class="col-md-2 col-sm-12">
                 Репозиторий-ветка
@@ -26,17 +26,28 @@
                     ])
                     ;
                     $('#select-branch').selectpicker('refresh');
-
                 </script>
             </div>
             <input type="submit" class="btn btn-outline-success  w-100" value="Применить фильтр"/>
         </div>
-        <div th:if="*{branchId == null}">Выбрерите ветку для получения рекомендаций</div>
+        <div th:if="*{branchId == null}">Выбрерите ветку для получения оценки репозитория</div>
 
         <input type="hidden" th:field="*{branchId}">
     </form>
-    <div th:each="recommendation: ${recommendations}">
-        <div th:text="${recommendation}"></div>
+    <div th:if="${assessments  != null}">
+        <h3>Состояние репозитория описывается следующими выражениями:</h3>
+        <div th:each="assessment: ${assessments}">
+            <div th:text="${assessment.consequent}"></div>
+            вследствие тенденции
+            <div th:text="${assessment.firstAntecedentTendency}"></div>
+            показателя
+            <div th:text="${assessment.firstAntecedent}"></div>
+            и тенденции
+            <div th:text="${assessment.secondAntecedentTendency}"></div>
+            показателя
+            <div th:text="${assessment.secondAntecedent}"></div>
+            и
+        </div>
     </div>
 </div>
 </html>
diff --git a/src/main/resources/templates/default.html b/src/main/resources/templates/default.html
index d118ca8..45c036d 100644
--- a/src/main/resources/templates/default.html
+++ b/src/main/resources/templates/default.html
@@ -41,7 +41,7 @@
                 <a class="nav-link" href="/listRules" th:text="Правила">Link</a>
             </li>
             <li class="nav-item">
-                <a class="nav-link" href="/recommendations" th:text="Рекомендации">Link</a>
+                <a class="nav-link" href="/assessments" th:text="Рекомендации">Link</a>
             </li>
         </ul>
     </div>