Changeset cab5859 for src/main/java/com

Timestamp:

01/06/23 21:08:03 (23 months ago)

Author:

andrejtodorovski <82031894+andrejtodorovski@…>

Branches:

main

Children:

89865ae

Parents:

9dcbf44

Message:

Added all advanced reports, added bootstrap for every template

Location:

src/main/java/com/example/autopartz

Files:

• config/WebSecurityConfig.java (modified) (1 diff)
• controller/AdminController.java (modified) (1 diff)
• controller/HomeController.java (modified) (3 diffs)
• controller/TestController.java (deleted)
• model/views/CarCategoryReport.java (added)
• model/views/CarCategoryReportId.java (added)
• model/views/MostPurchasedPart.java (added)
• model/views/PartManufacturersReport.java (added)
• repository/CarCategoryReportRepository.java (added)
• repository/MostPurchasedPartRepository.java (added)
• repository/PartManufacturersReportRepository.java (added)

src/main/java/com/example/autopartz/config/WebSecurityConfig.java

@@ -28 +28 @@
         http.csrf().disable()
                 .authorizeRequests()
-                .antMatchers("/", "/products", "/services", "/filtered", "/login", "/register","/registerWarehouseman","/finishRegister","/test/*","/access_denied").permitAll()
+                .antMatchers("/", "/products", "/services", "/filtered", "/login", "/register","/registerWarehouseman","/finishRegister","/test/*","/access_denied","/carCategoryReport","/partManufacturersReport","/mostPurchasedPart").permitAll()
                 .antMatchers("/orders","/repairs","/reviews","/part/*","/currentOrder","/addCarSampleForUser","/repairs/addReview/*").hasRole("CLIENT")
                 .antMatchers("/viewUsers","/approve/*").hasRole("ADMIN")

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

@@ -37 +37 @@
     public String getAllUsers(Model model){
         List<User> pendingList = userService.findAllUsers().stream().filter(u->u.getAuthorities().contains(Role.ROLE_PENDING_DELIVERYMAN) || u.getAuthorities().contains(Role.ROLE_PENDING_WAREHOUSEMAN)).toList();
-        model.addAttribute("users", pendingList);
+        if(pendingList.size()==0){
+            model.addAttribute("hasError",true);
+        }
+        else {
+            model.addAttribute("hasError",false);
+            model.addAttribute("users", pendingList);
+        }
         model.addAttribute("bodyContent", "viewUsers");
         return "master-template";

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

@@ -37 +37 @@
     private final DeliveryService deliveryService;
     private final PartIsInStockInWarehouseRepository partIsInStockInWarehouseRepository;
+    private final CarCategoryReportRepository carCategoryReportRepository;
+    private final PartManufacturersReportRepository partManufacturersReportRepository;
+    private final MostPurchasedPartRepository mostPurchasedPartRepository;
     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) {
+                          OrderContainsPartRepository orderContainsPartRepository, OrderService orderService, UserService userService, DeliveriesInProgressRepository deliveriesInProgressRepository, DeliveryService deliveryService, PartIsInStockInWarehouseRepository partIsInStockInWarehouseRepository, CarCategoryReportRepository carCategoryReportRepository, PartManufacturersReportRepository partManufacturersReportRepository, MostPurchasedPartRepository mostPurchasedPartRepository) {
         this.loginService = loginService;
         this.partService = partService;
@@ -52 +55 @@
         this.deliveryService = deliveryService;
         this.partIsInStockInWarehouseRepository = partIsInStockInWarehouseRepository;
+        this.carCategoryReportRepository = carCategoryReportRepository;
+        this.partManufacturersReportRepository = partManufacturersReportRepository;
+        this.mostPurchasedPartRepository = mostPurchasedPartRepository;
     }
 
@@ -231 +237 @@
         return "master-template";
     }
+    @GetMapping("/carCategoryReport")
+    public String getCarCategoryInfo(Model model){
+        model.addAttribute("data",carCategoryReportRepository.findAll());
+        model.addAttribute("bodyContent","carCategoryReport");
+        return "master-template";
+    }
+    @GetMapping("/partManufacturersReport")
+    public String getPartManufacturersReport(Model model){
+        model.addAttribute("data",partManufacturersReportRepository.findAll());
+        model.addAttribute("bodyContent","partManufacturersReport");
+        return "master-template";
+
+    }
+    @GetMapping("/mostPurchasedPart")
+    public String getMostPurchasedPart(Model model){
+        model.addAttribute("data",mostPurchasedPartRepository.findAll());
+        model.addAttribute("bodyContent","mostPurchasedPart");
+        return "master-template";
+    }
 }