kanimozhi
/
GCC_Officer_Portal_updated
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Ward value updated based on zone in works module

master
KaNi-04 4 weeks ago
parent
50ed6ef9be
commit
ae80d96960
3 changed files with 1095 additions and 1105 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 287
      src/main/java/in/gov/chennaicorporation/gccoffice/controller/MenuController.java
  2. 167
      src/main/java/in/gov/chennaicorporation/gccoffice/works/controller/MainController.java
  3. 1686
      src/main/resources/templates/modules/works/non-erp-works-add.html

287
src/main/java/in/gov/chennaicorporation/gccoffice/controller/MenuController.java
View File

@ -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<AppModuleAccessEntity> getAppModuleAccessEntities;
List<AppModuleEntity> 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 = "<div class=\"nav-item\"><a href=\"/gcc\"><i class=\"ik ik-home\"></i><span>Dashboard</span></a></div>";
for (AppModuleEntity moduleName : getAppModuleEntities) {
menuHTML = menuHTML+"<div class=\"nav-item has-sub\"><a href=\"javascript:void(0)\"><i class=\""+moduleName.getIcon()+"\"></i><span>"+moduleName.getName()+"</span></a><div class=\"submenu-content\">";
List<MenuItemEntity> getMenuItems;
if(LoginUserInfo.getUserRole().equals("ADMIN")) {
getMenuItems = menuItemRepository.getMenuItemByModuleId(moduleName.getId());
}
else {
List<MenuItemAccessEntity> 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<SubMenuItemEntity> 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+"<a href=\""+subMenuItem.getUrl()+"\" class=\"menu-item\""+target+"><i class=\""+subMenuItem.getIcon()+"\"></i><span>"+subMenuItem.getName()+"</span></a>";
}
else {
subSubMenuHTML = subSubMenuHTML+"<a href=\"/gcc/"+subMenuItem.getUrl()+"\" class=\"menu-item\""+target+"><i class=\""+subMenuItem.getIcon()+"\"></i><span>"+subMenuItem.getName()+"</span></a>";
}
}
if(subSubMenuHTML.equals(""))
{
subMenuHTML = subMenuHTML+"<div class=\"nav-item has-sub\"><a href=\"javascript:void(0);\" class=\"menu-item\"><i class=\""+menuItem.getIcon()+"\"></i>"+menuItem.getName()+"</a></div>";
}
else {
subMenuHTML = subMenuHTML+"<div class=\"nav-item has-sub\"><a href=\"javascript:void(0);\" class=\"menu-item\"><i class=\""+menuItem.getIcon()+"\"></i>"+menuItem.getName()+"</a><div class=\"submenu-content\">"+subSubMenuHTML+"</div></div>";
}
}
else {
List<SubMenuItemAccessEntity> 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<SubMenuItemEntity> 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+"<a href=\""+subMenuItem.getUrl()+"\" class=\"menu-item\""+target+"><i class=\""+subMenuItem.getIcon()+"\"></i><span>"+subMenuItem.getName()+"</span></a>";
}
else {
subSubMenuHTML = subSubMenuHTML+"<a href=\"/gcc/"+subMenuItem.getUrl()+"\" class=\"menu-item\""+target+"><i class=\""+subMenuItem.getIcon()+"\"></i><span>"+subMenuItem.getName()+"</span></a>";
}
}
subMenuHTML = subMenuHTML+"<div class=\"nav-item has-sub\"><a href=\"javascript:void(0);\" class=\"menu-item\"><i class=\""+menuItem.getIcon()+"\"></i>"+menuItem.getName()+"</a><div class=\"submenu-content\">"+subSubMenuHTML+"</div></div>";
}
else {
subMenuHTML = subMenuHTML+"<div class=\"nav-item has-sub\"><a href=\"javascript:void(0);\" class=\"menu-item\"><i class=\""+menuItem.getIcon()+"\"></i>"+menuItem.getName()+"</a></div>";
}
}
}
else {
if(menuItem.getOrderby()>0) {
subMenuHTML = subMenuHTML+"<a href=\"/gcc/"+menuItem.getUrl()+"\" class=\"menu-item\"><i class=\""+menuItem.getIcon()+"\"></i><span>"+menuItem.getName()+"</span></a>";
}
}
}
menuHTML = menuHTML+subMenuHTML+"</div></div>";
}
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<AppModuleAccessEntity> getAppModuleAccessEntities;
List<AppModuleEntity> 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 = "<div class=\"nav-item\"><a href=\"/gcc\"><i class=\"ik ik-home\"></i><span>Dashboard</span></a></div>";
for (AppModuleEntity moduleName : getAppModuleEntities) {
menuHTML = menuHTML + "<div class=\"nav-item has-sub\"><a href=\"javascript:void(0)\"><i class=\""
+ moduleName.getIcon() + "\"></i><span>" + moduleName.getName()
+ "</span></a><div class=\"submenu-content\">";
List<MenuItemEntity> getMenuItems;
if (LoginUserInfo.getUserRole().equals("ADMIN")) {
getMenuItems = menuItemRepository.getMenuItemByModuleId(moduleName.getId());
} else {
List<MenuItemAccessEntity> 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<SubMenuItemEntity> 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 + "<a href=\"" + subMenuItem.getUrl()
+ "\" class=\"menu-item\"" + target + "><i class=\"" + subMenuItem.getIcon()
+ "\"></i><span>" + subMenuItem.getName() + "</span></a>";
} else {
subSubMenuHTML = subSubMenuHTML + "<a href=\"/gcc/" + subMenuItem.getUrl()
+ "\" class=\"menu-item\"" + target + "><i class=\"" + subMenuItem.getIcon()
+ "\"></i><span>" + subMenuItem.getName() + "</span></a>";
}
}
if (subSubMenuHTML.equals("")) {
subMenuHTML = subMenuHTML
+ "<div class=\"nav-item has-sub\"><a href=\"javascript:void(0);\" class=\"menu-item\"><i class=\""
+ menuItem.getIcon() + "\"></i>" + menuItem.getName() + "</a></div>";
} else {
subMenuHTML = subMenuHTML
+ "<div class=\"nav-item has-sub\"><a href=\"javascript:void(0);\" class=\"menu-item\"><i class=\""
+ menuItem.getIcon() + "\"></i>" + menuItem.getName()
+ "</a><div class=\"submenu-content\">" + subSubMenuHTML + "</div></div>";
}
} else {
List<SubMenuItemAccessEntity> 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<SubMenuItemEntity> 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 + "<a href=\"" + subMenuItem.getUrl()
+ "\" class=\"menu-item\"" + target + "><i class=\"" + subMenuItem.getIcon()
+ "\"></i><span>" + subMenuItem.getName() + "</span></a>";
} else {
subSubMenuHTML = subSubMenuHTML + "<a href=\"/gcc/" + subMenuItem.getUrl()
+ "\" class=\"menu-item\"" + target + "><i class=\"" + subMenuItem.getIcon()
+ "\"></i><span>" + subMenuItem.getName() + "</span></a>";
}
}
subMenuHTML = subMenuHTML
+ "<div class=\"nav-item has-sub\"><a href=\"javascript:void(0);\" class=\"menu-item\"><i class=\""
+ menuItem.getIcon() + "\"></i>" + menuItem.getName()
+ "</a><div class=\"submenu-content\">" + subSubMenuHTML + "</div></div>";
} else {
subMenuHTML = subMenuHTML
+ "<div class=\"nav-item has-sub\"><a href=\"javascript:void(0);\" class=\"menu-item\"><i class=\""
+ menuItem.getIcon() + "\"></i>" + menuItem.getName() + "</a></div>";
}
}
} else {
if (menuItem.getOrderby() > 0) {
subMenuHTML = subMenuHTML + "<a href=\"/gcc/" + menuItem.getUrl()
+ "\" class=\"menu-item\"><i class=\"" + menuItem.getIcon() + "\"></i><span>"
+ menuItem.getName() + "</span></a>";
}
}
}
menuHTML = menuHTML + subMenuHTML + "</div></div>";
}
return menuHTML;
}
}

