diff --git a/PMS_v2-master(edited)/WebContent/WEB-INF/views/FacultyTPC.jsp b/PMS_v2-master(edited)/WebContent/WEB-INF/views/FacultyTPC.jsp index b87b934..75d4ed2 100644 --- a/PMS_v2-master(edited)/WebContent/WEB-INF/views/FacultyTPC.jsp +++ b/PMS_v2-master(edited)/WebContent/WEB-INF/views/FacultyTPC.jsp @@ -56,8 +56,12 @@ --> - + + + + + diff --git a/PMS_v2-master(edited)/WebContent/WEB-INF/views/alTPC.jsp b/PMS_v2-master(edited)/WebContent/WEB-INF/views/alTPC.jsp new file mode 100644 index 0000000..7068dbb --- /dev/null +++ b/PMS_v2-master(edited)/WebContent/WEB-INF/views/alTPC.jsp @@ -0,0 +1,15 @@ +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> + + + + +Already A TPC + + +The individual you are trying to assign as TPC is already a TPC..! +
+
+Kindly go back and change your preferences..! + + \ No newline at end of file diff --git a/PMS_v2-master(edited)/WebContent/WEB-INF/views/alTPO.jsp b/PMS_v2-master(edited)/WebContent/WEB-INF/views/alTPO.jsp new file mode 100644 index 0000000..0abb259 --- /dev/null +++ b/PMS_v2-master(edited)/WebContent/WEB-INF/views/alTPO.jsp @@ -0,0 +1,15 @@ +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> + + + + +Already A TPO + + +The individual you are trying to assign as TPO is already a TPO..! +
+
+Kindly go back and change your preferences..! + + \ No newline at end of file diff --git a/PMS_v2-master(edited)/WebContent/WEB-INF/views/assignTPCF.jsp b/PMS_v2-master(edited)/WebContent/WEB-INF/views/assignTPCF.jsp index a6f410b..bd3affd 100644 --- a/PMS_v2-master(edited)/WebContent/WEB-INF/views/assignTPCF.jsp +++ b/PMS_v2-master(edited)/WebContent/WEB-INF/views/assignTPCF.jsp @@ -16,7 +16,7 @@ -

Assign TPC

+

Assign Student TPC

Assign TPCAssign Student TPC
Remove Student TPC
View Users
diff --git a/PMS_v2-master(edited)/WebContent/WEB-INF/views/noUser.jsp b/PMS_v2-master(edited)/WebContent/WEB-INF/views/noUser.jsp new file mode 100644 index 0000000..30e378f --- /dev/null +++ b/PMS_v2-master(edited)/WebContent/WEB-INF/views/noUser.jsp @@ -0,0 +1,18 @@ +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> + + + + +No User + + +No such user exists..! +
+
+Kindly check the username entered by you...! +
+
+Please go back and change your preferences..! + + \ No newline at end of file diff --git a/PMS_v2-master(edited)/WebContent/WEB-INF/views/notFac.jsp b/PMS_v2-master(edited)/WebContent/WEB-INF/views/notFac.jsp new file mode 100644 index 0000000..6b16267 --- /dev/null +++ b/PMS_v2-master(edited)/WebContent/WEB-INF/views/notFac.jsp @@ -0,0 +1,14 @@ +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> + + + + +Not Faculty + + +This individual cannot be assigned the desired post because he/she is not a Faculty Member +
+Kindly go back and change your preferences..! + + \ No newline at end of file diff --git a/PMS_v2-master(edited)/WebContent/WEB-INF/views/notStud.jsp b/PMS_v2-master(edited)/WebContent/WEB-INF/views/notStud.jsp new file mode 100644 index 0000000..6246ed9 --- /dev/null +++ b/PMS_v2-master(edited)/WebContent/WEB-INF/views/notStud.jsp @@ -0,0 +1,15 @@ +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> + + + + +Not Student + + +This individual cannot be assigned as Student TPC because he/she is not a Student +
+
+Kindly go back and change your preferences..! + + \ No newline at end of file diff --git a/PMS_v2-master(edited)/WebContent/WEB-INF/views/notTPC.jsp b/PMS_v2-master(edited)/WebContent/WEB-INF/views/notTPC.jsp new file mode 100644 index 0000000..dcd19f3 --- /dev/null +++ b/PMS_v2-master(edited)/WebContent/WEB-INF/views/notTPC.jsp @@ -0,0 +1,15 @@ +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> + + + + +Not TPC + + +This individual cannot be removed ...! +
+
+Kindly go back and change your preferences..! + + \ No newline at end of file diff --git a/PMS_v2-master(edited)/WebContent/WEB-INF/views/notTPO.jsp b/PMS_v2-master(edited)/WebContent/WEB-INF/views/notTPO.jsp new file mode 100644 index 0000000..a220e46 --- /dev/null +++ b/PMS_v2-master(edited)/WebContent/WEB-INF/views/notTPO.jsp @@ -0,0 +1,15 @@ +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> + + + + +Not TPO + + +This individual cannot be removed as TPO because he/she is not a TPO +
+
+Kindly go back and change your preferences..! + + \ No newline at end of file diff --git a/PMS_v2-master(edited)/WebContent/WEB-INF/views/removeTPCF.jsp b/PMS_v2-master(edited)/WebContent/WEB-INF/views/removeTPCF.jsp new file mode 100644 index 0000000..bc28486 --- /dev/null +++ b/PMS_v2-master(edited)/WebContent/WEB-INF/views/removeTPCF.jsp @@ -0,0 +1,37 @@ +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> +<%@taglib uri="http://www.springframework.org/tags/form" prefix="form"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> + + + + +Remove Student TPC + + + +

