WebSVN – SmartDukaan – Diff – /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java

 import com.spice.profitmandi.common.model.DataInvestmentModel;
 import com.spice.profitmandi.common.model.DataModel;
 import com.spice.profitmandi.common.model.DatasetModel;
 import com.spice.profitmandi.common.model.Legend;
 import com.spice.profitmandi.common.model.LegendModel;
+import com.spice.profitmandi.common.model.LineChartModel;
 import com.spice.profitmandi.common.model.Notification;
 import com.spice.profitmandi.common.model.OptionModel;
 import com.spice.profitmandi.common.model.OptionsModel;
 import com.spice.profitmandi.common.model.PieLables;
 import com.spice.profitmandi.common.model.ProfitMandiConstants;
 		return "investmentdetails";
+	}
 	private ChartInvestmentModel getInvestmentChart(int fofoId) throws ProfitMandiBusinessException {
 		PartnerDailyInvestment investment = partnerInvestmentService.getInvestment(fofoId, 0);
 		Map<String, Float> investmentWalletAmount = new HashMap<>();
 		investmentWalletAmount.put("Wallet", investment.getWalletAmount());
 		investmentWalletAmount.put("InStock", investment.getInStockAmount());
-		investmentWalletAmount.put("Unbilled", investment.getUnbilledAmount());
+		investmentWalletAmount.put("Unbilled Order", investment.getUnbilledAmount());
 		investmentWalletAmount.put("GrnPending", investment.getGrnPendingAmount());
 		investmentWalletAmount.put("ReturnInTransit", investment.getReturnInTransitAmount());
+		if (investment.getShortInvestment() > 0) {
+			investmentWalletAmount.put("Short Investment", investment.getShortInvestment());
+		}
 		ChartInvestmentModel cm = new ChartInvestmentModel();
 		HashSet<String> labels = new HashSet<String>();
 		labels.addAll(investmentWalletAmount.keySet());
 		List<String> labelList = new ArrayList<>(labels);
 		List<String> backgroundColor = new ArrayList<>();
+		List<Float> labelsValue = new ArrayList<>();
 		List<Float> values = new ArrayList<>();
 		for (String label : labelList) {
 			values.add(investmentWalletAmount.get(label));
 			if (label.equals("Wallet")) {
 				backgroundColor.add("pink");
+			}
+			if (label.equals("Short Investment")) {
+				backgroundColor.add("red");
+			}
 			if (label.equals("InStock")) {
-				backgroundColor.add("limegreen");
+				backgroundColor.add("#9ACD32");
+			}
-			if (label.equals("Unbilled")) {
+			if (label.equals("Unbilled Order")) {
-				backgroundColor.add("red");
+				backgroundColor.add("blue");
+			}
 			if (label.equals("ReturnInTransit")) {
 				backgroundColor.add("orange");
+			}
 		LOGGER.info("cur Date" + curDate.withDayOfMonth(1));
 		LOGGER.info("curDateYear" + curDate.with(LocalTime.MAX));
-		Map<String, Double> brandwiseSale = fofoOrderItemRepository
+		Map<String, Double> brandwisesale = fofoOrderItemRepository
 				.selectSumAmountGroupByBrand(curDate.withDayOfMonth(1), curDate.with(LocalTime.MAX), fofoId);
-		LOGGER.info("brandwisesale" + brandwiseSale);
+		LOGGER.info("brandwisesale" + brandwisesale);
 		Map<Integer, Double> accesoriesmtdsale = fofoOrderRepository.selectSumSaleGroupByFofoIdsForMobileOrAccessories(
 				fofoId, curDate.withDayOfMonth(1), curDate.with(LocalTime.MAX), Optional.of(false));
-		brandwiseSale.put("Accessories", accesoriesmtdsale.get(fofoId));
+		brandwisesale.put("Accessories", accesoriesmtdsale.get(fofoId));
 		Map<String, Double> activatedImeisWithSellingPriceMTD = fofoOrderRepository
 				.selectValueOfActivatedImeis(curDate.withDayOfMonth(1), curDate.with(LocalTime.MAX), fofoId).stream()
 				.collect(Collectors.toMap(x -> x.getBrand(), x -> (double) x.getSellingPrice()));
 		Map<String, Double> activatedImeisWithSellingPriceLMTD = fofoOrderRepository
 				.selectValueOfActivatedImeis(curDate.withDayOfMonth(1).minusMonths(1),
 						curDate.with(LocalTime.MAX).minusMonths(1), fofoId)
 				.stream().collect(Collectors.toMap(x -> x.getBrand(), x -> (double) x.getSellingPrice()));
 		lmtdBrandWiseSale.put("Accessories", accesorieslmtdsale.get(fofoId));
 		ChartModel cm = new ChartModel();
 		HashSet<String> labels = new HashSet<String>();
-		labels.addAll(brandwiseSale.keySet());
+		labels.addAll(brandwisesale.keySet());
 		labels.addAll(lmtdBrandWiseSale.keySet());
 		List<String> labelList = new ArrayList<>(labels);
 		List<Double> mtdActivatedImeisValues = new ArrayList<>();
 			mtdActivatedImeisValues.add(activatedImeisWithSellingPriceMTD.get(label) == null ? 0
 					: activatedImeisWithSellingPriceMTD.get(label));
 			lmtdActivatedImeisValues.add(activatedImeisWithSellingPriceLMTD.get(label) == null ? 0
 					: activatedImeisWithSellingPriceLMTD.get(label));
-			mtdValues.add(brandwiseSale.get(label) == null ? 0 : brandwiseSale.get(label));
+			mtdValues.add(brandwisesale.get(label) == null ? 0 : brandwisesale.get(label));
-			if (brandwiseSale.get(label) != null) {
+			if (brandwisesale.get(label) != null) {
 				mtdUnActivatedImeisValues
-						.add(brandwiseSale.get(label) - (activatedImeisWithSellingPriceMTD.get(label) == null ? 0
+						.add(brandwisesale.get(label) - (activatedImeisWithSellingPriceMTD.get(label) == null ? 0
 								: activatedImeisWithSellingPriceMTD.get(label)));
 			} else {
 				mtdUnActivatedImeisValues.add(0.0);
+			}
 			if (lmtdBrandWiseSale.get(label) != null) {
 		DatasetModel dsmtotal = new DatasetModel();
 		dsmtotal.setLabel("MTD");
 		dsmtotal.setBackgroundColor("blue");
 		dsmtotal.setData(mtdValues);
 		dsmtotal.setStack("stack0");
+		dsmtotal.setOrder(1);
 		DatasetModel dsmUnactivated = new DatasetModel();
 		dsmUnactivated.setLabel("MTD Unactivated");
 		dsmUnactivated.setBackgroundColor("red");
 		dsmUnactivated.setData(mtdUnActivatedImeisValues);
 		dsmUnactivated.setStack("stack0");
+		dsmUnactivated.setOrder(1);
 		LOGGER.info("mtdValuesMoney" + mtdValues);
 		DatasetModel mtdActivatedImeis = new DatasetModel();
 		mtdActivatedImeis.setLabel("MTD Activation");
 		mtdActivatedImeis.setData(mtdActivatedImeisValues);
-		mtdActivatedImeis.setBackgroundColor("blue");
+		mtdActivatedImeis.setBackgroundColor("#4169E1");
 		mtdActivatedImeis.setStack("stack0");
+		mtdActivatedImeis.setOrder(1);
 		DatasetModel lmtddsmtotal = new DatasetModel();
 		lmtddsmtotal.setLabel("LMTD");
 		lmtddsmtotal.setBackgroundColor("blue");
 		lmtddsmtotal.setData(lmtdValues);
 		lmtddsmtotal.setStack("stack1");
+		lmtddsmtotal.setOrder(1);
 		DatasetModel lmtdUnActivated = new DatasetModel();
 		lmtdUnActivated.setLabel("LMTD Unactivation");
 		lmtdUnActivated.setBackgroundColor("red");
 		lmtdUnActivated.setData(lmtdUnActivatedImeisValues);
 		lmtdUnActivated.setStack("stack1");
+		lmtdUnActivated.setOrder(1);
 		DatasetModel LmtdActivatedImeis = new DatasetModel();
 		LmtdActivatedImeis.setLabel("LMTD Activation");
-		LmtdActivatedImeis.setBackgroundColor("blue");
+		LmtdActivatedImeis.setBackgroundColor("#6e7ecb");
 		LmtdActivatedImeis.setData(lmtdActivatedImeisValues);
 		LmtdActivatedImeis.setStack("stack1");
+		LmtdActivatedImeis.setOrder(1);
+		DatasetModel linemtdChart = new DatasetModel();
+		linemtdChart.setLabel("MTD");
+		linemtdChart.setBackgroundColor("#DCDCDC");
+		linemtdChart.setData(mtdValues);
+		linemtdChart.setType("line");
+		linemtdChart.setOrder(2);
+		DatasetModel lineLmtdChart = new DatasetModel();
+		lineLmtdChart.setLabel("LMTD");
+		lineLmtdChart.setBackgroundColor("#DCDCDC");
+		lineLmtdChart.setData(lmtdValues);
+		lineLmtdChart.setType("line");
+		lineLmtdChart.setOrder(2);
 		List<DatasetModel> datasets = new ArrayList<>();
 		datasets.add(dsmUnactivated);
 		datasets.add(mtdActivatedImeis);
 		datasets.add(lmtdUnActivated);
 		datasets.add(LmtdActivatedImeis);
+		datasets.add(linemtdChart);
+		datasets.add(lineLmtdChart);
 		DataModel dm = new DataModel();
 		dm.setDatasets(datasets);
 		dm.setLabels(labels);

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java – Rev 27895 → 27900