Subversion Repositories SmartDukaan

Rev

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

Rev 24366 Rev 24383
Line 197... Line 197...
197
				model.addAttribute("size", size);
197
				model.addAttribute("size", size);
198
				LOGGER.info("sizeOriginal {}", size);
198
				LOGGER.info("sizeOriginal {}", size);
199
 
199
 
200
			}
200
			}
201
		}
201
		}
-
 
202
		
202
		boolean isInvestmentOk = partnerInvestmentService.isInvestmentOk(loginDetails.getFofoId(), 10, 30);
203
		boolean isInvestmentOk = partnerInvestmentService.isInvestmentOk(loginDetails.getFofoId(), 10, 30);
203
		LocalDate endDate = LocalDate.now().minusDays(1);
204
		LocalDate endDate = LocalDate.now().minusDays(1);
204
		LocalDate weekStartDate = endDate.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY));
205
		LocalDate weekStartDate = endDate.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY));
205
		LocalDate startDate = weekStartDate.minusWeeks(2);
206
		LocalDate startDate = weekStartDate.minusWeeks(2);
206
		List<PartnerDailyInvestment> partnerInvestments = new ArrayList<>();
207
		List<PartnerDailyInvestment> partnerInvestments = new ArrayList<>();
-
 
208
		try
-
 
209
		{
207
		PartnerDailyInvestment pdi = partnerInvestmentService.getInvestment(loginDetails.getFofoId(), 0);
210
		partnerInvestments.add(partnerInvestmentService.getInvestment(loginDetails.getFofoId(), 0));
208
		partnerInvestments.add(pdi);
-
 
209
		partnerInvestments.addAll(partnerDailyInvestmentRepository.selectAll(loginDetails.getFofoId(), startDate, endDate));
211
		partnerInvestments.addAll(partnerDailyInvestmentRepository.selectAll(loginDetails.getFofoId(), startDate, endDate));
210
 
212
		
-
 
213
		}
-
 
214
		catch(Exception e)
-
 
215
		{
211
		model.addAttribute("partnerInvestment", pdi);
216
			LOGGER.error("partner Investment can't exists");
-
 
217
		}
212
		model.addAttribute("isInvestmentOk", isInvestmentOk || roleManager.isAdmin(loginDetails.getRoleIds()));
218
		model.addAttribute("isInvestmentOk", isInvestmentOk || roleManager.isAdmin(loginDetails.getRoleIds()));
213
		model.addAttribute("investmentChart", this.getInvestmentChartData(partnerInvestments));
219
		model.addAttribute("investmentChart", this.getInvestmentChartData(partnerInvestments));
214
		model.addAttribute("fofoStore", fofoStore);
220
		model.addAttribute("fofoStore", fofoStore);
215
		model.addAttribute("fofoStore", fofoStore);
-
 
216
		model.addAttribute("walletAmount");
221
		model.addAttribute("walletAmount");
217
		model.addAttribute("appContextPath", request.getContextPath());
222
		model.addAttribute("appContextPath", request.getContextPath());
218
		model.addAttribute("isAdmin", roleManager.isAdmin(loginDetails.getRoleIds()));
223
		model.addAttribute("isAdmin", roleManager.isAdmin(loginDetails.getRoleIds()));
219
		model.addAttribute("webApiHost", webApiHost);
224
		model.addAttribute("webApiHost", webApiHost);
220
		model.addAttribute("webApiPort", webApiPort);
225
		model.addAttribute("webApiPort", webApiPort);