Subversion Repositories SmartDukaan

Rev

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

Rev 26988 Rev 27007
Line 752... Line 752...
752
 
752
 
753
		public void setRegionalManager(String regionalManager) {
753
		public void setRegionalManager(String regionalManager) {
754
			this.regionalManager = regionalManager;
754
			this.regionalManager = regionalManager;
755
		}
755
		}
756
 
756
 
757
 
-
 
758
		private ScheduledTasks getOuterType() {
757
		private ScheduledTasks getOuterType() {
759
			return ScheduledTasks.this;
758
			return ScheduledTasks.this;
760
		}
759
		}
761
 
760
 
762
		@Override
761
		@Override
Line 1485... Line 1484...
1485
 
1484
 
1486
		LocalDateTime now = LocalDateTime.now();
1485
		LocalDateTime now = LocalDateTime.now();
1487
		LocalDateTime from = now.with(LocalTime.MIN);
1486
		LocalDateTime from = now.with(LocalTime.MIN);
1488
		String timeString = "Today %s";
1487
		String timeString = "Today %s";
1489
		// Send yesterday's report
1488
		// Send yesterday's report
1490
/*		if (now.getHour() < 13) {
1489
		/*
1491
			timeString = "Yesterday %s";
1490
		 * if (now.getHour() < 13) { timeString = "Yesterday %s"; from =
1492
			from = now.minusDays(1).;
-
 
1493
			now = from.with(LocalTime.MAX);
1491
		 * now.minusDays(1).; now = from.with(LocalTime.MAX);
1494
 
1492
		 * 
-
 
1493
		 * }
1495
		}*/
1494
		 */
1496
		List<Integer> fofoIds = null;
1495
		List<Integer> fofoIds = null;
1497
		if (fofoIdInt == null) {
1496
		if (fofoIdInt == null) {
1498
			fofoIds = fofoStoreRepository.selectAll().stream().filter(x -> x.isActive()).map(x -> x.getId())
1497
			fofoIds = fofoStoreRepository.selectAll().stream().filter(x -> x.isActive()).map(x -> x.getId())
1499
					.collect(Collectors.toList());
1498
					.collect(Collectors.toList());
1500
		} else {
1499
		} else {
Line 1745... Line 1744...
1745
				.sorted(Comparator.comparing(FofoReportingModel::getCode)
1744
				.sorted(Comparator.comparing(FofoReportingModel::getCode)
1746
						.thenComparing(FofoReportingModel::getRegionalManager)
1745
						.thenComparing(FofoReportingModel::getRegionalManager)
1747
						.thenComparing(FofoReportingModel::getTerritoryManager))
1746
						.thenComparing(FofoReportingModel::getTerritoryManager))
1748
				.map(FofoReportingModel::getFofoId).collect(Collectors.toList());
1747
				.map(FofoReportingModel::getFofoId).collect(Collectors.toList());
1749
		for (Integer fofoId : sortedPartnerSalesHeaders) {
1748
		for (Integer fofoId : sortedPartnerSalesHeaders) {
1750
			if(saleTargetReportModelMap.get(fofoId).getPast3daysSale()==0) {
1749
			if (saleTargetReportModelMap.get(fofoId).getPast3daysSale() == 0) {
1751
				sb.append("<tr style='background-color:red'>");
1750
				sb.append("<tr style='background-color:red'>");
1752
			} else {
1751
			} else {
1753
				sb.append("<tr>");
1752
				sb.append("<tr>");
1754
			}
1753
			}
1755
			sb.append("<td style='border:1px solid black;padding: 5px'>" + partnerSalesHeadersMap.get(fofoId).getCode()
1754
			sb.append("<td style='border:1px solid black;padding: 5px'>" + partnerSalesHeadersMap.get(fofoId).getCode()
1756
					+ "</td>");
1755
					+ "</td>");
1757
			sb.append("<td style='border:1px solid black;padding: 5px'>" + partnerSalesHeadersMap.get(fofoId).getBusinessName()
1756
			sb.append("<td style='border:1px solid black;padding: 5px'>"
1758
					+ "</td>");
1757
					+ partnerSalesHeadersMap.get(fofoId).getBusinessName() + "</td>");
1759
			sb.append("<td style='border:1px solid black;padding: 5px'>" + partnerSalesHeadersMap.get(fofoId).getRegionalManager()
1758
			sb.append("<td style='border:1px solid black;padding: 5px'>"
1760
					+ "</td>");
1759
					+ partnerSalesHeadersMap.get(fofoId).getRegionalManager() + "</td>");
1761
			sb.append("<td style='border:1px solid black;padding: 5px'>" + partnerSalesHeadersMap.get(fofoId).getTerritoryManager()
1760
			sb.append("<td style='border:1px solid black;padding: 5px'>"
1762
					+ "</td>");
1761
					+ partnerSalesHeadersMap.get(fofoId).getTerritoryManager() + "</td>");
1763
			sb.append("<td style='border:1px solid black;padding: 5px'>"
1762
			sb.append("<td style='border:1px solid black;padding: 5px'>"
1764
					+ saleTargetReportModelMap.get(fofoId).getTotalSale() + "</td>");
1763
					+ saleTargetReportModelMap.get(fofoId).getTotalSale() + "</td>");
1765
			sb.append("<td style='border:1px solid black;padding: 5px'>"
1764
			sb.append("<td style='border:1px solid black;padding: 5px'>"
1766
					+ saleTargetReportModelMap.get(fofoId).getSmartphoneSale() + "</td>");
1765
					+ saleTargetReportModelMap.get(fofoId).getSmartphoneSale() + "</td>");
1767
			sb.append("<td style='border:1px solid black;padding: 5px'>"
1766
			sb.append("<td style='border:1px solid black;padding: 5px'>"
Line 1819... Line 1818...
1819
				jsonObj.put("vibrate", 1);
1818
				jsonObj.put("vibrate", 1);
1820
				jsonObj.put("pid", pushNotification.getId());
1819
				jsonObj.put("pid", pushNotification.getId());
1821
				jsonObj.put("sound", 1);
1820
				jsonObj.put("sound", 1);
1822
				jsonObj.put("priority", "high");
1821
				jsonObj.put("priority", "high");
1823
				json.put("data", jsonObj);
1822
				json.put("data", jsonObj);
1824
				LOGGER.info("request {}",json);
1823
				LOGGER.info("request {}", json);
1825
				try {
1824
				try {
1826
					CloseableHttpClient client = HttpClients.createDefault();
1825
					CloseableHttpClient client = HttpClients.createDefault();
1827
					HttpPost httpPost = new HttpPost(FCM_URL);
1826
					HttpPost httpPost = new HttpPost(FCM_URL);
1828
 
1827
 
1829
					httpPost.setHeader("Content-Type", "application/json; utf-8");
1828
					httpPost.setHeader("Content-Type", "application/json; utf-8");