Changeset aea04dd

Timestamp:

02/03/24 17:15:01 (5 months ago)

Author:

Blazho <aleksandar.blazhevski@…>

Branches:

master

Children:

d4d8fb9

Parents:

501396e

Message:

Dodadeni se komentarite pod sekoj recept

Location:

src/main

Files:

• java/com/example/cookbook/controller/HomeController.java (modified) (4 diffs)
• java/com/example/cookbook/model/Komentar.java (added)
• java/com/example/cookbook/repository/KomentariRepository.java (added)
• java/com/example/cookbook/service/KomentariService.java (added)
• java/com/example/cookbook/service/impl/KomentariServiceImpl.java (added)
• resources/templates/recept.html (modified) (2 diffs)

src/main/java/com/example/cookbook/controller/HomeController.java

@@ -2 +2 @@
 
 
+import com.example.cookbook.model.Komentar;
 import com.example.cookbook.model.Recept;
 import com.example.cookbook.model.Slika;
 import com.example.cookbook.model.Sostojka;
 import com.example.cookbook.model.exception.ReceptNeEPronajdenException;
+import com.example.cookbook.service.KomentariService;
 import com.example.cookbook.service.ReceptService;
 import com.example.cookbook.service.SlikiService;
@@ -25 +27 @@
     private final SostojkiService sostojkiService;
 
-    public HomeController(ReceptService receptService, SlikiService slikiService, SostojkiService sostojkiService) {
+    private final KomentariService komentariService;
+
+    public HomeController(ReceptService receptService,
+                          SlikiService slikiService,
+                          SostojkiService sostojkiService, KomentariService komentariService) {
 
         this.receptService = receptService;
         this.slikiService = slikiService;
         this.sostojkiService = sostojkiService;
+        this.komentariService = komentariService;
     }
 
@@ -51 +58 @@
         List<Slika> sliki;
         List<Sostojka> sostojki;
+        List<Komentar> komentari;
         try {
             recept = receptService.findById(id);
             sliki = slikiService.findAllPicById(id);
             sostojki = sostojkiService.findAllById(id);
+            komentari = komentariService.findAllById(id);
         } catch (SQLException e) {
             return "redirect:/error-page/SQL%20Exception";
@@ -63 +72 @@
         model.addAttribute("sliki", sliki);
         model.addAttribute("sostojki", sostojki);
+        model.addAttribute("komentari", komentari);
         return "recept";
     }

src/main/resources/templates/recept.html

@@ -11 +11 @@
             margin: 16px;
             border-style: groove;
+        }
+        textarea{
+            width: 70%;
         }
     </style>
@@ -67 +70 @@
         </div>
 
+        <form class="p-4 border" th:method="POST" th:action="@{'/komentar/{id}' (id=${recept.recId})}">
+            <div class="pt-3">
+                <label for="kom-ocena">Внеси оцена</label>
+                <input id="kom-ocena" name="ocena" type="number" min="1" max="10" step="1" required>
+            </div>
 
-        <div class="mt-4">KOMENTARI TO DO</div>
+            <div class="pt-3">
+                <textarea name="komentar">Внеси коментар..</textarea>
+            </div>
+            <div class="pt-3">
+                <label for="telefon">Избери телефон</label>
+                <select id="telefon" name="telefon" required>
+                    <option selected></option>
+                    <option th:each="tel : ${telefoni}" th:text="tel" th:value="tel"></option>
+                </select>
+            </div>
+            <div class="pt-3">
+                <button>Submit</button>
+            </div>
+        </form>
+
+        <div class="mt-4">
+            <div th:each="komentar : ${komentari}" class="border p-4">
+                <p th:text="${komentar.imePrezime}">Ime Prezime</p>
+                <p th:text="${komentar.getDataFormatirana()}">2022-12-09 18:25:58</p>
+                <p th:text="${komentar.ocena}">8</p>
+                <p th:text="${komentar.text}" class="border">text</p>
+            </div>
+        </div>
     </div>