167
src/main/java/in/gov/chennaicorporation/gccoffice/works/controller/MainController.java
View File

@ -19,7 +19,7 @@ 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;
@ -28,9 +28,9 @@ public class MainController {
private Map<String, List<String>> 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<Integer> zones = new ArrayList<>();
// List<Integer> zones = new ArrayList<>();
List<String> 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,49 +93,50 @@ public class MainController {
public List<String> 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<Integer> zones = new ArrayList<>(zoneWardMap.keySet());
// List<Integer> zones = new ArrayList<>(zoneWardMap.keySet());
String LoginUserId = LoginUserInfo.getLoginUserId();
model.addAttribute("LoginUserId",LoginUserId);
String LoginUserId = LoginUserInfo.getLoginUserId();
model.addAttribute("LoginUserId", LoginUserId);
//List<Map<String, Object>> workDetails = estimateService.getAllERPWorks(LoginUserId);
// List<Map<String, Object>> workDetails =
// estimateService.getAllERPWorks(LoginUserId);
//model.addAttribute("workDetails", workDetails);
//model.addAttribute("zones", zones);
return BasePath+"erpworkslist";
// 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<Integer> zones = new ArrayList<>(zoneWardMap.keySet());
// List<Integer> zones = new ArrayList<>(zoneWardMap.keySet());
String LoginUserId = LoginUserInfo.getLoginUserId();
model.addAttribute("LoginUserId",LoginUserId);
String LoginUserId = LoginUserInfo.getLoginUserId();
model.addAttribute("LoginUserId", LoginUserId);
//List<Map<String, Object>> workDetails = estimateService.getAllERPWorks(LoginUserId);
// List<Map<String, Object>> workDetails =
// estimateService.getAllERPWorks(LoginUserId);
//model.addAttribute("workDetails", workDetails);
//model.addAttribute("zones", zones);
return BasePath+"erpworkslist_report";
// 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<String> zones = new ArrayList<>(zoneWardMap.keySet());
String LoginUserId = LoginUserInfo.getLoginUserId();
model.addAttribute("LoginUserId",LoginUserId);
String LoginUserId = LoginUserInfo.getLoginUserId();
model.addAttribute("LoginUserId", LoginUserId);
List<Map<String, Object>> workDetails = estimateService.getAllNonERPWorks(LoginUserId);
model.addAttribute("workDetails", workDetails);
model.addAttribute("zones", zones);
return BasePath+"nonerpworkslist";
return BasePath + "nonerpworkslist";
}
//////////////////////////////////////////////////////////////
@ -144,82 +145,82 @@ public class MainController {
public String erpworksList(Model model) {
List<String> zones = new ArrayList<>(zoneWardMap.keySet());
String LoginUserId = LoginUserInfo.getLoginUserId();
model.addAttribute("LoginUserId",LoginUserId);
String LoginUserId = LoginUserInfo.getLoginUserId();
model.addAttribute("LoginUserId", LoginUserId);
//List<Map<String, Object>> workDetails = erpestimateService.getAllWorks(LoginUserId);
// List<Map<String, Object>> workDetails =
// erpestimateService.getAllWorks(LoginUserId);
//model.addAttribute("workDetails", workDetails);
// 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<Map<String, Object>> projectList = estimateService.getProjectList();
List<Map<String, Object>> projectList = estimateService.getProjectList();
model.addAttribute("projects", projectList);
String LoginUserId = LoginUserInfo.getLoginUserId();
model.addAttribute("LoginUserId",LoginUserId);
String LoginUserId = LoginUserInfo.getLoginUserId();
model.addAttribute("LoginUserId", LoginUserId);
return BasePath+"project_status_update";
}
return BasePath + "project_status_update";
}
}

1686
src/main/resources/templates/modules/works/non-erp-works-add.html
File diff suppressed because it is too large
View File

Write Preview
Loading…
Cancel
Save