Changeset 60e9cc1

Timestamp:

03/06/23 19:01:32 (21 months ago)

Author:

andrejtodorovski <82031894+andrejtodorovski@…>

Branches:

main

Children:

c79897f

Parents:

bba352b

Message:

Sredeni zabeleshki po diskusija

Location:

src/main

Files:

• java/com/example/autopartz/controller/HomeController.java (modified) (2 diffs)
• resources/templates/fragments/header.html (modified) (1 diff)

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

@@ -20 +20 @@
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 @Controller
@@ -220 +222 @@
         Deliveryman dm = (Deliveryman) userService.findByUsername(request.getRemoteUser());
         List<Delivery> deliveries = deliveryService.findAllByDeliverer(dm);
+        deliveries = deliveries.stream().sorted((p1,p2)->p2.getOrder().getDate().compareTo(p1.getOrder().getDate())).collect(Collectors.toList());
         model.addAttribute("bodyContent","myDeliveries");
         model.addAttribute("deliveries",deliveries);

src/main/resources/templates/fragments/header.html

@@ -48 +48 @@
             <li class="nav-item m-auto">
               <a class="nav-link active" href="/myDeliveries">Мои достави</a>
+            </li>
+          </th:block>
+          <th:block sec:authorize="hasAuthority('ROLE_PENDING_DELIVERYMAN')">
+            <li class="nav-item m-auto text-white">
+              Чека одобрување од администратор
+            </li>
+          </th:block>
+          <th:block sec:authorize="hasAuthority('ROLE_PENDING_WAREHOUSEMAN')">
+            <li class="nav-item m-auto text-white">
+              Чека одобрување од администратор
             </li>
           </th:block>