merging changes related to load orders

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

@@ -28,6 +28,7 @@
 import com.ots.common.UserBean;
 import com.ots.dao.OrderDaoImpl;
 import com.ots.dao.PaymentDaoImpl;
+import com.ots.service.OrderServiceImpl;
 import com.ots.service.UserManagementServiceImpl;
 
 @Controller
@@ -39,6 +40,9 @@ public class HomeController {
 	private UserManagementServiceImpl userManagementServiceImpl;
 	@Autowired
 	private PaymentDaoImpl paymentDaoImpl;
+
+	@Autowired
+	private OrderServiceImpl orderSerivceImpl;
 
 	@RequestMapping(value = "/home", method = RequestMethod.GET)
 	public String home(ModelMap model, HttpServletRequest request) {
@@ -206,6 +210,7 @@ public String cancelOrder(ModelMap model, @RequestParam(required = false) List<S
 		return ("orderSummary");
 	}
 
+
 	/**
 	 * This rest API accepts list of Order ids and makes the payment
 	 * 
@@ -286,7 +291,23 @@ public String index(HttpServletRequest request, ModelMap map) {
 	public ModelAndView logout(ModelMap model) {
 		return new ModelAndView("heading");
 	}
-
+
+
+	/**
+	 * This Rest API returns the Top menu jsp
+	 * 
+	 * @param model
+	 * @return
+	 */
+	@RequestMapping(value = "/loadOrders", method = RequestMethod.GET)
+	public ModelAndView loadOrders(ModelMap model,HttpServletRequest request) {
+		ClientBean clientBean = (ClientBean) request.getSession().getAttribute("selectedClient");
+		List<OrderSummaryBean> orders=orderSerivceImpl.fetchAllOrders(clientBean.getClientId());
+		model.addAttribute("orders", orders);
+		return new ModelAndView("orderSummary.jsp");
+	}
+
+
 	/**
 	 * This Api will be used for returning the page that displays the empty
 	 * "create new User" form

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

@@ -28,7 +28,7 @@
 public class OrderDaoImpl {
 
 	public static final String QUERY_INSERT_TASK = "INSERT INTO orders(id,type,quantity,commission_fees,commission_type,total_amt,oil_adjusted_quantity,date_placed ) VALUES (?,?,?,?,?,?,?,?)";
-	public static final String SELECT_ORDER_BY_USER_ID = "SELECT * FROM orders where order_id IN (SELECT order_id FROM places where client_id=?)";
+	public static final String SELECT_ORDER_BY_USER_ID = "SELECT * FROM orders where order_id IN (SELECT order_id FROM places where client_id= ?) order by date_placed desc";
 	public static final String UPDATE_ORDER = "UPDATE orders SET payment_id = ? WHERE order_id in (?)";
 
 	private JdbcTemplate adminJdbcConnectionTemplate;
@@ -40,7 +40,7 @@ public void setDataSource(DataSource adminDataSource, DataSource traderDataSourc
 	}
 
 	/**
-	 * Method for fetching details based on userName and password
+	 * Method for fetching all orders for a client in Descending order
 	 * 
 	 * @param userName
 	 * @param password
@@ -54,7 +54,6 @@ public void setValues(java.sql.PreparedStatement ps) throws SQLException {
 					}
 				}, new OrderRowMapper());
 		return orders;
-
 	}
 
 	/**

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

@@ -7,9 +7,11 @@
 
 import com.mysql.jdbc.exceptions.jdbc4.MySQLIntegrityConstraintViolationException;
 import com.ots.common.ClientBean;
+import com.ots.common.OrderSummaryBean;
 import com.ots.common.TraderBean;
 import com.ots.common.UserBean;
 import com.ots.dao.ClientDaoImpl;
+import com.ots.dao.OrderDaoImpl;
 import com.ots.dao.TraderDaoImpl;
 import com.ots.dao.UserDaoImpl;
 
@@ -23,28 +25,15 @@
 public class OrderServiceImpl {
 
 	@Autowired
-	private UserDaoImpl userDao;
-
-	@Autowired
-	private ClientDaoImpl clientDao;
-
-	@Autowired
-	private TraderDaoImpl traderDao;
-
+	private OrderDaoImpl orderDaoImpl;
+
 	/**
-	 * This method validates whether user's credentials are correct or not and
-	 * if not, it returns the null object.
-	 * 
-	 * @param userName
-	 * @param password
+	 * This method returns All Orders applicable for selected client
+	 * @param clientId
 	 * @return
 	 */
-	public UserBean validateAndFetchUserDetails(String userName, String password) {
-		UserBean user = userDao.getUserDetails(userName, password);
-		if (user != null) {
-			user.setPassword(null);
-		}
-		return user;
+	public List<OrderSummaryBean> fetchAllOrders(String clientId) {
+	return orderDaoImpl.getOrders(clientId);
 	}
 
  }

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

@@ -65,6 +65,18 @@
 		});
 	}
 
+	function loadOrders() {
+		$.ajax({
+			type : "GET",
+			url : "loadOrders",
+			data : "userId=" + userId,
+			success : function(data) {
+				$("#container").html(data);
+			}
+		});
+	}
+
+	
 	function cancelOrder() {
 		var orderIds = "";
 		$('input[type="Checkbox"]:checked').each(function() {