Subversion Repositories SmartDukaan

Rev

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

Rev 24338 Rev 24339
Line 4... Line 4...
4
import java.net.URISyntaxException;
4
import java.net.URISyntaxException;
5
import java.time.DayOfWeek;
5
import java.time.DayOfWeek;
6
import java.time.LocalDate;
6
import java.time.LocalDate;
7
import java.time.LocalDateTime;
7
import java.time.LocalDateTime;
8
import java.time.temporal.TemporalAdjusters;
8
import java.time.temporal.TemporalAdjusters;
-
 
9
import java.util.ArrayList;
9
import java.util.Arrays;
10
import java.util.Arrays;
10
import java.util.List;
11
import java.util.List;
11
 
12
 
12
import javax.servlet.http.HttpServletRequest;
13
import javax.servlet.http.HttpServletRequest;
13
 
14
 
Line 228... Line 229...
228
			}
229
			}
229
		}
230
		}
230
		LocalDate endDate = LocalDate.now().minusDays(1);
231
		LocalDate endDate = LocalDate.now().minusDays(1);
231
		LocalDate weekStartDate = endDate.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY));
232
		LocalDate weekStartDate = endDate.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY));
232
		LocalDate startDate = weekStartDate.minusWeeks(2);
233
		LocalDate startDate = weekStartDate.minusWeeks(2);
233
		List<PartnerDailyInvestment> partnerInvestments = 
234
		List<PartnerDailyInvestment> partnerInvestments = new ArrayList<>();
234
				Arrays.asList(partnerInvestmentService.getInvestment(loginDetails.getFofoId(), 0));
235
		partnerInvestments.add(partnerInvestmentService.getInvestment(loginDetails.getFofoId(), 0));
235
				partnerInvestments.addAll(partnerDailyInvestmentRepository.selectAll(loginDetails.getFofoId(), startDate, endDate));
236
		partnerInvestments.addAll(partnerDailyInvestmentRepository.selectAll(loginDetails.getFofoId(), startDate, endDate));
236
 
237
 
237
		model.addAttribute("investmentChart", this.getInvestmentChartData(partnerInvestments));
238
		model.addAttribute("investmentChart", this.getInvestmentChartData(partnerInvestments));
238
		model.addAttribute("sale", sale);
239
		model.addAttribute("sale", sale);
239
		model.addAttribute("walletAmount", walletAmount);
240
		model.addAttribute("walletAmount", walletAmount);
240
		model.addAttribute("inStockAmount", inStockAmount);
241
		model.addAttribute("inStockAmount", inStockAmount);