Remove Student TPC

+ +
+ + + + + + + + +
User name:
+ + + Home + + + + diff --git a/PMS_v2-master(edited)/src/org/crce/interns/controller/AssignTPCController.java b/PMS_v2-master(edited)/src/org/crce/interns/controller/AssignTPCController.java index f18b4dc..8322588 100644 --- a/PMS_v2-master(edited)/src/org/crce/interns/controller/AssignTPCController.java +++ b/PMS_v2-master(edited)/src/org/crce/interns/controller/AssignTPCController.java @@ -70,15 +70,6 @@ public ModelAndView assignTPC(@ModelAttribute("command") UserDetailsBean userBea return new ModelAndView("assignTPC"); } - - - - - - - - - @RequestMapping(value = "/RemoveTPC", method = RequestMethod.GET) public ModelAndView removeTPC(@ModelAttribute("command") UserDetailsBean userBean, BindingResult result) { System.out.println("In Remove TPC\n"); @@ -96,8 +87,23 @@ public ModelAndView submitAssignTPC(@ModelAttribute("command") UserDetailsBean u //System.out.println("Task Assigned is "+fuserBean.getUserWork()); int a; a=userService.assignTPC(userBean); - FacultyUserBean fuserBean= new FacultyUserBean(); - + // FacultyUserBean fuserBean= new FacultyUserBean(); + System.out.println("Value Returned from Service: "+a); + if(a==0) + { + return new ModelAndView("noUser"); + } + if(a==3) + { + return new ModelAndView("notStud"); + } + if(a==4) + { + return new ModelAndView("notFac"); + } + if(a==34){ + return new ModelAndView("alTPC"); + } return new ModelAndView("redirect:/ViewUsersT"); //return new ModelAndView("redirect:/TPOHome"); } @@ -114,8 +120,15 @@ public ModelAndView createWork(@ModelAttribute("command") FacultyUserBean fuserB return new ModelAndView("insertWork"); } System.out.println("Username in Controller :"+fuserBean.getUserName()); - userService.insertWork(fuserBean); - + int a; + a=userService.insertWork(fuserBean); + + System.out.println("Value Returned from Service: "+a); + if(a==0) + { + return new ModelAndView("noUser"); + } + return new ModelAndView("redirect:/ViewFacultyTasks"); } @@ -128,7 +141,17 @@ public ModelAndView submitRemoveTPC(@ModelAttribute("command") UserDetailsBean u System.out.println("Binding Errors are present..."); return new ModelAndView("removeTPC"); } - userService.removeTPC(userBean); + int a; + a=userService.removeTPC(userBean); + System.out.println("Value Returned from Service: "+a); + if(a==0) + { + return new ModelAndView("noUser"); + } + if(a==33) + { + return new ModelAndView("notTPC"); + } return new ModelAndView("redirect:/ViewUsersT"); // return new ModelAndView("redirect:/TPOHome"); } diff --git a/PMS_v2-master(edited)/src/org/crce/interns/controller/AssignTPOController.java b/PMS_v2-master(edited)/src/org/crce/interns/controller/AssignTPOController.java index 28f3c62..c9be69c 100644 --- a/PMS_v2-master(edited)/src/org/crce/interns/controller/AssignTPOController.java +++ b/PMS_v2-master(edited)/src/org/crce/interns/controller/AssignTPOController.java @@ -67,7 +67,12 @@ public ModelAndView assignTPO(@ModelAttribute("command") UserDetailsBean userBea System.out.println("In Assign TPO\n"); return new ModelAndView("assignTPO"); } - + @RequestMapping(value = "/RemoveTPCF", method = RequestMethod.GET) + public ModelAndView removeTPCF(@ModelAttribute("command") UserDetailsBean userBean, BindingResult result) { + System.out.println("In Remove TPCF\n"); + return new ModelAndView("removeTPCF"); + } + @RequestMapping(value = "/RemoveTPO", method = RequestMethod.GET) public ModelAndView removeTPO(@ModelAttribute("command") UserDetailsBean userBean, BindingResult result) { System.out.println("In Remove TP0\n"); @@ -81,8 +86,20 @@ public ModelAndView createUser(@ModelAttribute("command") UserDetailsBean userBe System.out.println("Binding Errors are present..."); return new ModelAndView("assignTPO"); } - userService.assignTPO(userBean); - + int a; + a=userService.assignTPO(userBean); + System.out.println("Value Returned from Service: "+a); + if(a==0) + { + return new ModelAndView("noUser"); + } + if(a==5) + { + return new ModelAndView("notFac"); + } + if(a==55){ + return new ModelAndView("alTPO"); + } return new ModelAndView("redirect:/ViewUsersA"); //return new ModelAndView("redirect:/AdminHome"); } @@ -92,23 +109,73 @@ public ModelAndView createTPCF(@ModelAttribute("command") UserDetailsBean userBe validator.validate(userBean, bindingResult); if (bindingResult.hasErrors()) { System.out.println("Binding Errors are present..."); - return new ModelAndView("assignTPO"); + return new ModelAndView("assignTPCF"); } - userService.assignTPCF(userBean); + int a; + a=userService.assignTPCF(userBean); //return new ModelAndView("redirect:/FTPCHome"); + if(a==0) + { + return new ModelAndView("noUser"); + } + if(a==3) + { + return new ModelAndView("notStud"); + } + if(a==34){ + return new ModelAndView("alTPC"); + } return new ModelAndView("redirect:/ViewUsersF"); //return new ModelAndView("redirect:/AdminHome"); } @RequestMapping(value = "/SubmitRemoveTPO", method = RequestMethod.POST) public ModelAndView deleteUser(@ModelAttribute("command") UserDetailsBean userBean, BindingResult bindingResult) { + + System.out.println("In Submit RemoveTPo"); validator.validate(userBean, bindingResult); + System.out.println("In Submit RemoveTPo"); if (bindingResult.hasErrors()) { System.out.println("Binding Errors are present..."); return new ModelAndView("removeTPO"); } - userService.removeTPO(userBean); + int a; + a=userService.removeTPO(userBean); + System.out.println("Value Returned from Service: "+a); + if(a==0) + { + return new ModelAndView("noUser"); + } + if(a==55) + { + return new ModelAndView("notTPO"); + } return new ModelAndView("redirect:/ViewUsersA"); //return new ModelAndView("redirect:/AdminHome"); } + + @RequestMapping(value = "/SubmitRemoveTPCF", method = RequestMethod.POST) + public ModelAndView deleteTPCF(@ModelAttribute("command") UserDetailsBean userBean, BindingResult bindingResult) { + + System.out.println("In Submit RemoveTPCF"); + validator.validate(userBean, bindingResult); + + if (bindingResult.hasErrors()) { + System.out.println("Binding Errors are present..."); + return new ModelAndView("removeTPCF"); + } + int a; + a=userService.removeTPCF(userBean); + System.out.println("in Remove TPCF:Value Returned from Service: "+a); + if(a==0) + { + return new ModelAndView("noUser"); + } + if(a==55) + { + return new ModelAndView("notTPC"); + } + return new ModelAndView("redirect:/ViewUsersF"); + //return new ModelAndView("redirect:/AdminHome"); + } } diff --git a/PMS_v2-master(edited)/src/org/crce/interns/dao/impl/AssignTPCDaoImpl.java b/PMS_v2-master(edited)/src/org/crce/interns/dao/impl/AssignTPCDaoImpl.java index f37de0a..dc9a638 100644 --- a/PMS_v2-master(edited)/src/org/crce/interns/dao/impl/AssignTPCDaoImpl.java +++ b/PMS_v2-master(edited)/src/org/crce/interns/dao/impl/AssignTPCDaoImpl.java @@ -49,7 +49,7 @@ public List viewUsers() { //return entityManager.createQuery("select u from UserDetails u",UserDetails.class).getResultList(); Session session = sessionFactory.openSession(); - String SQL_QUERY = "from UserDetails as u"; + String SQL_QUERY = "from UserDetails as u order by u.roleId"; Query query = session.createQuery(SQL_QUERY); List listUserDetails = query.list(); @@ -62,7 +62,7 @@ public List viewFacultyTasks() { // return entityManager.createQuery("select u from FacultyUser u", FacultyUser.class).getResultList(); Session session = sessionFactory.openSession(); - String SQL_QUERY = "from FacultyUser as f"; + String SQL_QUERY = "from FacultyUser as f order by f.userName"; Query query = session.createQuery(SQL_QUERY); List listUserDetails = query.list(); @@ -99,6 +99,7 @@ public FacultyUser getFacultyUser(FacultyUser fuser) { if (result == null) { System.out.println("Error : User not present in Faculty Table"); + return null; } System.out.println("UserName in DAO IMPL after query:" + result.getUserName()); System.out.println("UserWork in DAO IMPL after query:" + result.getUserWork()); diff --git a/PMS_v2-master(edited)/src/org/crce/interns/dao/impl/AssignTPODaoImpl.java b/PMS_v2-master(edited)/src/org/crce/interns/dao/impl/AssignTPODaoImpl.java index 3de831f..243c7a2 100644 --- a/PMS_v2-master(edited)/src/org/crce/interns/dao/impl/AssignTPODaoImpl.java +++ b/PMS_v2-master(edited)/src/org/crce/interns/dao/impl/AssignTPODaoImpl.java @@ -34,7 +34,7 @@ public List viewUsers() { // TODO Auto-generated method stub //return entityManager.createQuery("select u from UserDetails u", UserDetails.class).getResultList(); Session session = sessionFactory.openSession(); - String SQL_QUERY = "from UserDetails as u"; + String SQL_QUERY = "from UserDetails as u order by u.roleId"; Query query = session.createQuery(SQL_QUERY); List listUserDetails = query.list(); diff --git a/PMS_v2-master(edited)/src/org/crce/interns/service/AssignTPCService.java b/PMS_v2-master(edited)/src/org/crce/interns/service/AssignTPCService.java index c34636b..8eae2eb 100644 --- a/PMS_v2-master(edited)/src/org/crce/interns/service/AssignTPCService.java +++ b/PMS_v2-master(edited)/src/org/crce/interns/service/AssignTPCService.java @@ -9,10 +9,10 @@ public interface AssignTPCService { public int assignTPC (UserDetailsBean userBean); - public void removeTPC(UserDetailsBean userBean); + public int removeTPC(UserDetailsBean userBean); public List viewUsers(); public List viewFacultyTasks(); - public void insertWork(FacultyUserBean fuserBean); + public int insertWork(FacultyUserBean fuserBean); /* diff --git a/PMS_v2-master(edited)/src/org/crce/interns/service/AssignTPOService.java b/PMS_v2-master(edited)/src/org/crce/interns/service/AssignTPOService.java index 54b03f0..f071657 100644 --- a/PMS_v2-master(edited)/src/org/crce/interns/service/AssignTPOService.java +++ b/PMS_v2-master(edited)/src/org/crce/interns/service/AssignTPOService.java @@ -7,12 +7,13 @@ import org.springframework.stereotype.Service; public interface AssignTPOService { - public void assignTPO(UserDetailsBean userBean); + public int assignTPO(UserDetailsBean userBean); public List viewUsers(); - public void removeTPO(UserDetailsBean userBean); + public int removeTPO(UserDetailsBean userBean); - void assignTPCF(UserDetailsBean userBean); + public int assignTPCF(UserDetailsBean userBean); + public int removeTPCF(UserDetailsBean userBean); } diff --git a/PMS_v2-master(edited)/src/org/crce/interns/service/impl/AssignTPCServiceImpl.java b/PMS_v2-master(edited)/src/org/crce/interns/service/impl/AssignTPCServiceImpl.java index 857471e..032b941 100644 --- a/PMS_v2-master(edited)/src/org/crce/interns/service/impl/AssignTPCServiceImpl.java +++ b/PMS_v2-master(edited)/src/org/crce/interns/service/impl/AssignTPCServiceImpl.java @@ -19,27 +19,13 @@ public class AssignTPCServiceImpl implements AssignTPCService { @Autowired private AssignTPCDao assignTPCDao; - /*Methods to Insert the data */ + /* Methods to Insert the data */ @Override public int assignTPC(UserDetailsBean userBean) { UserDetails user = new UserDetails(); UserDetails checkUser = new UserDetails(); - RMUser rmuser= new RMUser(); - - - - - /*FacultyUserBean fuserBean = new FacultyUserBean(); - FacultyUser fuser = new FacultyUser(); - fuser.setUsername(userBean.getUsername()); - BeanUtils.copyProperties(fuser,fuserBean); - System.out.println("Frm Hell"+fuserBean.getUsername()); - - insertWork(fuserBean);*/ - - - - + RMUser rmuser = new RMUser(); + String st; BeanUtils.copyProperties(userBean, user); checkUser.setUserName(userBean.getUserName()); @@ -47,26 +33,27 @@ public int assignTPC(UserDetailsBean userBean) { checkUser = assignTPCDao.getUser(checkUser); System.out.println("User Role ID from JSP : " + userBean.getRoleId() + "\n"); - String roleID=userBean.getRoleId(); + String roleID = userBean.getRoleId(); System.out.println(roleID); - rmuser=assignTPCDao.getUserRole(roleID); - - System.out.println("User Id in RM Table: "+rmuser.getRole_id()); - System.out.println("User Role in RM Table: "+rmuser.getUserRole()); - + rmuser = assignTPCDao.getUserRole(roleID); + + System.out.println("User Id in RM Table: " + rmuser.getRole_id()); + System.out.println("User Role in RM Table: " + rmuser.getUserRole()); + if (checkUser == null) { System.out.println("Error:No User Defined" + "\n"); + return 0; } System.out.println("User Role ID from DB : " + checkUser.getRoleId() + "\n"); /* - *1-Student - *2-Faculty - *3-Student-TPC - *4-Faculty-TPC + * 1-Student 2-Faculty 3-Student-TPC 4-Faculty-TPC */ st = userBean.getRoleId(); - if (st.equalsIgnoreCase("1")) { + if (checkUser.getRoleId().equalsIgnoreCase("3")||checkUser.getRoleId().equalsIgnoreCase("4")) { + return 34; + } + else if (st.equalsIgnoreCase("1")) { if (checkUser.getRoleId().equalsIgnoreCase(userBean.getRoleId())) { System.out.println("Before update Student Role ID : " + checkUser.getRoleId() + "\n"); @@ -76,11 +63,9 @@ public int assignTPC(UserDetailsBean userBean) { return 1; } else { System.out.println("Invalid Input: Student" + "\n"); - return 0; + return 3; } - } - - else if (st.equalsIgnoreCase("2")) { + } else if (st.equalsIgnoreCase("2")) { System.out.println(userBean.getRoleId()); if (checkUser.getRoleId().equalsIgnoreCase(userBean.getRoleId())) { System.out.println("Before update Faculty Role ID : " + checkUser.getRoleId() + "\n"); @@ -90,7 +75,7 @@ else if (st.equalsIgnoreCase("2")) { return 1; } else { System.out.println("Invalid Input : Faculty" + "\n"); - return 0; + return 4; } } else { System.out.println("Error : No Such User Exists"); @@ -98,27 +83,30 @@ else if (st.equalsIgnoreCase("2")) { } } - + @Override - public void insertWork(FacultyUserBean fuserBean) { + public int insertWork(FacultyUserBean fuserBean) { FacultyUser fuser = new FacultyUser(); - + fuser.setUserName(fuserBean.getUserName()); - + fuser = assignTPCDao.getFacultyUser(fuser); - System.out.println("UserWorkk in Service with Bean: "+fuserBean.getUserWork()); - fuser.setUserWork(fuserBean.getUserWork()); - System.out.println("Username in Service IMPL :"+fuser.getUserName()); - System.out.println("UserWork in Service IMPL :"+fuser.getUserWork()); - + System.out.println(fuser); if (fuser == null) { - System.out.println("Error:No User Defined" + "\n"); + System.out.println("Error: No such User Defined" + "\n"); + return 0; } - //System.out.println("Username in Service IMPL :"+fuser.getUserName()); + + System.out.println("UserWorkk in Service with Bean: " + fuserBean.getUserWork()); + fuser.setUserWork(fuserBean.getUserWork()); + System.out.println("Username in Service IMPL :" + fuser.getUserName()); + System.out.println("UserWork in Service IMPL :" + fuser.getUserWork()); + assignTPCDao.insertWork(fuser); - // TODO Auto-generated method stub - } + return 1; + } + public List convertToBean(List userList) { List userBeanList = new ArrayList(); for (UserDetails user : userList) { @@ -128,7 +116,7 @@ public List convertToBean(List userList) { } return userBeanList; } - + public List convertToBeanFaculty(List userList) { List userBeanList = new ArrayList(); for (FacultyUser fuser : userList) { @@ -139,11 +127,8 @@ public List convertToBeanFaculty(List userList) { return userBeanList; } - - - @Override - public void removeTPC(UserDetailsBean userBean) { + public int removeTPC(UserDetailsBean userBean) { // TODO Auto-generated method stub UserDetails user = new UserDetails(); UserDetails checkUser = new UserDetails(); @@ -153,28 +138,29 @@ public void removeTPC(UserDetailsBean userBean) { checkUser = assignTPCDao.getUser(checkUser); if (checkUser == null) { - System.out.println("Error:No User Defined" + "\n"); + System.out.println("Error: No User Defined" + "\n"); + return 0; } if (checkUser.getRoleId().equalsIgnoreCase("3")) { System.out.println("Before update Student Role : " + checkUser.getRoleId() + "\n"); - checkUser.setRoleId("1");//1 is Student & 3 is Student tpc + checkUser.setRoleId("1");// 1 is Student & 3 is Student tpc System.out.println("After update Student Role : " + checkUser.getRoleId() + "\n"); assignTPCDao.removeTPC(checkUser); + return 1; } else if (checkUser.getRoleId().equalsIgnoreCase("4")) { System.out.println("Before update Faculty Role : " + checkUser.getRoleId() + "\n"); - checkUser.setRoleId("2");//2 is faculty & 4 is Fac tpc + checkUser.setRoleId("2");// 2 is faculty & 4 is Fac tpc System.out.println("After update Faculty Role : " + checkUser.getRoleId() + "\n"); assignTPCDao.removeTPC(checkUser); + return 1; } - else { - System.out.println("Error : No Such User Exists"); + System.out.println("Service :Error (LE) : No Such User Exists Last Error"); + return 33; } } - - - + @Override public List viewUsers() { // TODO Auto-generated method stub @@ -189,7 +175,4 @@ public List viewFacultyTasks() { return convertToBeanFaculty(userList); } - - - } \ No newline at end of file diff --git a/PMS_v2-master(edited)/src/org/crce/interns/service/impl/AssignTPOServiceImpl.java b/PMS_v2-master(edited)/src/org/crce/interns/service/impl/AssignTPOServiceImpl.java index 6a5a97a..ea393e6 100644 --- a/PMS_v2-master(edited)/src/org/crce/interns/service/impl/AssignTPOServiceImpl.java +++ b/PMS_v2-master(edited)/src/org/crce/interns/service/impl/AssignTPOServiceImpl.java @@ -17,7 +17,7 @@ public class AssignTPOServiceImpl implements AssignTPOService { private AssignTPODao userDao; @Override - public void assignTPO(UserDetailsBean userBean) { + public int assignTPO(UserDetailsBean userBean) { UserDetails user = new UserDetails(); UserDetails checkUser = new UserDetails(); BeanUtils.copyProperties(userBean, user); @@ -27,9 +27,14 @@ public void assignTPO(UserDetailsBean userBean) { if (checkUser == null) { System.out.println("Error:No User Defined" + "\n"); + return 0; } /*if (checkUser.getRoleId()==2|| checkUser.getRoleId()==4)*/ + if (checkUser.getRoleId().equalsIgnoreCase("5")) { + return 55; + } + if (checkUser.getRoleId().equalsIgnoreCase("2") || checkUser.getRoleId().equalsIgnoreCase("4")){ System.out.println("Before update Faculty Role ID : " + checkUser.getRoleId() + "\n"); @@ -37,15 +42,17 @@ public void assignTPO(UserDetailsBean userBean) { checkUser.setRoleId("5"); System.out.println("After update Faculty Role ID : " + checkUser.getRoleId() + "\n"); userDao.assignTPO(checkUser); + return 1; } else { - System.out.println("Error : No Such User Exists"); + System.out.println("Invalid Input : Faculty "); + return 5; } } @Override - public void assignTPCF(UserDetailsBean userBean) { + public int assignTPCF(UserDetailsBean userBean) { UserDetails user = new UserDetails(); UserDetails checkUser = new UserDetails(); BeanUtils.copyProperties(userBean, user); @@ -55,19 +62,24 @@ public void assignTPCF(UserDetailsBean userBean) { if (checkUser == null) { System.out.println("Error:No User Defined" + "\n"); + return 0; } /*if (checkUser.getRoleId()==2|| checkUser.getRoleId()==4)*/ - if (checkUser.getRoleId().equalsIgnoreCase("1")){ + if (checkUser.getRoleId().equalsIgnoreCase("3")) { + return 34; + } + else if (checkUser.getRoleId().equalsIgnoreCase("1")){ System.out.println("Before update Student Role ID : " + checkUser.getRoleId() + "\n"); //checkUser.setRoleId(5); checkUser.setRoleId("3"); System.out.println("After update Student Role ID : " + checkUser.getRoleId() + "\n"); userDao.assignTPO(checkUser); + return 1; } - else { - System.out.println("Error : No Such User Exists"); + System.out.println("Service :Invalid Input : Student"); + return 3; } } @@ -90,7 +102,7 @@ public List convertToBean(List userList) { } @Override - public void removeTPO(UserDetailsBean userBean) { + public int removeTPO(UserDetailsBean userBean) { // TODO Auto-generated method stub UserDetails user = new UserDetails(); UserDetails checkUser = new UserDetails(); @@ -100,7 +112,8 @@ public void removeTPO(UserDetailsBean userBean) { checkUser = userDao.getUser(checkUser); if (checkUser == null) { - System.out.println("Error:No User Defined" + "\n"); + System.out.println("Service: Error : No User Defined" + "\n"); + return 0; } /*if (checkUser.getRoleId()==5) */ @@ -110,11 +123,43 @@ public void removeTPO(UserDetailsBean userBean) { checkUser.setRoleId("2"); System.out.println("After update Faculty Role : " + checkUser.getRoleId() + "\n"); userDao.removeTPO(checkUser); + return 1; + } + else { + System.out.println("Service: Error(LE): No Such User Exists"); + return 55; + } + } + + @Override + public int removeTPCF(UserDetailsBean userBean) { + // TODO Auto-generated method stub + UserDetails user = new UserDetails(); + UserDetails checkUser = new UserDetails(); + BeanUtils.copyProperties(userBean, user); + checkUser.setUserName(userBean.getUserName()); + + checkUser = userDao.getUser(checkUser); + + if (checkUser == null) { + System.out.println("Service: Error : No User Defined" + "\n"); + return 0; } + /*if (checkUser.getRoleId()==5) */ + if (checkUser.getRoleId().equalsIgnoreCase("3")) { + System.out.println("Before update Faculty Role : " + checkUser.getRoleId() + "\n"); + //checkUser.setRoleId(2); + checkUser.setRoleId("1"); + System.out.println("After update Faculty Role : " + checkUser.getRoleId() + "\n"); + userDao.removeTPO(checkUser); + return 1; + } else { - System.out.println("Error : No Such User Exists"); + System.out.println("Service: Error(LE): No Such User Exists"); + return 55; } + } } \ No newline at end of file