merging changes

src/main/java/com/ots/common/ClientBean.java

@@ -15,6 +15,8 @@ public class ClientBean {
 	private Double totalOilQuantity;
 	private Double balanceAmount;
 	private String level;
+	UserBean userBean ;
+
 
 	/**
 	 * @return the dateOfLevelUpgrade
@@ -90,14 +92,30 @@ public void setClientId(String clientId) {
 		this.clientId = clientId;
 	}
 
+	/**
+	 * @return the userBean
+	 */
+	public UserBean getUserBean() {
+		return userBean;
+	}
+
+	/**
+	 * @param userBean the userBean to set
+	 */
+	public void setUserBean(UserBean userBean) {
+		this.userBean = userBean;
+	}
+
 	/* (non-Javadoc)
 	 * @see java.lang.Object#toString()
 	 */
 	@Override
 	public String toString() {
 		return "ClientBean [clientId=" + clientId + ", dateOfLevelUpgrade=" + dateOfLevelUpgrade + ", totalOilQuantity="
-				+ totalOilQuantity + ", balanceAmount=" + balanceAmount + ", level=" + level + "]";
+				+ totalOilQuantity + ", balanceAmount=" + balanceAmount + ", level=" + level + ", userBean=" + userBean
+				+ "]";
 	}
+
 
 
 }

src/main/java/com/ots/controller/HomeController.java

@@ -143,7 +143,8 @@ public String searchUserResult(ModelMap model, @ModelAttribute UserBean searchUs
 	@RequestMapping(value = "/selectUser", method = RequestMethod.GET)
 	public String selectUser(ModelMap model, HttpServletRequest request, @RequestParam(required = false) String userId) {
 		logger.debug("searchUserBean= " + userId);
-		request.getSession().setAttribute("selectedClient", userId);
+		ClientBean bean =userManagementServiceImpl.getClientDetails(userId);
+		request.getSession().setAttribute("selectedClient", bean);
 		model.addAttribute("userId", userId);
 		return ("orderSummary");
 	}

src/main/java/com/ots/dao/UserDaoImpl.java

@@ -37,14 +37,10 @@ public class UserDaoImpl {
 	public static final String SEARCH_USER = "SELECT * FROM users WHERE (last_name=? OR apt_no=? OR street=? OR city=? OR zip_code=? OR phone_no=? OR cell_no=? OR email= ?) and id in(select client_id from client) order by email asc";
 
 	private JdbcTemplate adminJdbcConnectionTemplate;
-	private JdbcTemplate traderJdbcConnectionTemplate;
-	private JdbcTemplate clientJdbcConnectionTemplate;
 
 	@Autowired
 	public void setDataSource(DataSource adminDataSource, DataSource traderDataSource, DataSource clientDataSource) {
 		this.adminJdbcConnectionTemplate = new JdbcTemplate(adminDataSource);
-		this.traderJdbcConnectionTemplate = new JdbcTemplate(traderDataSource);
-		this.clientJdbcConnectionTemplate = new JdbcTemplate(clientDataSource);
 	}
 
 	/**

src/main/java/com/ots/rowmapper/UserRowMapper.java

@@ -7,16 +7,30 @@
 
 import com.ots.common.UserBean;
 
+/**
+ * RowMapper class for UserBean.java
+ * @author kanchan
+ *
+ */
 public class UserRowMapper implements RowMapper<UserBean> {
 
+	/**
+	 * This method maps Resultset to the UserBean
+	 */
 	public UserBean mapRow(ResultSet rs, int rowNum) throws SQLException {
 
 		UserBean user = new UserBean();
 		user.setFirstName(rs.getString("first_name"));
+		user.setLastName(rs.getString("last_name"));
+		user.setEmailId(rs.getString("email"));
+		user.setApartmentNumber(rs.getString("apt_no"));
+		user.setStreet(rs.getString("street"));
+		user.setCity(rs.getString("city"));
+		user.setPhoneNumber(rs.getInt("phone_no"));
+		user.setZipcode(rs.getInt("zip_code"));
+		user.setCellPhoneNumber(rs.getInt("cell_no"));
 		user.setId(rs.getString("id"));
 		user.setEmailId(rs.getString("email"));
-
-		// set all parameters of users row in the bean
 		return user;
 	}
 }

src/main/java/com/ots/service/UserManagementServiceImpl.java

@@ -51,11 +51,14 @@ public UserBean validateAndFetchUserDetails(String userName, String password) {
 	 * This method executes a select query on Client table by id and returns the
 	 * bean as output
 	 * 
-	 * @param clientID
+	 * @param email
 	 * @return
 	 */
-	public ClientBean getClientDetails(String clientID) {
-		ClientBean cbean = clientDao.getClientDetails(clientID);
+	public ClientBean getClientDetails(String email) {
+		ClientBean cbean = clientDao.getClientDetails(email);
+		if (cbean != null) {
+			cbean.setUserBean(userDao.getUserDetails(email));
+		}
 		return cbean;
 	}
 
@@ -68,7 +71,7 @@ public ClientBean getClientDetails(String clientID) {
 	 */
 
 	public TraderBean getTraderDetails(String traderID) {
-		TraderBean tbean = traderDao.getTraderDetails(traderID);		
+		TraderBean tbean = traderDao.getTraderDetails(traderID);
 		return tbean;
 
 	}
@@ -113,12 +116,11 @@ public List<String> getTraderFeatureCodes(String roleId) {
 	 * @param userBean
 	 */
 	public Boolean insertUser(UserBean userBean) {
-
-		try{
-		userDao.insertUserDetails(userBean);
-		}catch(MySQLIntegrityConstraintViolationException mse)
-		{
-		return null;
+
+		try {
+			userDao.insertUserDetails(userBean);
+		} catch (MySQLIntegrityConstraintViolationException mse) {
+			return null;
 		}
 		UserBean bean = userDao.getUserDetails(userBean.getEmailId());
 		System.out.println(bean);
@@ -134,10 +136,11 @@ public Boolean insertUser(UserBean userBean) {
 		}
 		return null;
 	}
-
 
 	/**
-	 * This method accepts search criteria and performs an OR search on users table.
+	 * This method accepts search criteria and performs an OR search on users
+	 * table.
+	 * 
 	 * @param userBean
 	 * @return
 	 */

src/main/webapp/WEB-INF/view/heading.jsp

@@ -1,16 +1,16 @@
 <%@ include file="include.jsp"%>
 <c:if test="${user!=null}">
-	<c:if test="${FEATURE_VIEW_REPORTS!=null}">
-
+		<a href="${pageContext.request.contextPath}">Home</a> |
+<c:if test="${FEATURE_VIEW_REPORTS!=null}">
 		<a href="#" onclick="viewReports()">View Reports</a> |
 </c:if>
 
 	<c:if test="${FEATURE_INSERT_USER!=null}">
-		<a href="#" onclick="createUser()">Create User</a>
+		<a href="#" onclick="createUser()">Create User</a> |
 	</c:if>
 
 	<c:if test="${FEATURE_EDIT_PROFILE!=null}">
-		<a href="#" onclick="updateProfile()">Edit Profile</a>
+		<a href="#" onclick="updateProfile()">Edit Profile</a> |
 	</c:if>
 
 	<a href="${pageContext.request.contextPath}/logout">Logout</a>