Browse Source

updeted food scheme report

master
AJITHKUMAR12 10 months ago
parent
commit
370c517388
  1. 15
      src/main/java/com/gcc/commissionerreview/controller/FoodSchemeController.java
  2. 5
      src/main/java/com/gcc/commissionerreview/controller/MainController.java
  3. 1
      src/main/java/com/gcc/commissionerreview/service/FoodSchemeService.java
  4. 2
      src/main/resources/templates/modules/food_scheme/driverreport.html
  5. 2
      src/main/resources/templates/modules/food_scheme/feedbackreport.html
  6. 2
      src/main/resources/templates/modules/food_scheme/foodschemereport.html

15
src/main/java/com/gcc/commissionerreview/controller/FoodSchemeController.java

@ -21,19 +21,6 @@ public class FoodSchemeController {
@Autowired @Autowired
private FoodSchemeService foodSchemeService; private FoodSchemeService foodSchemeService;
/*
* @GetMapping("/feedback-summary")
* public List<Map<String, Object>> getFeedbackSummary(@RequestParam String
* date) {
* return feedbackService.getFeedbackSummary(date);
* }
*
* @GetMapping("/driver-report")
* public List<Map<String, Object>> getDriverReport(@RequestParam String date) {
* //System.out.println("Date received in controller: " + date);
* return feedbackService.getDriverReport(date);
* }
*/
// ak // ak
@GetMapping("/feedback-summary") @GetMapping("/feedback-summary")
public ResponseEntity<?> getFeedbackSummary(@RequestParam String date) { public ResponseEntity<?> getFeedbackSummary(@RequestParam String date) {
@ -82,8 +69,6 @@ public class FoodSchemeController {
} }
} }
@GetMapping("/ward-details") @GetMapping("/ward-details")
public ResponseEntity<?> getWardDetails( public ResponseEntity<?> getWardDetails(
@RequestParam int qid, @RequestParam int qid,

5
src/main/java/com/gcc/commissionerreview/controller/MainController.java

@ -177,9 +177,4 @@ public class MainController {
return "modules/food_scheme/driverreport"; return "modules/food_scheme/driverreport";
} }
@GetMapping("/healthcamp")
public String healthcamp(Model model) {
return "modules/health_camp/foodschemereport";
}
} }

1
src/main/java/com/gcc/commissionerreview/service/FoodSchemeService.java

@ -229,7 +229,6 @@ public class FoodSchemeService {
return jdbcTemplate.queryForList(sql); return jdbcTemplate.queryForList(sql);
} }
// yogi used has old without isactive isdelete
// public List<Map<String, Object>> getAbstractReport(String date) { // public List<Map<String, Object>> getAbstractReport(String date) {
// String sql = """ // String sql = """

2
src/main/resources/templates/modules/food_scheme/driverreport.html

@ -322,7 +322,7 @@
// Allow TODAY + PAST only (Restrict future)
// Restrict future dates // Restrict future dates
/*let today = new Date().toISOString().split("T")[0]; /*let today = new Date().toISOString().split("T")[0];
document.getElementById("driverDate").setAttribute("max", today); document.getElementById("driverDate").setAttribute("max", today);

2
src/main/resources/templates/modules/food_scheme/feedbackreport.html

@ -596,7 +596,7 @@
/* -------------------------------- /* --------------------------------
LOAD 3 FEEDBACK BLOCKS
--------------------------------- */ --------------------------------- */
function loadSummary(date) { function loadSummary(date) {

2
src/main/resources/templates/modules/food_scheme/foodschemereport.html

@ -373,7 +373,7 @@
</div> </div>
<!-- 🟦 Ward Summary Modal -->
<!-- 🟦 Ward Summar Modal -->
<div class="modal fade" id="wardModal" tabindex="-1"> <div class="modal fade" id="wardModal" tabindex="-1">
<div class="modal-dialog modal-xl modal-dialog-scrollable"> <div class="modal-dialog modal-xl modal-dialog-scrollable">
<div class="modal-content"> <div class="modal-content">

Loading…
Cancel
Save