diff --git a/src/main/java/com/gcc/commissionerreview/controller/FoodSchemeController.java b/src/main/java/com/gcc/commissionerreview/controller/FoodSchemeController.java index d0979e0..0c5563a 100644 --- a/src/main/java/com/gcc/commissionerreview/controller/FoodSchemeController.java +++ b/src/main/java/com/gcc/commissionerreview/controller/FoodSchemeController.java @@ -21,19 +21,6 @@ public class FoodSchemeController { @Autowired private FoodSchemeService foodSchemeService; - /* - * @GetMapping("/feedback-summary") - * public List> getFeedbackSummary(@RequestParam String - * date) { - * return feedbackService.getFeedbackSummary(date); - * } - * - * @GetMapping("/driver-report") - * public List> getDriverReport(@RequestParam String date) { - * //System.out.println("Date received in controller: " + date); - * return feedbackService.getDriverReport(date); - * } - */ // ak @GetMapping("/feedback-summary") public ResponseEntity getFeedbackSummary(@RequestParam String date) { @@ -82,8 +69,6 @@ public class FoodSchemeController { } } - - @GetMapping("/ward-details") public ResponseEntity getWardDetails( @RequestParam int qid, diff --git a/src/main/java/com/gcc/commissionerreview/controller/MainController.java b/src/main/java/com/gcc/commissionerreview/controller/MainController.java index 23bc437..f6b39e5 100644 --- a/src/main/java/com/gcc/commissionerreview/controller/MainController.java +++ b/src/main/java/com/gcc/commissionerreview/controller/MainController.java @@ -177,9 +177,4 @@ public class MainController { return "modules/food_scheme/driverreport"; } - @GetMapping("/healthcamp") - public String healthcamp(Model model) { - return "modules/health_camp/foodschemereport"; - } - } diff --git a/src/main/java/com/gcc/commissionerreview/service/FoodSchemeService.java b/src/main/java/com/gcc/commissionerreview/service/FoodSchemeService.java index 81e9b94..72d7300 100644 --- a/src/main/java/com/gcc/commissionerreview/service/FoodSchemeService.java +++ b/src/main/java/com/gcc/commissionerreview/service/FoodSchemeService.java @@ -229,7 +229,6 @@ public class FoodSchemeService { return jdbcTemplate.queryForList(sql); } - // yogi used has old without isactive isdelete // public List> getAbstractReport(String date) { // String sql = """ diff --git a/src/main/resources/templates/modules/food_scheme/driverreport.html b/src/main/resources/templates/modules/food_scheme/driverreport.html index 2efef0c..e0459eb 100644 --- a/src/main/resources/templates/modules/food_scheme/driverreport.html +++ b/src/main/resources/templates/modules/food_scheme/driverreport.html @@ -322,7 +322,7 @@ - // Allow TODAY + PAST only (Restrict future) + // Restrict future dates /*let today = new Date().toISOString().split("T")[0]; document.getElementById("driverDate").setAttribute("max", today); diff --git a/src/main/resources/templates/modules/food_scheme/feedbackreport.html b/src/main/resources/templates/modules/food_scheme/feedbackreport.html index 44ce2bf..c52618c 100644 --- a/src/main/resources/templates/modules/food_scheme/feedbackreport.html +++ b/src/main/resources/templates/modules/food_scheme/feedbackreport.html @@ -596,7 +596,7 @@ /* -------------------------------- - LOAD 3 FEEDBACK BLOCKS + --------------------------------- */ function loadSummary(date) { diff --git a/src/main/resources/templates/modules/food_scheme/foodschemereport.html b/src/main/resources/templates/modules/food_scheme/foodschemereport.html index 478a6aa..b2925b2 100644 --- a/src/main/resources/templates/modules/food_scheme/foodschemereport.html +++ b/src/main/resources/templates/modules/food_scheme/foodschemereport.html @@ -373,7 +373,7 @@ - +