Changeset 16f38d4

Timestamp:

01/08/23 17:17:48 (23 months ago)

Author:

DarkoSasanski <darko.sasanski@…>

Branches:

main

Children:

0afa35a

Parents:

7e10599

Message:

Implemented processing of delivered articles by workers

Location:

FullyStocked/src/main

Files:

• java/com/bazi/fullystocked/Models/SqlViews/OrderedArticlesReport.java (modified) (1 diff)
• java/com/bazi/fullystocked/Repositories/OrdersReportRepository.java (modified) (2 diffs)
• java/com/bazi/fullystocked/Services/Implementations/OrdersServiceImpl.java (modified) (1 diff)
• java/com/bazi/fullystocked/Services/OrdersService.java (modified) (1 diff)
• java/com/bazi/fullystocked/Web/Controller/OrderController.java (modified) (1 diff)
• java/com/bazi/fullystocked/Web/Controller/WorkerController.java (modified) (3 diffs)
• resources/templates/deliveredArticles.html (added)
• resources/templates/supplierOrders.html (modified) (2 diffs)
• resources/templates/workerOrders.html (added)

FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/OrderedArticlesReport.java

@@ -27 +27 @@
     private ArticleStatus articlestatus;
     private int orderid;
+    private int storedquantity;
 }

FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/OrdersReportRepository.java

@@ -1 +1 @@
 package com.bazi.fullystocked.Repositories;
 
+import com.bazi.fullystocked.Models.Enumerations.OrderStatus;
 import com.bazi.fullystocked.Models.SqlViews.OrdersReport;
+import org.hibernate.criterion.Order;
 import org.springframework.data.jpa.repository.JpaRepository;
 import java.util.*;
@@ -8 +10 @@
     List<OrdersReport> findAllBySupplieruserid(Integer id);
     List<OrdersReport> findAllByManageruserid(Integer id);
+    List<OrdersReport> findAllByStatus(OrderStatus status);
 }

FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/OrdersServiceImpl.java

@@ -192 +192 @@
     }
 
+    @Override
+    public List<OrdersReport> findByStatus(OrderStatus status) {
+        return ordersReportRepository.findAllByStatus(status);
+    }
+
 }

FullyStocked/src/main/java/com/bazi/fullystocked/Services/OrdersService.java

@@ -23 +23 @@
     Optional<OrdersReport> findByIdReport(Integer orderId);
     Optional<Orders> updateStatus(Integer orderId, OrderStatus status);
+    List<OrdersReport> findByStatus(OrderStatus status);
 
 }

FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/OrderController.java

@@ -291 +291 @@
         return "redirect:/orders/manager/details/"+orderId;
     }
+    @GetMapping("/worker/list")
+    public String listOrdersWorker(Model model)
+    {
+        model.addAttribute("orders", ordersService.findByStatus(OrderStatus.IN_PROGRESS));
+        return "workerOrders";
+    }
     @PostMapping("/worker/accept")
     public String acceptOrder(@RequestParam Integer orderId)
     {
-        ordersService.updateStatus(orderId, OrderStatus.DELIVERED);
-        return "redirect:/worker";
+        try {
+            ordersService.updateStatus(orderId, OrderStatus.DELIVERED);
+        }
+        catch (Exception e)
+        {
+            return "redirect:/orders/worker/list"+e.getMessage();
+        }
+        return "redirect:/orders/worker/list";
     }
 }

FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/WorkerController.java

@@ -1 +1 @@
 package com.bazi.fullystocked.Web.Controller;
 
+import com.bazi.fullystocked.Models.Enumerations.ArticleStatus;
 import com.bazi.fullystocked.Models.SqlViews.ArticlesReport;
 import com.bazi.fullystocked.Models.Workers;
 import com.bazi.fullystocked.Services.ArticlesService;
+import com.bazi.fullystocked.Services.OrderedArticlesService;
 import com.bazi.fullystocked.Services.StoredArticlesService;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -19 +19 @@
    private final StoredArticlesService storedArticlesService;
    private final ArticlesService articlesService;
+   private final OrderedArticlesService orderedArticlesService;
 
-    public WorkerController(StoredArticlesService storedArticlesService, ArticlesService articlesService) {
+    public WorkerController(StoredArticlesService storedArticlesService, ArticlesService articlesService, OrderedArticlesService orderedArticlesService) {
         this.storedArticlesService = storedArticlesService;
         this.articlesService = articlesService;
+        this.orderedArticlesService = orderedArticlesService;
     }
 
@@ -51 +53 @@
         return "redirect:/worker/articles?error=ArticleNotFound";
     }
+    @GetMapping("/deliveredArticles")
+    public String listDeliveredArticles(Model model, HttpServletRequest request)
+    {
+        Workers u= (Workers) request.getSession().getAttribute("user");
+        model.addAttribute("articles", orderedArticlesService.findByStatusAtLocation(ArticleStatus.DELIVERED, u.getLocation().getLocationid()));
+        return "deliveredArticles";
+    }
+
+    @PostMapping("/deliveredArticles/process")
+    public String processOrderedArticle(@RequestParam Integer articleId, HttpServletRequest request)
+    {
+        try
+        {
+            Workers u= (Workers) request.getSession().getAttribute("user");
+            if(storedArticlesService.findById(articleId).isEmpty())
+            {
+                return "redirect:/worker/deliveredArticles";
+            }
+            if(!storedArticlesService.findById(articleId).get().getLocationid().equals(u.getLocation().getLocationid()))
+            {
+                return "redirect:/login";
+            }
+            storedArticlesService.updateFromOrder(articleId);
+            return "redirect:/worker/deliveredArticles";
+        }
+        catch (Exception e)
+        {
+            return "redirect:/worker/deliveredArticles?error="+e.getMessage();
+        }
+    }
+
 }

FullyStocked/src/main/resources/templates/supplierOrders.html

@@ -49 +49 @@
         </th>
         <th>
-            Добавувач
+            Забелешка на менаџер
+        </th>
+        <th>
+            Забелешка на добавувач
         </th>
         <th>
@@ -56 +59 @@
         <th>
             Приоритет
-        </th>
-        <th>
-            Забелешка
         </th>
         <th>