From 0e6db5187d54996720a43f9be0f12652451cd127 Mon Sep 17 00:00:00 2001
From: Anton Romanov <a.romanov@ulstu.ru>
Date: Fri, 28 Feb 2025 22:01:44 +0400
Subject: [PATCH] #4 -- Add and remove consequent

---
 src/main/resources/application.properties      | 1 -
 src/main/resources/public/js/fuzzyRule.js      | 4 +++-
 src/main/resources/templates/project/edit.html | 4 ++--
 src/main/resources/templates/rule/edit.html    | 6 +++++-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 05d3866..9274ab1 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -9,7 +9,6 @@ logging.level.javax.management.remote.rmi=off
 logging.level.java.rmi.server=off
 logging.level.org.apache.tomcat=INFO
 logging.level.org.apache.tomcat.util.net=WARN
-extractor.custom-projects-dir=
 server.error.include-stacktrace=always
 server.error.include-exception=true
 server.error.include-message=always
diff --git a/src/main/resources/public/js/fuzzyRule.js b/src/main/resources/public/js/fuzzyRule.js
index 3536ea6..b675619 100644
--- a/src/main/resources/public/js/fuzzyRule.js
+++ b/src/main/resources/public/js/fuzzyRule.js
@@ -73,7 +73,9 @@ function errorHandler(response, callBack, errorCallBack) {
 function getFromRest(url, callBack) {
     $.ajax({
         url: url,
-        cache: false,
+        method: 'get',
+        cache: true,
+        dataType: 'json',
         success: function (response) {
             errorHandler(response, callBack);
         }
diff --git a/src/main/resources/templates/project/edit.html b/src/main/resources/templates/project/edit.html
index 2c34e19..9ab2669 100644
--- a/src/main/resources/templates/project/edit.html
+++ b/src/main/resources/templates/project/edit.html
@@ -40,7 +40,7 @@
                     </div>
                 </div>
             </div>
-            <a th:href="@{'/variable/edit/' + ${projectId}+'/0'}" class="btn btn-outline-dark">Добавить преременную</a>
+            <a th:href="@{'/variable/edit/' + ${projectId}+'/0'}" class="btn btn-outline-dark">Добавить переменную</a>
         </div>
         <div class="col col-md-6">
             <h4> Список правил</h4>
@@ -58,7 +58,7 @@
         </div>
     </div>
     <script type="text/javascript" src="/js/fuzzyRule.js"></script>
-    <script>
+    <script type="text/javascript">
         function addRule(index, el, rule) {
             let ruleHtml = "<div class='col col-md-12'><span class='badge badge-light'>" + (index + 1) + ". Если</span></div>"
             let antecedentComponents = getAntecedentComponents(getAntecedent(rule));
diff --git a/src/main/resources/templates/rule/edit.html b/src/main/resources/templates/rule/edit.html
index 8d7908c..a2882a9 100644
--- a/src/main/resources/templates/rule/edit.html
+++ b/src/main/resources/templates/rule/edit.html
@@ -34,6 +34,10 @@
             </div>
             <label class="col col-md-1 m-2">То</label>
             <div id="rulesConsequent"></div>
+            <div>
+                <a href="#" class="btn btn-outline-dark"
+                   th:onclick="addConsequent($('#rulesConsequent'), $('#projectId').val());">+</a>
+            </div>
         </div>
         <div class="form-group">
             <button name="save" type="submit" class="btn btn-outline-dark">Сохранить</button>
@@ -46,7 +50,7 @@
             <a th:href="@{'/project/edit/' + ${projectId}}" class="btn btn-outline-dark">Отмена</a>
         </div>
         <script type="text/javascript" src="/js/fuzzyRule.js"></script>
-        <script>
+        <script type="text/javascript">
             let ruleContentEl = $('#ruleContent');
             let projectIdEl = $('#projectId');
             if ($(ruleContentEl).val()) {