#5 -- Show and edit rules

src/main/java/ru/ulstu/fc/rule/controller/RuleController.java

@@ -25,9 +25,9 @@ public class RuleController {
             @PathVariable(value = "ruleId") Integer id, Model model) {
         model.addAttribute("projectId", projectId);
         model.addAttribute("rule",
-                new RuleForm((id != null && id != 0)
+                new RuleForm(id, (id != null && id != 0)
-                        ? ruleService.getById(id)
+                        ? ruleService.getById(id).getProject().getId()
-                        : new FuzzyRule()));
+                        : projectId));
 
         return "rule/edit";
     }

src/main/java/ru/ulstu/fc/rule/model/RuleForm.java

@@ -3,15 +3,14 @@ package ru.ulstu.fc.rule.model;
 public class RuleForm {
     private Integer id;
     private Integer projectId;
-    private String value;
+    private String content;
 
     public RuleForm() {
     }
 
-    public RuleForm(FuzzyRule rule) {
+    public RuleForm(Integer id, Integer projectId) {
-        this.projectId = (rule == null || rule.getProject() == null)
+        this.id = id;
-                ? null
+        this.projectId = projectId;
-                : rule.getProject().getId();
     }
 
     public Integer getProjectId() {
@@ -30,12 +29,12 @@ public class RuleForm {
         this.projectId = projectId;
     }
 
-    public String getValue() {
+    public String getContent() {
-        return value;
+        return content;
     }
 
-    public void setValue(String value) {
+    public void setContent(String content) {
-        this.value = value;
+        this.content = content;
     }
 
 }

src/main/java/ru/ulstu/fc/rule/service/RuleService.java

@@ -24,15 +24,15 @@ public class RuleService {
     }
 
     public Object save(RuleForm ruleForm) {
-        if (ruleForm.getId() == null) {
+        if (ruleForm.getId() == null || ruleForm.getId() == 0) {
             FuzzyRule rule = new FuzzyRule();
             rule.setProject(projectService.getById(ruleForm.getProjectId()));
-            rule.setContent(ruleForm.getValue());
+            rule.setContent(ruleForm.getContent());
             return ruleRepository.save(rule);
         }
         FuzzyRule dbRule = getById(ruleForm.getId());
         dbRule.setProject(projectService.getById(ruleForm.getProjectId()));
-        dbRule.setContent(ruleForm.getValue());
+        dbRule.setContent(ruleForm.getContent());
         return ruleRepository.save(dbRule);
     }
 

src/main/resources/templates/project/edit.html

@@ -40,9 +40,9 @@
     <h4> Список правил</h4>
     <div class="row" th:each="r, iter : ${rules}">
         <div class="col col-md-12">
-            <span class="badge badge-light" th:text="${iter} + ' Если'"></span>
+            <span class="badge badge-light" th:text="${iter.index+1} + '. ' + ${r.content}"></span>
         </div>
-        <div class="col col-md-2 offset-md-3">
+        <!-- <div class="col col-md-2 offset-md-3">
             <span class="badge badge-primary">Переменная</span>
         </div>
         <div class="col col-md-2">
@@ -66,8 +66,8 @@
         </div>
         <div class="col col-md-1">
             <span class="badge badge-danger">И / ИЛИ</span>
-        </div>
+        </div>-->
-    </div>
+    </div> 
     <a th:href="@{'/rule/edit/' + ${projectId}+'/0'}" class="btn btn-outline-dark">Добавить правило</a>
 </div>
 </html>

src/main/resources/templates/rule/edit.html

@@ -9,18 +9,18 @@
 <div class="container" layout:fragment="content">
     <h3>Редактирование правила:</h3>
     <form th:action="@{/rule/save}" th:object="${rule}" method="post">
-        <input type="hidden" th:field="${projectId}">
+        <input type="hidden" th:field="*{projectId}">
         <input type="hidden" th:field="*{id}">
         <div class="form-group">
-            <label for="value">Правило</label>
+            <label for="content">Правило</label>
-            <input th:field="*{value}"
+            <input th:field="*{content}"
-                   id="value"
+                   id="content"
                    type="text"
                    required
                    class="form-control"
                    placeholder="Правило">
-            <p th:if="${#fields.hasErrors('value')}"
+            <p th:if="${#fields.hasErrors('content')}"
-               th:class="${#fields.hasErrors('value')}? error">
+               th:class="${#fields.hasErrors('content')}? error">
                 Не может быть пустым
             </p>
         </div>