Subversion Repositories SmartDukaan

Rev

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

Rev 30246 Rev 30268
Line 515... Line 515...
515
		return "admin";
515
		return "admin";
516
	}
516
	}
517
 
517
 
518
	private List<Menu> prepareMenu(List<Menu> menus) {
518
	private List<Menu> prepareMenu(List<Menu> menus) {
519
		List<Menu> returnMenu = new ArrayList<>();
519
		List<Menu> returnMenu = new ArrayList<>();
520
		Map<Menu, List<Menu>> subMenuMap = new HashMap<Menu, List<Menu>>();
520
		Map<Menu, List<Menu>> subMenuMap = new HashMap<>();
521
		for (Menu menu : menus) {
521
		for (Menu menu : menus) {
522
			if (menu.get_parent() == null) {
522
			if (menu.get_parent() == null) {
523
				if (!subMenuMap.containsKey(menu)) {
523
				if (!subMenuMap.containsKey(menu)) {
524
					subMenuMap.put(menu, new ArrayList<>());
524
					subMenuMap.put(menu, new ArrayList<>());
525
				}
525
				}
Line 561... Line 561...
561
			List<PartnerDetailModel> allPartnerDetails = allfofoIds.stream().map(x -> partnerStats.get(x))
561
			List<PartnerDetailModel> allPartnerDetails = allfofoIds.stream().map(x -> partnerStats.get(x))
562
					.collect(Collectors.toList());
562
					.collect(Collectors.toList());
563
			LOGGER.info("allPartnerDetails" + allPartnerDetails);
563
			LOGGER.info("allPartnerDetails" + allPartnerDetails);
564
			PartnerDetailModel partnerDetailModel = partnerStatsService
564
			PartnerDetailModel partnerDetailModel = partnerStatsService
565
					.getAggregateStats(new ArrayList<>(allPartnerDetails));
565
					.getAggregateStats(new ArrayList<>(allPartnerDetails));
566
			//TODO: Removing Total should be restored
-
 
567
			//warehouseIdAndallValues.put(0, partnerDetailModel);
566
			warehouseIdAndallValues.put(0, partnerDetailModel);
568
		}
567
		}
569
		return warehouseIdAndallValues;
568
		return warehouseIdAndallValues;
570
	}
569
	}
571
 
570
 
572
	public Map<Integer, PartnerDetailModel> getPartnersStatDataFromFile() throws Exception {
571
	public Map<Integer, PartnerDetailModel> getPartnersStatDataFromFile() throws Exception {