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

 import java.net.URISyntaxException;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
-import java.time.temporal.WeekFields;
-import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.json.JSONArray;
+import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
 import com.spice.profitmandi.dao.entity.transaction.Order;
 import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
 import com.spice.profitmandi.dao.repository.dtr.NotificationPanelRepository;
 import com.spice.profitmandi.dao.repository.fofo.CurrentInventorySnapshotRepository;
 import com.spice.profitmandi.dao.repository.fofo.PartnerDailyInvestmentRepository;
-import com.spice.profitmandi.dao.repository.fofo.PurchaseReturnItemRepository;
 import com.spice.profitmandi.dao.repository.transaction.OrderRepository;
 import com.spice.profitmandi.service.authentication.RoleManager;
 import com.spice.profitmandi.service.inventory.InventoryService;
-import com.spice.profitmandi.service.slab.TargetSlabService;
 import com.spice.profitmandi.service.transaction.TransactionService;
 import com.spice.profitmandi.service.wallet.WalletService;
 import com.spice.profitmandi.web.model.LoginDetails;
 import com.spice.profitmandi.web.util.CookiesProcessor;
 import com.spice.profitmandi.web.util.MVCResponseSender;
-import be.ceau.chart.BarChart;
-import be.ceau.chart.color.Color;
-import be.ceau.chart.data.BarData;
-import be.ceau.chart.dataset.BarDataset;
-import be.ceau.chart.options.BarOptions;
-import be.ceau.chart.options.Title;
-import be.ceau.chart.options.scales.BarScale;
-import be.ceau.chart.options.scales.XAxis;
-import be.ceau.chart.options.scales.YAxis;
-import be.ceau.chart.options.ticks.LinearTicks;
 @Controller
 @Transactional(rollbackFor = Throwable.class)
 public class DashboardController {
+	private static final String IN_TRANSIT_STACK = "inTransitStack";
+	private static final String BILLING_PENDING_STACK = "billingPendingStack";
+	private static final String GRN_PENDING_STACK = "grnPendingStack";
+	private static final String SALES_STACK = "salesStack";
+	private static final String IN_STOCK_STACK = "inStockStack";
+	private static final String WALLET_STACK = "walletStack";
 	@Value("${web.api.host}")
 	private String webApiHost;
 	@Value("${web.api.scheme}")
 	private String webApiScheme;
 	private WalletService walletService;
 	@Autowired
 	private InventoryService inventoryService;
-	@Autowired
-	private TargetSlabService targetSlabService;
 	@Autowired
 	private OrderRepository orderRepository;
-	@Autowired
-	private PurchaseReturnItemRepository purchaseReturnItemRepository;
 	@Autowired
 	private PartnerDailyInvestmentRepository partnerDailyInvestmentRepository;
 	/*
 		// inventoryService.prebookingAvailabilitySendMessage(loginDetails.getFofoId());
 		return "dashboard";
+	}
 	private String getInvestmentChartData(List<PartnerDailyInvestment> partnerInvestments) {
-		List<List<Integer>> walletStackList = new ArrayList<>();
+		JSONObject scale = new JSONObject().put("scaleLabel", new JSONObject().put("scaleLabel", "Amount in Rs"));
-		List<List<Integer>> inStockStackList = new ArrayList<>();
+		JSONObject titleObject = new JSONObject()
-		List<List<Integer>> salesStackList = new ArrayList<>();
+				.put("display", true)
-		List<List<Integer>> grnPendingStackList = new ArrayList<>();
+				.put("text", "Investment Overview").put("display", true);
-		List<List<Integer>> billingPendingStackList = new ArrayList<>();
-		List<List<Integer>> inTransitStackList = new ArrayList<>();
-		List<List<LocalDate>> datesList = new ArrayList<>();
+		JSONObject barData = new JSONObject();
-		int currentWeekOfYear = 0;
+		JSONObject walletStack = new JSONObject().put("label", "Wallet").put("backgroundColor","rgba(255, 99, 132, 0.2)")
-		List<Integer> walletStack = null;
+				.put("label", "Wallet").put("stack", WALLET_STACK).put("data", new JSONArray());
+		JSONObject inStockStack = new JSONObject().put("label", "In Stock").put("backgroundColor","rgba(54, 162, 235, 0.2)")
-		List<Integer> inStockStack = null;
+				.put("label", "In Stock").put("stack", IN_STOCK_STACK).put("data", new JSONArray());
+		JSONObject salesStack = new JSONObject().put("label", "Sales").put("backgroundColor","rgba(255, 206, 86, 0.2)")
-		List<Integer> salesStack = null;
+				.put("label", "Sales").put("stack", SALES_STACK).put("data", new JSONArray());
+		JSONObject grnPendingStack = new JSONObject().put("label", "Grn Pending").put("backgroundColor","rgba(75, 192, 192, 0.2)")
-		List<Integer> grnPendingStack = null;
+				.put("label", "Grn Pending").put("stack", GRN_PENDING_STACK).put("data", new JSONArray());
+		JSONObject  billingPendingStack = new JSONObject().put("label", "Billing Pending").put("backgroundColor","rgba(153, 102, 255, 0.2)")
-		List<Integer> billingPendingStack = null;
+				.put("label", "Billing Pending").put("stack", BILLING_PENDING_STACK).put("data", new JSONArray());
+		JSONObject inTransitStack = new JSONObject().put("label", "In Transit").put("backgroundColor","rgba(255, 159, 64, 0.2)")
-		List<Integer> inTransitStack = null;
+				.put("label", "Returned").put("stack", IN_TRANSIT_STACK).put("data", new JSONArray());
-		List<LocalDate> dates = null;
+		JSONArray dateLabels = new JSONArray();
 		for (PartnerDailyInvestment pdi : partnerInvestments) {
-			int weekOfYear = pdi.getDate().get(WeekFields.ISO.weekOfYear());
+			dateLabels = dateLabels.put(pdi.getDate().toString());
-			if (weekOfYear != currentWeekOfYear) {
-				walletStack = new ArrayList<>();
-				inStockStack = new ArrayList<>();
-				salesStack = new ArrayList<>();
-				grnPendingStack = new ArrayList<>();
-				billingPendingStack = new ArrayList<>();
-				inTransitStack = new ArrayList<>();
-				dates = new ArrayList<>();
-				currentWeekOfYear = weekOfYear;
-				walletStackList.add(walletStack);
-				inStockStackList.add(inStockStack);
-				salesStackList.add(salesStack);
-				grnPendingStackList.add(grnPendingStack);
-				billingPendingStackList.add(billingPendingStack);
-				inTransitStackList.add(inTransitStack);
-			}
-			walletStack.add((int)pdi.getWalletAmount());
+			walletStack.getJSONArray("data").put((int)pdi.getWalletAmount());
-			inStockStack.add((int)pdi.getInStockAmount());
+			inStockStack.getJSONArray("data").put((int)pdi.getInStockAmount());
-			salesStack.add((int)pdi.getSalesAmount());
+			salesStack.getJSONArray("data").put((int)pdi.getSalesAmount());
-			grnPendingStack.add((int)pdi.getGrnPendingAmount());
+			grnPendingStack.getJSONArray("data").put((int)pdi.getUnbilledAmount());
-			billingPendingStack.add((int)pdi.getUnbilledAmount());
+			billingPendingStack.getJSONArray("data").put((int)pdi.getGrnPendingAmount());
-			inTransitStack.add((int)pdi.getReturnInTransitAmount());
+			inTransitStack.getJSONArray("data").put((int)pdi.getReturnInTransitAmount());
-			datesList.add(dates);
+		}
-		int counter = 0;
-		BarData barData = new BarData();
+		JSONArray barDataSetsArray = new JSONArray().put(walletStack).put(inStockStack)
-		while(counter < walletStackList.size()) {
+				.put(salesStack).put(grnPendingStack).put(billingPendingStack).put(inTransitStack);
-			barData
-			.addDataset(new BarDataset().setData(walletStackList.get(counter).stream().mapToInt(i -> i).toArray()).setLabel("Wallet").addBackgroundColor(Color.BLUE))
+		barData.put("labels", dateLabels).put("datasets", barDataSetsArray);
-			.addDataset(new BarDataset().setData(inStockStackList.get(counter).stream().mapToInt(i -> i).toArray()).setLabel("In Stock").addBackgroundColor(Color.LIGHT_BLUE))
-			.addDataset(new BarDataset().setData(salesStackList.get(counter).stream().mapToInt(i -> i).toArray()).setLabel("Sales").addBackgroundColor(Color.YELLOW))
+		scale.put("yAxes", new JSONArray().put(new JSONObject().put("stacked", true)))
-			.addDataset(new BarDataset().setData(grnPendingStackList.get(counter).stream().mapToInt(i -> i).toArray()).setLabel("Grn Pending").addBackgroundColor(Color.LIGHT_YELLOW))
-			.addDataset(new BarDataset().setData(billingPendingStackList.get(counter).stream().mapToInt(i -> i).toArray()).setLabel("Billing Pending").addBackgroundColor(Color.GREEN))
-			.addDataset(new BarDataset().setData(inTransitStackList.get(counter).stream().mapToInt(i -> i).toArray()).setLabel("In Transit").addBackgroundColor(Color.GREEN_YELLOW));
+			.put("xAxes", new JSONArray().put(new JSONObject().put("stacked", true)));
-			counter++;
-		}
-		BarOptions barOptions = new BarOptions()
+		JSONObject barOptions = new JSONObject()
-				.setTitle(new Title().setDisplay(true).setText("Daily Investment Summary"))
+				.put("title", titleObject).put("responsive", true)
-				.setResponsive(true)
+				.put("scales", scale)
-				.setScales(new BarScale().addxAxes(new XAxis<LinearTicks>().setStacked(true))
+				.put("tooltips", new JSONObject().put("mode", "index").put("intersect", false));
-										 .addyAxes(new YAxis<LinearTicks>().setStacked(true))
-										 );
-		BarChart barChart = new BarChart(barData, barOptions);
+		JSONObject chartJSOn = new JSONObject().put("type", "bar").put("data", barData).put("options", barOptions);
-		return barChart.toJson();
+		return chartJSOn.toString();
+	}
 	// This method is currently hardcoded to faciliate watches sold as gift.
 	private boolean hasGift(int fofoId) {
 		try {
 	public String getPaginatedNotificationData(HttpServletRequest request,
 			@RequestParam(name = "offset", defaultValue = "0") int offset,
 			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model) throws Exception {
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
-		FofoStore fofoStore = null;
-		try {
-			fofoStore = fofoStoreRepository.selectByRetailerId(loginDetails.getFofoId());
-		} catch (ProfitMandiBusinessException e) {
-			LOGGER.error("FofoStore Code not found of fofoId {}", loginDetails.getFofoId());
-		}
 		if (roleManager.isAdmin(loginDetails.getRoleIds())) {
 			List<NotificationData> notificationData = null;
 			notificationData = notificationPanelRepository.selectAllNotificationData(offset, limit);

Subversion Repositories SmartDukaan

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