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

 		try {
 			toDate = LocalDate.parse(toDateStr);
 		} catch (Exception e) {
 			return responseSender.badRequest("Invalid toDate (yyyy-MM-dd)");
+		}
+		// Reschedule must land on a STRICTLY future date — today is already in progress.
+		if (!toDate.isAfter(LocalDate.now()))
-		if (toDate.isBefore(LocalDate.now())) return responseSender.badRequest("Reschedule date cannot be in the past");
+			return responseSender.badRequest("Reschedule date must be in the future (today is already in progress).");
 		if ("reschedule_beat".equalsIgnoreCase(action)) {
 			boolean hasBeat = beatRepository.selectActiveByAuthUserId(d.getAuthUserId()).stream()
 					.flatMap(b -> beatScheduleRepository.selectByBeatId(b.getId()).stream())
 					.anyMatch(s -> s.getStartDate() != null && s.getStartDate().equals(toDate));
 		try {
 			date = LocalDate.parse(dateStr);
 		} catch (Exception e) {
 			return responseSender.badRequest("Invalid date (yyyy-MM-dd)");
+		}
+		// Drop-onto-beat must land on a STRICTLY future date — today is already in progress.
+		if (!date.isAfter(LocalDate.now()))
-		if (date.isBefore(LocalDate.now())) return responseSender.badRequest("Pick an upcoming date");
+			return responseSender.badRequest("Pick a future date — today is already in progress.");
 		BeatDeferredVisit d = beatDeferredVisitRepository.selectById(deferredId);
 		if (d == null) return responseSender.badRequest("Deferred record not found");
 		// A deferral can only move FORWARD — never onto the day it was deferred or earlier.
 			@RequestParam String planData) throws Exception {
 		Beat beat = beatRepository.selectById(beatId);
 		if (beat == null) return responseSender.badRequest("Beat not found");
+		// Refuse edits while the beat is "live" — i.e., a schedule row covers today.
+		// The salesperson is already on-route; mutating the plan mid-day would
+		// break their location_tracking timeline. Edits resume tomorrow.
+		LocalDate today = LocalDate.now();
+		boolean runningToday = beatScheduleRepository.selectByBeatId(beatId).stream()
+				.anyMatch(s -> s.getStartDate() != null && s.getStartDate().equals(today));
+		if (runningToday) {
+			return responseSender.badRequest(
+					"This beat is scheduled to run today — editing is locked until tomorrow. "
+							+ "Use the Deferred panel for today's adjustments.");
+		}
 		Gson gson = new Gson();
 		Type type = new TypeToken<Map<String, Object>>() {
 		}.getType();
 		Map<String, Object> plan = gson.fromJson(planData, type);
 		model.addAttribute("escalationTypes", visibleLevelsFor(request));
 		return "beat-plan-base-location";
+	}
 	// Tabular JSON: one row per (beat, scheduled date) in [startDate, endDate].
+	// Hierarchy-scoped: a manager sees only their downline + self; super-admins see all.
+	// Optional categoryId + escalationType further narrow the listing to users at
+	// a specific level (e.g. all Sales L1 in scope).
 	@GetMapping(value = "/beatPlan/scheduledList")
 	public ResponseEntity<?> scheduledList(
+			HttpServletRequest request,
 			@RequestParam(required = false) String startDate,
-			@RequestParam(required = false) String endDate) {
+			@RequestParam(required = false) String endDate,
+			@RequestParam(required = false) Integer categoryId,
+			@RequestParam(required = false) com.spice.profitmandi.dao.enumuration.cs.EscalationType escalationType) throws ProfitMandiBusinessException {
 		LocalDate start, end;
 		try {
 			start = (startDate == null || startDate.isEmpty()) ? LocalDate.now() : LocalDate.parse(startDate);
 			end = (endDate == null || endDate.isEmpty()) ? start.plusDays(7) : LocalDate.parse(endDate);
 		} catch (Exception e) {
 			return responseSender.badRequest("Invalid date — expected yyyy-MM-dd");
+		}
+		// ---- Scope: which auth users does the caller get to see ----
+		LoginDetails ld = cookiesProcessor.getCookiesObject(request);
+		AuthUser me = (ld != null) ? authRepository.selectByEmailOrMobile(ld.getEmailId()) : null;
+		Set<Integer> visible = null;
+		if (me != null && !isSuperAdmin(me)) {
+			visible = new HashSet<>(authService.getAllReportees(me.getId()));
+			visible.add(me.getId());
+		}
+		// If a (category, level) was picked, further restrict to that population.
+		Set<Integer> levelFilter = null;
+		if (categoryId != null && escalationType != null) {
+			levelFilter = csService.getAuthUserByCategoryId(categoryId, escalationType).stream()
+					.filter(AuthUser::getActive)
+					.map(AuthUser::getId)
+					.collect(java.util.stream.Collectors.toSet());
+		}
 		List<com.spice.profitmandi.dao.model.BeatDayDetails> beats =
 				beatPlanQueryService.getAllScheduledBeats(start, end);
+		final Set<Integer> visibleF = visible;
+		final Set<Integer> levelF = levelFilter;
+		beats = beats.stream()
+				.filter(b -> visibleF == null || visibleF.contains(b.getAuthUserId()))
+				.filter(b -> levelF == null || levelF.contains(b.getAuthUserId()))
+				.collect(java.util.stream.Collectors.toList());
 		// Resolve user names in bulk
 		Set<Integer> userIds = beats.stream()
 				.map(com.spice.profitmandi.dao.model.BeatDayDetails::getAuthUserId)
 				.collect(java.util.stream.Collectors.toSet());
 		Map<Integer, AuthUser> userMap = new HashMap<>();
 	// scheduled in a date range across all users. Each row has a View button that
 	// opens that user's calendar in a modal.
 	@GetMapping(value = "/beatPlan/dayView")
 	public String beatPlanDayView(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
 		model.addAttribute("escalationTypes", visibleLevelsFor(request));
+		// Matches /beatPlan/getAuthUsers and the Beat Report — default Sales category.
+		model.addAttribute("categoryId", com.spice.profitmandi.common.model.ProfitMandiConstants.TICKET_CATEGORY_SALES);
 		return "beat-plan-day-view";
+	}
 	// Returns visits for a beat.
 	// - Partner stops (beat_route) belong to the beat template — always returned.

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatPlanController.java – Rev 36814 → 36821