Subversion Repositories SmartDukaan

Rev

Rev 26014 | Rev 26024 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 26014 Rev 26022
Line 390... Line 390...
390 
		model.addAttribute("dayOfMonth", LocalDate.now().minusDays(1).getDayOfMonth());
 390 
		model.addAttribute("dayOfMonth", LocalDate.now().minusDays(1).getDayOfMonth());
391 
		return "dashboard1";
 391 
		return "dashboard1";
392 
	}
 392 
	}
393 
 
 393 
 
394 
	private String adminPanel(int fofoId, String email, Model model) throws ProfitMandiBusinessException {
 394 
	private String adminPanel(int fofoId, String email, Model model) throws ProfitMandiBusinessException {
395 
		List<Menu> menus;
 395 
		List<Menu> menus = null;
396 
		try {
 396 
		try {
397 
			AuthUser authUser = authRepository.selectByEmailOrMobile(email);
 397 
			AuthUser authUser = authRepository.selectByEmailOrMobile(email);
398 
			List<Position> positions = positionRepository.selectAll(authUser.getId());
 398 
			List<Position> positions = positionRepository.selectAll(authUser.getId());
- 
 
 399 
			if(positions.size() > 0) {
399 
			menus = menuRepository.selectAllByIds(menuCategoryRepository.selectAllByPositions(positions).stream()
 400 
				List<Integer> menuIds = menuCategoryRepository.selectAllByPositions(positions).stream()
400 
					.map(x -> x.getMenuId()).collect(Collectors.toList()));
 401 
				.map(x -> x.getMenuId()).collect(Collectors.toList());
- 
 
 402 
				LOGGER.info("Menu Ids are {}", menuIds);
- 
 
 403 
				if(menuIds.size() > 0) {
- 
 
 404 
					menus = menuRepository.selectAllByIds(menuIds);
- 
 
 405 
				}
- 
 
 406 
			}
401 
		} catch (ProfitMandiBusinessException e) {
 407 
		} catch (ProfitMandiBusinessException e) {
402 
			menus = menuRepository.selectAll();
 408 
			menus = menuRepository.selectAll();
403 
		}
 409 
		}
- 
 
 410 
			List<Menu> menuList = (menus != null) ? this.prepareMenu(menus) : new ArrayList<>();
404 
 
 411 
 
405 
		List<Menu> menu = this.prepareMenu(menus);
 - 
 
406 
 
 - 
 
407 
		model.addAttribute("menu", menu);
 412 
		model.addAttribute("menu", menuList);
408 
		return "admin";
 413 
		return "admin";
409 
	}
 414 
	}
410 
 
 415 
 
411 
	private List<Menu> prepareMenu(List<Menu> menus) {
 416 
	private List<Menu> prepareMenu(List<Menu> menus) {
412 
		List<Menu> returnMenu = new ArrayList<>();
 417 
		List<Menu> returnMenu = new ArrayList<>();