diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/controller/MenuController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/controller/MenuController.java index bc82455..e396522 100644 --- a/src/main/java/in/gov/chennaicorporation/gccoffice/controller/MenuController.java +++ b/src/main/java/in/gov/chennaicorporation/gccoffice/controller/MenuController.java @@ -23,145 +23,162 @@ import in.gov.chennaicorporation.gccoffice.service.LoginUserInfo; @ControllerAdvice public class MenuController { - private final AppModuleRepository appModuleRepository; - private final MenuItemRepository menuItemRepository; - private final SubMenuItemRepository subMenuItemRepository; - - private final AppModuleAccessRepository appModuleAccessRepository; - private final MenuItemAccessRepository menuItemAccessRepository; - private final SubMenuItemAccessRepository subMenuItemAccessRepository; - - @Autowired - public MenuController(AppModuleRepository appModuleRepository, - MenuItemRepository menuItemRepository, - SubMenuItemRepository subMenuItemRepository, - AppModuleAccessRepository appModuleAccessRepository, - MenuItemAccessRepository menuItemAccessRepository, - SubMenuItemAccessRepository subMenuItemAccessRepository) { - - this.appModuleRepository = appModuleRepository; + private final AppModuleRepository appModuleRepository; + private final MenuItemRepository menuItemRepository; + private final SubMenuItemRepository subMenuItemRepository; + + private final AppModuleAccessRepository appModuleAccessRepository; + private final MenuItemAccessRepository menuItemAccessRepository; + private final SubMenuItemAccessRepository subMenuItemAccessRepository; + + @Autowired + public MenuController(AppModuleRepository appModuleRepository, + MenuItemRepository menuItemRepository, + SubMenuItemRepository subMenuItemRepository, + AppModuleAccessRepository appModuleAccessRepository, + MenuItemAccessRepository menuItemAccessRepository, + SubMenuItemAccessRepository subMenuItemAccessRepository) { + + this.appModuleRepository = appModuleRepository; this.menuItemRepository = menuItemRepository; this.subMenuItemRepository = subMenuItemRepository; - + this.appModuleAccessRepository = appModuleAccessRepository; this.menuItemAccessRepository = menuItemAccessRepository; this.subMenuItemAccessRepository = subMenuItemAccessRepository; - } - - @ModelAttribute("menuItemsHTML") // This will add the menuItems to the model for all requests - public String menuHTML() { - - if(LoginUserInfo.getLoginUserId() == null || LoginUserInfo.getUserGroupId()==null) { - return ""; - } - - List getAppModuleAccessEntities; - List getAppModuleEntities; - if(LoginUserInfo.getUserRole().equals("ADMIN")) { - getAppModuleEntities = appModuleRepository.showAll(); - } - else { - getAppModuleAccessEntities = appModuleAccessRepository.findByUserGroupID(LoginUserInfo.getUserGroupId()); - - String[] checkModuleId = new String[getAppModuleAccessEntities.size()]; - int i=0; - for (AppModuleAccessEntity accessEntity : getAppModuleAccessEntities) { - checkModuleId[i]=accessEntity.getModuleId().getId().toString(); - i++; - } - getAppModuleEntities = appModuleRepository.showAllById(checkModuleId); - } - - String menuHTML = ""; - menuHTML = ""; - for (AppModuleEntity moduleName : getAppModuleEntities) { - - menuHTML = menuHTML+"
"+moduleName.getName()+"
"; - - List getMenuItems; - if(LoginUserInfo.getUserRole().equals("ADMIN")) { - getMenuItems = menuItemRepository.getMenuItemByModuleId(moduleName.getId()); - } - else { - List getMenuItemAccess = menuItemAccessRepository.findByUserGroupID(LoginUserInfo.getUserGroupId(), moduleName.getId().toString()); - - String[] checkMenuId = new String[getMenuItemAccess.size()]; - int j=0; - for (MenuItemAccessEntity menuAccessEntity : getMenuItemAccess) { - checkMenuId[j]=menuAccessEntity.getMenuItemId().getId().toString(); - j++; - } - getMenuItems = menuItemRepository.getMenuItemByModuleIdAccess(moduleName.getId(),checkMenuId); - } - String subMenuHTML = ""; - for (MenuItemEntity menuItem : getMenuItems) { - if(menuItem.getHasSub()) { - if(LoginUserInfo.getUserRole().equals("ADMIN")) { - List getMenuSubItems = subMenuItemRepository.getSubMenuItemByMenuItemId(menuItem.getId()); - String subSubMenuHTML = ""; - for (SubMenuItemEntity subMenuItem : getMenuSubItems) { - String target = ""; - System.err.println(subMenuItem.getExtenalLink()); - if(subMenuItem.getExtenalLink()) { - target = " target=\"_blank\""; - subSubMenuHTML = subSubMenuHTML+""+subMenuItem.getName()+""; - } - else { - subSubMenuHTML = subSubMenuHTML+""+subMenuItem.getName()+""; - } - - } - if(subSubMenuHTML.equals("")) - { - subMenuHTML = subMenuHTML+""; - } - else { - subMenuHTML = subMenuHTML+"
"+menuItem.getName()+"
"+subSubMenuHTML+"
"; - } - } - else { - List getSubMenuItemAccess = subMenuItemAccessRepository.findByUserGroupIDAccess(LoginUserInfo.getUserGroupId(), moduleName.getId().toString(), menuItem.getId().toString()); - - String[] checkSubMenuId = new String[getSubMenuItemAccess.size()]; - if(checkSubMenuId.length>0) - { - int k=0; - for (SubMenuItemAccessEntity subMenuItemAccessEntity : getSubMenuItemAccess) { - checkSubMenuId[k]=subMenuItemAccessEntity.getSubMenuItemId().getId().toString(); - k++; - } - - List getMenuSubItems = subMenuItemRepository.getSubMenuItemByMenuItemIdAccess(menuItem.getId(),checkSubMenuId); - String subSubMenuHTML = ""; - for (SubMenuItemEntity subMenuItem : getMenuSubItems) { - String target = ""; - System.err.println(subMenuItem.getExtenalLink()); - if(subMenuItem.getExtenalLink()) { - target = " target=\"_blank\""; - subSubMenuHTML = subSubMenuHTML+""+subMenuItem.getName()+""; - } - else { - subSubMenuHTML = subSubMenuHTML+""+subMenuItem.getName()+""; - } - } - subMenuHTML = subMenuHTML+"
"+menuItem.getName()+"
"+subSubMenuHTML+"
"; - } - else { - subMenuHTML = subMenuHTML+""; - } - } - - } - else { - if(menuItem.getOrderby()>0) { - subMenuHTML = subMenuHTML+""+menuItem.getName()+""; - } - } - } - - menuHTML = menuHTML+subMenuHTML+"
"; - } - - return menuHTML; - } + } + + @ModelAttribute("menuItemsHTML") // This will add the menuItems to the model for all requests + public String menuHTML() { + + if (LoginUserInfo.getLoginUserId() == null || LoginUserInfo.getUserGroupId() == null) { + return ""; + } + + List getAppModuleAccessEntities; + List getAppModuleEntities; + if (LoginUserInfo.getUserRole().equals("ADMIN")) { + getAppModuleEntities = appModuleRepository.showAll(); + } else { + getAppModuleAccessEntities = appModuleAccessRepository.findByUserGroupID(LoginUserInfo.getUserGroupId()); + + String[] checkModuleId = new String[getAppModuleAccessEntities.size()]; + int i = 0; + for (AppModuleAccessEntity accessEntity : getAppModuleAccessEntities) { + checkModuleId[i] = accessEntity.getModuleId().getId().toString(); + i++; + } + getAppModuleEntities = appModuleRepository.showAllById(checkModuleId); + } + + String menuHTML = ""; + menuHTML = ""; + for (AppModuleEntity moduleName : getAppModuleEntities) { + + menuHTML = menuHTML + "
" + moduleName.getName() + + "
"; + + List getMenuItems; + if (LoginUserInfo.getUserRole().equals("ADMIN")) { + getMenuItems = menuItemRepository.getMenuItemByModuleId(moduleName.getId()); + } else { + List getMenuItemAccess = menuItemAccessRepository + .findByUserGroupID(LoginUserInfo.getUserGroupId(), moduleName.getId().toString()); + + String[] checkMenuId = new String[getMenuItemAccess.size()]; + int j = 0; + for (MenuItemAccessEntity menuAccessEntity : getMenuItemAccess) { + checkMenuId[j] = menuAccessEntity.getMenuItemId().getId().toString(); + j++; + } + getMenuItems = menuItemRepository.getMenuItemByModuleIdAccess(moduleName.getId(), checkMenuId); + } + String subMenuHTML = ""; + for (MenuItemEntity menuItem : getMenuItems) { + if (menuItem.getHasSub()) { + if (LoginUserInfo.getUserRole().equals("ADMIN")) { + List getMenuSubItems = subMenuItemRepository + .getSubMenuItemByMenuItemId(menuItem.getId()); + String subSubMenuHTML = ""; + for (SubMenuItemEntity subMenuItem : getMenuSubItems) { + String target = ""; + // System.err.println(subMenuItem.getExtenalLink()); + if (subMenuItem.getExtenalLink()) { + target = " target=\"_blank\""; + subSubMenuHTML = subSubMenuHTML + "" + subMenuItem.getName() + ""; + } else { + subSubMenuHTML = subSubMenuHTML + "" + subMenuItem.getName() + ""; + } + + } + if (subSubMenuHTML.equals("")) { + subMenuHTML = subMenuHTML + + ""; + } else { + subMenuHTML = subMenuHTML + + "
" + menuItem.getName() + + "
" + subSubMenuHTML + "
"; + } + } else { + List getSubMenuItemAccess = subMenuItemAccessRepository + .findByUserGroupIDAccess(LoginUserInfo.getUserGroupId(), moduleName.getId().toString(), + menuItem.getId().toString()); + + String[] checkSubMenuId = new String[getSubMenuItemAccess.size()]; + if (checkSubMenuId.length > 0) { + int k = 0; + for (SubMenuItemAccessEntity subMenuItemAccessEntity : getSubMenuItemAccess) { + checkSubMenuId[k] = subMenuItemAccessEntity.getSubMenuItemId().getId().toString(); + k++; + } + + List getMenuSubItems = subMenuItemRepository + .getSubMenuItemByMenuItemIdAccess(menuItem.getId(), checkSubMenuId); + String subSubMenuHTML = ""; + for (SubMenuItemEntity subMenuItem : getMenuSubItems) { + String target = ""; + // System.err.println(subMenuItem.getExtenalLink()); + if (subMenuItem.getExtenalLink()) { + target = " target=\"_blank\""; + subSubMenuHTML = subSubMenuHTML + "" + subMenuItem.getName() + ""; + } else { + subSubMenuHTML = subSubMenuHTML + "" + subMenuItem.getName() + ""; + } + } + subMenuHTML = subMenuHTML + + "
" + menuItem.getName() + + "
" + subSubMenuHTML + "
"; + } else { + subMenuHTML = subMenuHTML + + ""; + } + } + + } else { + if (menuItem.getOrderby() > 0) { + subMenuHTML = subMenuHTML + "" + + menuItem.getName() + ""; + } + } + } + + menuHTML = menuHTML + subMenuHTML + "
"; + } + + return menuHTML; + } } \ No newline at end of file diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/works/controller/MainController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/works/controller/MainController.java index 1aa3336..1957e3a 100644 --- a/src/main/java/in/gov/chennaicorporation/gccoffice/works/controller/MainController.java +++ b/src/main/java/in/gov/chennaicorporation/gccoffice/works/controller/MainController.java @@ -19,8 +19,8 @@ import org.springframework.web.bind.annotation.ResponseBody; @RequestMapping("/gcc/works") @Controller("worksController") public class MainController { - private String BasePath = "modules/works/"; - + private String BasePath = "modules/works/"; + @Autowired private EstimateService estimateService; @Autowired @@ -28,9 +28,9 @@ public class MainController { private Map> zoneWardMap = new HashMap<>(); - @GetMapping({"", "/", "/index", "/dashboard"}) + @GetMapping({ "", "/", "/index", "/dashboard" }) public String home(Model model) { - return BasePath+"index"; + return BasePath + "index"; } @GetMapping("/erp-works-update") // not in use @@ -40,12 +40,12 @@ public class MainController { String LoginUserId = LoginUserInfo.getLoginUserId(); model.addAttribute("LoginUserId", LoginUserId); model.addAttribute("zones", zones); - return BasePath+"erp-works-update"; + return BasePath + "erp-works-update"; } @GetMapping("/nonerp-works-add") public String nonErpCreateRequest(Model model) { - //List zones = new ArrayList<>(); + // List zones = new ArrayList<>(); List zones = new ArrayList<>(zoneWardMap.keySet()); System.out.println("zones: " + zones); @@ -56,14 +56,14 @@ public class MainController { model.addAttribute("LoginUserId", LoginUserId); model.addAttribute("zones", zones); - return BasePath+"non-erp-works-add"; + return BasePath + "non-erp-works-add"; } public MainController() { - zoneWardMap.put("00", generateWardList("000", "000")); + zoneWardMap.put("00", generateWardList("000", "000")); zoneWardMap.put("01", generateWardList("001", "014")); - zoneWardMap.put("02", generateWardList("015", "021")); - zoneWardMap.put("03", generateWardList("022", "033")); + zoneWardMap.put("02", generateWardList("015", "022")); + zoneWardMap.put("03", generateWardList("023", "033")); zoneWardMap.put("04", generateWardList("034", "048")); zoneWardMap.put("05", generateWardList("049", "063")); zoneWardMap.put("06", generateWardList("064", "078")); @@ -93,133 +93,134 @@ public class MainController { public List getWards(@RequestParam String zone) { return zoneWardMap.getOrDefault(zone, Collections.emptyList()); } - //ak - - + // ak + @GetMapping("/erpworkslist") // To diplay updated ERP works public String worksList(Model model) { - //List zones = new ArrayList<>(zoneWardMap.keySet()); - - String LoginUserId = LoginUserInfo.getLoginUserId(); - model.addAttribute("LoginUserId",LoginUserId); - - //List> workDetails = estimateService.getAllERPWorks(LoginUserId); - - //model.addAttribute("workDetails", workDetails); - //model.addAttribute("zones", zones); - return BasePath+"erpworkslist"; - } - + // List zones = new ArrayList<>(zoneWardMap.keySet()); + + String LoginUserId = LoginUserInfo.getLoginUserId(); + model.addAttribute("LoginUserId", LoginUserId); + + // List> workDetails = + // estimateService.getAllERPWorks(LoginUserId); + + // model.addAttribute("workDetails", workDetails); + // model.addAttribute("zones", zones); + return BasePath + "erpworkslist"; + } + @GetMapping("/erpworkslist_report") // To diplay updated ERP works public String erpworkslist_report(Model model) { - //List zones = new ArrayList<>(zoneWardMap.keySet()); - - String LoginUserId = LoginUserInfo.getLoginUserId(); - model.addAttribute("LoginUserId",LoginUserId); - - //List> workDetails = estimateService.getAllERPWorks(LoginUserId); - - //model.addAttribute("workDetails", workDetails); - //model.addAttribute("zones", zones); - return BasePath+"erpworkslist_report"; + // List zones = new ArrayList<>(zoneWardMap.keySet()); + + String LoginUserId = LoginUserInfo.getLoginUserId(); + model.addAttribute("LoginUserId", LoginUserId); + + // List> workDetails = + // estimateService.getAllERPWorks(LoginUserId); + + // model.addAttribute("workDetails", workDetails); + // model.addAttribute("zones", zones); + return BasePath + "erpworkslist_report"; } @GetMapping("/nonerpworkslist") // To display updated Non-ERP Works public String nonerpworksList(Model model) { List zones = new ArrayList<>(zoneWardMap.keySet()); - - String LoginUserId = LoginUserInfo.getLoginUserId(); - model.addAttribute("LoginUserId",LoginUserId); - + + String LoginUserId = LoginUserInfo.getLoginUserId(); + model.addAttribute("LoginUserId", LoginUserId); + List> workDetails = estimateService.getAllNonERPWorks(LoginUserId); - + model.addAttribute("workDetails", workDetails); model.addAttribute("zones", zones); - return BasePath+"nonerpworkslist"; + return BasePath + "nonerpworkslist"; } - + ////////////////////////////////////////////////////////////// - + @GetMapping("/erpWorksList") // to update ERP Works public String erpworksList(Model model) { List zones = new ArrayList<>(zoneWardMap.keySet()); - - String LoginUserId = LoginUserInfo.getLoginUserId(); - model.addAttribute("LoginUserId",LoginUserId); - - //List> workDetails = erpestimateService.getAllWorks(LoginUserId); - - //model.addAttribute("workDetails", workDetails); + + String LoginUserId = LoginUserInfo.getLoginUserId(); + model.addAttribute("LoginUserId", LoginUserId); + + // List> workDetails = + // erpestimateService.getAllWorks(LoginUserId); + + // model.addAttribute("workDetails", workDetails); model.addAttribute("zones", zones); - return BasePath+"erp-works-list"; + return BasePath + "erp-works-list"; } - @GetMapping("/view-works-details-modal") - public String worksViewModal(Model model,@RequestParam(value="estid", required = false) String estid) { - System.out.println("EST ID: "+estid); - String LoginUserId = LoginUserInfo.getLoginUserId(); - model.addAttribute("LoginUserId",LoginUserId); - model.addAttribute("estid",estid); - return BasePath+"works_details_view_modal_page"; - } - + public String worksViewModal(Model model, @RequestParam(value = "estid", required = false) String estid) { + System.out.println("EST ID: " + estid); + String LoginUserId = LoginUserInfo.getLoginUserId(); + model.addAttribute("LoginUserId", LoginUserId); + model.addAttribute("estid", estid); + return BasePath + "works_details_view_modal_page"; + } + @GetMapping("/update-works-details-modal") - public String worksUpdateModal(Model model,@RequestParam(value="estid", required = false) String estid) { - System.out.println("EST ID: "+estid); - String LoginUserId = LoginUserInfo.getLoginUserId(); - model.addAttribute("LoginUserId",LoginUserId); - model.addAttribute("estid",estid); - return BasePath+"works_details_update_modal_page"; - } - + public String worksUpdateModal(Model model, @RequestParam(value = "estid", required = false) String estid) { + System.out.println("EST ID: " + estid); + String LoginUserId = LoginUserInfo.getLoginUserId(); + model.addAttribute("LoginUserId", LoginUserId); + model.addAttribute("estid", estid); + return BasePath + "works_details_update_modal_page"; + } + @GetMapping("/user-view-works-details-modal") - public String userworksViewModal(Model model,@RequestParam(value="estid", required = false) String estid) { - System.out.println("EST ID: "+estid); - String LoginUserId = LoginUserInfo.getLoginUserId(); - model.addAttribute("LoginUserId",LoginUserId); - model.addAttribute("estid",estid); - return BasePath+"user_works_details_view_modal_page"; - } - + public String userworksViewModal(Model model, @RequestParam(value = "estid", required = false) String estid) { + System.out.println("EST ID: " + estid); + String LoginUserId = LoginUserInfo.getLoginUserId(); + model.addAttribute("LoginUserId", LoginUserId); + model.addAttribute("estid", estid); + return BasePath + "user_works_details_view_modal_page"; + } + @GetMapping("/user-update-works-details-modal") - public String userworksUpdateModal(Model model,@RequestParam(value="estid", required = false) String estid) { - System.out.println("EST ID: "+estid); - String LoginUserId = LoginUserInfo.getLoginUserId(); - model.addAttribute("LoginUserId",LoginUserId); - model.addAttribute("estid",estid); - return BasePath+"user_works_details_update_modal_page"; - } - + public String userworksUpdateModal(Model model, @RequestParam(value = "estid", required = false) String estid) { + System.out.println("EST ID: " + estid); + String LoginUserId = LoginUserInfo.getLoginUserId(); + model.addAttribute("LoginUserId", LoginUserId); + model.addAttribute("estid", estid); + return BasePath + "user_works_details_update_modal_page"; + } + @GetMapping("/update_works_stage_modal") - public String updateWorksStageModal(Model model,@RequestParam(value="estid", required = false) String estid) { - System.out.println("EST ID: "+estid); - String LoginUserId = LoginUserInfo.getLoginUserId(); - model.addAttribute("LoginUserId",LoginUserId); - model.addAttribute("estid",estid); - return BasePath+"update_works_stage_modal"; - } - + public String updateWorksStageModal(Model model, @RequestParam(value = "estid", required = false) String estid) { + System.out.println("EST ID: " + estid); + String LoginUserId = LoginUserInfo.getLoginUserId(); + model.addAttribute("LoginUserId", LoginUserId); + model.addAttribute("estid", estid); + return BasePath + "update_works_stage_modal"; + } + @GetMapping("/edit_stage_modal") - public String editStageModal(Model model,@RequestParam(value="estid", required = false) String estid, - @RequestParam(value="tmid", required = false) String tmid) { - System.out.println("EST ID: "+estid); - String LoginUserId = LoginUserInfo.getLoginUserId(); - model.addAttribute("LoginUserId",LoginUserId); - model.addAttribute("estid",estid); - model.addAttribute("tmid",tmid); - return BasePath+"edit_stage_modal"; - } - + public String editStageModal(Model model, @RequestParam(value = "estid", required = false) String estid, + @RequestParam(value = "tmid", required = false) String tmid) { + System.out.println("EST ID: " + estid); + String LoginUserId = LoginUserInfo.getLoginUserId(); + model.addAttribute("LoginUserId", LoginUserId); + model.addAttribute("estid", estid); + model.addAttribute("tmid", tmid); + return BasePath + "edit_stage_modal"; + } + @GetMapping("/update_project_status") public String updateProjectStatus(Model model) { - List> projectList = estimateService.getProjectList(); + List> projectList = estimateService.getProjectList(); model.addAttribute("projects", projectList); - - String LoginUserId = LoginUserInfo.getLoginUserId(); - model.addAttribute("LoginUserId",LoginUserId); - - return BasePath+"project_status_update"; - } - + + String LoginUserId = LoginUserInfo.getLoginUserId(); + model.addAttribute("LoginUserId", LoginUserId); + + return BasePath + "project_status_update"; + } + } diff --git a/src/main/resources/templates/modules/works/non-erp-works-add.html b/src/main/resources/templates/modules/works/non-erp-works-add.html index e515ff9..67dddeb 100644 --- a/src/main/resources/templates/modules/works/non-erp-works-add.html +++ b/src/main/resources/templates/modules/works/non-erp-works-add.html @@ -1,975 +1,947 @@ + + - + - -
- -
- - -
- -
- -
-
-