Subversion Repositories SmartDukaan

Rev

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

Rev 26329 Rev 26330
Line 257... Line 257...
257 
		if (hygieneCount == 0 && invalidHygieneCount == 0) {
 257 
		if (hygieneCount == 0 && invalidHygieneCount == 0) {
258 
			invalidHygieneCount = 1;
 258 
			invalidHygieneCount = 1;
259 
		}
 259 
		}
260 
		model.addAttribute("hygienePercentage", (hygieneCount * 100) / (invalidHygieneCount + hygieneCount));
 260 
		model.addAttribute("hygienePercentage", (hygieneCount * 100) / (invalidHygieneCount + hygieneCount));
261
261
262 
		//Hardcoded for valentine
 - 
 
263 
		if(LocalDate.now().isBefore(LocalDate.of(2020, 2, 17))) {
 - 
 
264 
			double valentineSales = fofoOrderItemRepository.selectSumAmountGroupByRetailer(LocalDate.of(2020, 2, 11).atStartOfDay(),
- 
 
265 
					LocalDate.of(2020, 2, 17).atStartOfDay(), fofoId, false).get(fofoId);
 - 
 
266 
			if(valentineSales < ONE_LAC) {
 - 
 
267 
				model.addAttribute("valentineSale", "ONE_LAC");
 - 
 
268 
				model.addAttribute("valentineShort", ONE_LAC - valentineSales);
 - 
 
269 
			} else if(valentineSales < TWO_LAC) {
 - 
 
270 
				model.addAttribute("valentineSale", "TWO_LAC");
 - 
 
271 
				model.addAttribute("valentineShort", TWO_LAC - valentineSales);
 - 
 
272 
			} else if (valentineSales < FOUR_LAC) {
 - 
 
273 
				model.addAttribute("valentineSale", "FOUR_LAC");
 - 
 
274 
				model.addAttribute("valentineShort", FOUR_LAC - valentineSales);
 - 
 
275 
			} else {
 - 
 
276 
				model.addAttribute("valentineSale", "CONGO");
 - 
 
277 
			}
 - 
 
278 
		}
 - 
 
279
- 
 
280 
		model.addAttribute("monthDays", LocalDate.now().minusDays(1).lengthOfMonth());
 262 
		model.addAttribute("monthDays", LocalDate.now().minusDays(1).lengthOfMonth());
281 
		model.addAttribute("dayOfMonth", LocalDate.now().minusDays(1).getDayOfMonth());
 263 
		model.addAttribute("dayOfMonth", LocalDate.now().minusDays(1).getDayOfMonth());
282 
		return "12dashboard34";
 264 
		return "12dashboard34";
283 
	}
 265 
	}
284 
 
 266 
 
Line 424... Line 406...
424 
				model.addAttribute("investments", this.getInvestments(loginDetails.getFofoId()));
 406 
				model.addAttribute("investments", this.getInvestments(loginDetails.getFofoId()));
425 
				model.addAttribute("isInvestmentOk", partnerInvestmentService.isInvestmentOk(loginDetails.getFofoId(),
 407 
				model.addAttribute("isInvestmentOk", partnerInvestmentService.isInvestmentOk(loginDetails.getFofoId(),
426 
						10, ProfitMandiConstants.CUTOFF_INVESTMENT));
 408 
						10, ProfitMandiConstants.CUTOFF_INVESTMENT));
427
409
428 
				//Hardcoded for valentine
 410 
				//Hardcoded for valentine
- 
 
 411 
				//Hardcoded for valentine
429 
				if(LocalDate.now().isBefore(LocalDate.of(2020, 1, 17))) {
 412 
				if(LocalDate.now().isBefore(LocalDate.of(2020, 2, 17))) {
430 
					double valentineSales = fofoOrderItemRepository.selectSumAmountGroupByRetailer(LocalDate.of(2019, 2, 11).atStartOfDay(),
413 
					double valentineSales = fofoOrderItemRepository.selectSumAmountGroupByRetailer(LocalDate.of(2020, 2, 11).atStartOfDay(),
431 
							LocalDate.of(2019, 2, 11).atStartOfDay(), loginDetails.getFofoId(), false).get(loginDetails.getFofoId());
 414 
							LocalDate.of(2020, 2, 17).atStartOfDay(), loginDetails.getFofoId(), false).get(loginDetails.getFofoId());
432 
					if(valentineSales < ONE_LAC) {
 415 
					if(valentineSales < ONE_LAC) {
433 
						model.addAttribute("valentineSale", "ONE_LAC");
 416 
						model.addAttribute("valentineSale", "ONE_LAC");
434 
						model.addAttribute("valentineShort", ONE_LAC - valentineSales);
 417 
						model.addAttribute("valentineShort", ONE_LAC - valentineSales);
435 
					} else if(valentineSales < TWO_LAC) {
 418 
					} else if(valentineSales < TWO_LAC) {
436 
						model.addAttribute("valentineSale", "TWO_LAC");
 419 
						model.addAttribute("valentineSale", "TWO_LAC");