Changeset 89865ae for src/main

Timestamp:

01/06/23 21:29:06 (23 months ago)

Author:

andrejtodorovski <82031894+andrejtodorovski@…>

Branches:

main

Children:

4d67d70

Parents:

cab5859

Message:

Added price and total price in currentOrder

Location:

src/main

Files:

• java/com/example/autopartz/controller/HomeController.java (modified) (4 diffs)
• java/com/example/autopartz/model/DTO/CurrentOrderDTO.java (added)
• resources/templates/currentOrder.html (modified) (1 diff)

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

@@ -2 +2 @@
 
 import com.example.autopartz.model.*;
+import com.example.autopartz.model.DTO.CurrentOrderDTO;
 import com.example.autopartz.model.DTO.OrderInfo;
 import com.example.autopartz.model.manytomany.OrderContainsPart;
@@ -40 +41 @@
     private final PartManufacturersReportRepository partManufacturersReportRepository;
     private final MostPurchasedPartRepository mostPurchasedPartRepository;
+    private final PriceService priceService;
     public HomeController(LoginService loginService, PartService partService, PartsForCarTypeAndCategoryRepository partsForCarTypeAndCategoryRepository, CarService carService, CategoryService categoryService, RepairShopReviewSummaryRepository repairShopReviewSummaryRepository, WarehouseRepository warehouseRepository,
-                          OrderContainsPartRepository orderContainsPartRepository, OrderService orderService, UserService userService, DeliveriesInProgressRepository deliveriesInProgressRepository, DeliveryService deliveryService, PartIsInStockInWarehouseRepository partIsInStockInWarehouseRepository, CarCategoryReportRepository carCategoryReportRepository, PartManufacturersReportRepository partManufacturersReportRepository, MostPurchasedPartRepository mostPurchasedPartRepository) {
+                          OrderContainsPartRepository orderContainsPartRepository, OrderService orderService, UserService userService, DeliveriesInProgressRepository deliveriesInProgressRepository, DeliveryService deliveryService, PartIsInStockInWarehouseRepository partIsInStockInWarehouseRepository, CarCategoryReportRepository carCategoryReportRepository, PartManufacturersReportRepository partManufacturersReportRepository, MostPurchasedPartRepository mostPurchasedPartRepository, PriceService priceService) {
         this.loginService = loginService;
         this.partService = partService;
@@ -58 +60 @@
         this.partManufacturersReportRepository = partManufacturersReportRepository;
         this.mostPurchasedPartRepository = mostPurchasedPartRepository;
+        this.priceService = priceService;
     }
 
@@ -90 +93 @@
             model.addAttribute("hasError",false);
             model.addAttribute("order",o);
-            model.addAttribute("parts",orderService.findById(o.getOrderid()).getPartList());
+            List<CurrentOrderDTO> list = new ArrayList<>();
+            int total = 0;
+            List<OrderContainsPart> qList = orderContainsPartRepository.findAllByOrderid(o.getOrderid());
+            for (int i = 0; i < qList.size(); i++) {
+                int pr = qList.get(i).getQuantity_order()*
+                        priceService.findPriceForPart(partService.findById(qList.get(i).getPartid())).stream().findFirst().get().getAmount();
+                CurrentOrderDTO temp = new CurrentOrderDTO(
+                        partService.findById(qList.get(i).getPartid()).getName(),
+                        partService.findById(qList.get(i).getPartid()).getManufacturer().getName(),
+                        qList.get(i).getQuantity_order(),
+                        pr);
+                list.add(temp);
+                total+=pr;
+            }
+            model.addAttribute("total",total);
+            model.addAttribute("parts",list);
         }
         model.addAttribute("bodyContent","currentOrder");

src/main/resources/templates/currentOrder.html

@@ -3 +3 @@
     <div th:if="${!hasError}">
         <h3 class="mt-3 mb-3">
-            Нарачка за корисник : <span th:text="${order.getUser().getUsername()}"></span>
+            Тековна нарачка за корисник : <span th:text="${order.getUser().getUsername()}"></span>
         </h3>
         <table class="table table-bordered">
             <thead class="thead-dark">
             <tr>
-                <th>Name</th>
-                <th>Manufacturer</th>
+                <th>Име</th>
+                <th>Производител</th>
+                <th>Количина</th>
+                <th>Вкупна цена</th>
             </tr>
             </thead>
             <tbody>
             <tr th:each="part : ${parts}">
-                <td th:text="${part.getName()}"></td>
-                <td th:text="${part.getManufacturer().getName()}"></td>
+                <td th:text="${part.getPartName()}"></td>
+                <td th:text="${part.getManufacturerName()}"></td>
+                <td th:text="${part.getQuantity()}"></td>
+                <td th:text="${part.getPrice()}"></td>
+
             </tr>
             </tbody>
         </table>
+        <h3>Вкупен износ : <span th:text="${total}"></span></h3>
         <form th:action="@{'/part/delivery/'}">
             <button class="btn btn-primary btn-block btn-lg" type="submit">Испрати нарачка</button>