WebSVN – SmartDukaan – Diff – /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java

 			try {
 				fofoStore = fofoStoreRepository.selectByRetailerId(loginDetails.getFofoId());
 				if (!fofoStore.isActive()) {
 					return "redirect:/login";
+				}
 				PartnerType partnerType = partnerTypeChangeService.getTypeOnDate(fofoStore.getId(), LocalDate.now());
 				model.addAttribute("partnerType", partnerType);
 				model.addAttribute("partnerTypeImage", PartnerType.imageMap.get(partnerType));
 				model.addAttribute("fofoStore", fofoStore);
 				model.addAttribute("partnerType", partnerType);
 		return "accessories-brand-wise-report";
+	}
 	@RequestMapping(value = "/getMobileLMSGraph", method = RequestMethod.GET)
 	public String getMobileLMSGraph(HttpServletRequest request, @RequestParam(required = false) int warehouseId,
-			@RequestParam(required = false) LocalDate date, @RequestParam List<Integer> fofoIds, Model model)
+			@RequestParam(required = false) LocalDateTime date, @RequestParam(required = false) LocalDateTime endDate,
-			throws Exception {
+			@RequestParam List<Integer> fofoIds, @RequestParam String filterType, Model model) throws Exception {
 		Map<Integer, List<Integer>> warehouseIdFofoIdMap = fofoStoreRepository
 				.selectActivePartnersByRetailerIds(new ArrayList<>(fofoIds)).stream().collect(Collectors.groupingBy(
 						FofoStore::getWarehouseId, Collectors.mapping(FofoStore::getId, Collectors.toList())));
 		ChartModel cm;
 		if (warehouseId != 0) {
 			cm = adminUser.getBrandWiseLms(Arrays.asList(warehouseId),
-					fofoIds.stream().map(x -> x).collect(Collectors.toList()), date);
+					fofoIds.stream().map(x -> x).collect(Collectors.toList()), date.toLocalDate(),
+					endDate.toLocalDate(), filterType);
 		} else {
 			cm = adminUser.getBrandWiseLms(new ArrayList<>(warehouseIdFofoIdMap.keySet()),
-					fofoIds.stream().map(x -> x).collect(Collectors.toList()), date);
+					fofoIds.stream().map(x -> x).collect(Collectors.toList()), date.toLocalDate(),
+					endDate.toLocalDate(), filterType);
+		}
 		LOGGER.info("chartMap" + gson.toJson(cm));
 		model.addAttribute("chartMap", gson.toJson(cm));
+	}
 	@RequestMapping(value = "/getMobileLMSFilter", method = RequestMethod.GET)
 	public String getMobileLMSFilter(HttpServletRequest request,
 			@RequestParam(required = false, defaultValue = "0") int warehouseId,
-			@RequestParam(required = false) LocalDate date, Model model) throws Exception {
+			@RequestParam(required = false) LocalDateTime date, @RequestParam(required = false) LocalDateTime endDate,
+			Model model) throws Exception {
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		String email = loginDetails.getEmailId();
-		Map<String, Object> map = adminUser.getFilter(warehouseId, email, date);
-		model.addAttribute("warehouseId", warehouseId);
-		model.addAllAttributes(map);
-		return "chart-filter-lms";
+		if (date == null) {
-	}
+			LocalDateTime curDate = LocalDate.now().atStartOfDay();
-	@RequestMapping(value = "/getMobileLMPFilter", method = RequestMethod.GET)
+			LocalDateTime startOfMonth = curDate.withDayOfMonth(1).minusMonths(6);
-	public String getMobileLMPFilter(HttpServletRequest request,
-			@RequestParam(required = false, defaultValue = "0") int warehouseId,
+			date = startOfMonth.toLocalDate().atStartOfDay();
-			@RequestParam(required = false) LocalDate date, Model model) throws Exception {
+		}
+		if (endDate == null) {
-		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
+			LocalDateTime curDate = LocalDate.now().atTime(LocalTime.MAX);
-		String email = loginDetails.getEmailId();
+			endDate = curDate;
+		}
-		Map<String, Object> map = adminUser.getFilter(warehouseId, email, date);
+		Map<String, Object> map = adminUser.getFilter(warehouseId, email, date, endDate);
 		model.addAttribute("warehouseId", warehouseId);
 		model.addAllAttributes(map);
-		return "chart-filter-lmp";
+		return "chart-filter-lms";
+	}
 	@RequestMapping(value = "/getMobileLMPGraph", method = RequestMethod.GET)
 	public String getMobileLMPGraph(HttpServletRequest request, @RequestParam(required = false) int warehouseId,
-			@RequestParam(required = false) LocalDate date, @RequestParam List<Integer> fofoIds, Model model)
+			@RequestParam(required = false) LocalDateTime date, @RequestParam(required = false) LocalDateTime endDate,
-			throws Exception {
+			@RequestParam List<Integer> fofoIds, @RequestParam String filterType, Model model) throws Exception {
 		Map<Integer, List<Integer>> warehouseIdFofoIdMap = fofoStoreRepository
 				.selectActivePartnersByRetailerIds(new ArrayList<>(fofoIds)).stream().collect(Collectors.groupingBy(
 						FofoStore::getWarehouseId, Collectors.mapping(FofoStore::getId, Collectors.toList())));
 		ChartModel cm;
 		if (warehouseId != 0) {
 			cm = adminUser.getBrandWiseLmp(Arrays.asList(warehouseId),
-					fofoIds.stream().map(x -> x).collect(Collectors.toList()), date);
+					fofoIds.stream().map(x -> x).collect(Collectors.toList()), date.toLocalDate(),
+					endDate.toLocalDate(), filterType);
 		} else {
 			cm = adminUser.getBrandWiseLmp(new ArrayList<>(warehouseIdFofoIdMap.keySet()),
-					fofoIds.stream().map(x -> x).collect(Collectors.toList()), date);
+					fofoIds.stream().map(x -> x).collect(Collectors.toList()), date.toLocalDate(),
+					endDate.toLocalDate(), filterType);
+		}
 		LOGGER.info("chartMap" + gson.toJson(cm));
 		model.addAttribute("chartMap", gson.toJson(cm));

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java – Rev 30224 → 30279