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

 		Map<String, Object> result = new HashMap<>();
 		result.put("dtrUserId", dtrUserId);
 		result.put("authUserId", authUserId);
 		result.put("userName", au.getFirstName() + " " + au.getLastName());
 		result.put("parties", parties);
+		result.put("agendaOptions", com.spice.profitmandi.dao.enumuration.dtr.VisitAgenda.labels());
+		// Managers can't assign a visit while a scheduled beat's agenda is unfilled; the
+		// modal uses this flag to show the warning and disable the assign action. (A
+		// user with no beat that day is allowed — nothing to fill.)
+		boolean agendaFilled = agendaAllowsAssign(authUserId, parsedDate != null ? parsedDate : LocalDate.now());
+		result.put("agendaFilled", agendaFilled);
+		result.put("agendaNotFilledMessage", AGENDA_NOT_FILLED_MSG);
 		// Only non-auto agendas are manually assignable; auto ones surface via
 		// openAgendas (chips) and are woven into task_name server-side on submit.
 		result.put("agendaOptions", AgendaType.manualAssignableLabels());
 		return responseSender.ok(result);
+	}
 		// button on the UI isn't enough — block at the API too.
 		if (!taskDate.equals(LocalDate.now())) {
 			return responseSender.badRequest("Visits can only be assigned for today's date (" + LocalDate.now() + ")");
+		}
+		// Block when the executive has a beat scheduled today but hasn't filled its
+		// agenda yet (enforced here so it applies to every caller, not just the UI).
+		if (!agendaAllowsAssign(authUserId, taskDate)) {
+			return responseSender.badRequest(AGENDA_NOT_FILLED_MSG);
+		}
 		LocalDateTime now = LocalDateTime.now();
 		int createdCount = 0, updatedCount = 0;
 		for (Map<String, Object> p : selected) {
 			Integer fofoStoreId = ((Number) p.get("fofoStoreId")).intValue();
 		result.put("status", true);
 		result.put("instanceId", instanceId);
 		return responseSender.ok(result);
+	}
+	// Warning shown (and enforced) when a manager tries to assign a visit before the
+	// executive has filled their agenda for the day.
+	static final String AGENDA_NOT_FILLED_MSG = "Agenda not filled yet you cant assign visit";
+	// True when the agenda rule permits a manager to assign a visit to `authUserId`
+	// on `date`: either the executive has no beat scheduled that day (nothing to
+	// fill), or at least one of their scheduled beats has its agenda_filled_timestamp
+	// set. ONLY a scheduled-but-unfilled agenda blocks assignment.
+	private boolean agendaAllowsAssign(int authUserId, LocalDate date) {
+		if (date == null) return true;
+		List<Integer> beatIds = beatPlanQueryService.getAllScheduledBeats(date, date).stream()
+				.filter(b -> b.getAuthUserId() == authUserId)
+				.map(com.spice.profitmandi.dao.model.BeatDayDetails::getBeatId)
+				.distinct().collect(Collectors.toList());
+		if (beatIds.isEmpty()) return true;   // no beat scheduled → agenda rule doesn't apply
+		for (BeatSchedule bs : beatScheduleRepository.selectByBeatIds(beatIds)) {
+			if (bs.getStartDate() != null && bs.getStartDate().equals(date)
+					&& bs.getAgendaFilledTimestamp() != null) {
+				return true;
+			}
+		}
+		return false;
+	}
 	// ====================== DEFERRED PARTNERS ======================
 	// Heads review partners that weren't visited on their planned day and act on
 	// them. The deferral lifecycle lives in user.beat_deferred_visit (separate
 	// from the raw location_tracking event log). Detection = explicit
 	// (mark_type='DEFERRED') + derived (planned beat_route minus completed visits).
 	// Shared, idempotent lead_route write. Returns true when a new row is created,
 	// false when the lead is already on that (beat, date). Best-effort nudges the
 	// lead forward to BEAT_PLANNED. Callers are responsible for the beat-runs-on-date
 	// and future-date guards. Mirrors deferredAssignToBeat's lead branch.
 	private boolean writeLeadRoute(int beatId, int leadId, LocalDate date, int approverAuthId) {
+		return writeLeadRoute(beatId, leadId, date, approverAuthId, 9999);
+	}
+	// As above, but with an explicit route position — used when building a Lead beat
+	// where the leads carry a real ordering (vs 9999 "append" for one-off attaches).
+	private boolean writeLeadRoute(int beatId, int leadId, LocalDate date, int approverAuthId, int sequenceOrder) {
 		boolean exists = leadRouteRepository.selectByBeatId(beatId).stream()
 				.anyMatch(lr -> lr.getLeadId() == leadId
 						&& date.equals(lr.getScheduleDate())
 						&& !"CANCELLED".equals(lr.getStatus()));
 		if (exists) return false;
 		LocalDateTime now = LocalDateTime.now();
 		LeadRoute lr = new LeadRoute();
 		lr.setBeatId(beatId);
 		lr.setLeadId(leadId);
 		lr.setScheduleDate(date);
-		lr.setSequenceOrder(9999); // append; planner can reorder
+		lr.setSequenceOrder(sequenceOrder);
 		lr.setStatus("APPROVED");
 		lr.setApprovedBy(approverAuthId);
 		lr.setApprovedTimestamp(now);
 		lr.setCreatedTimestamp(now);
 		lr.setUpdatedTimestamp(now);
             // client so reports/dashboards don't have to recompute from lat/lng.
 			List<Map<String, Object>> visits = (List<Map<String, Object>>) day.get("visits");
 			if (visits != null) {
 				for (int i = 0; i < visits.size(); i++) {
 					Map<String, Object> visit = visits.get(i);
+					// Lead stop → lead_route (separate table, keyed by scheduleDate).
+					// planDate is guaranteed non-null for lead visits (validated above).
+					if ("lead".equals(visit.get("type"))) {
+						int leadId = ((Number) visit.get("id")).intValue();
+						writeLeadRoute(beat.getId(), leadId, planDate, currentUser.getId(), i);
+						continue;
+					}
 					BeatRoute route = new BeatRoute();
 					route.setBeatId(beat.getId());
 					route.setFofoId(((Number) visit.get("id")).intValue());
 					route.setVisitType("office".equals(visit.get("type"))
 							? com.spice.profitmandi.dao.enumuration.dtr.BeatVisitType.OFFICE

Subversion Repositories SmartDukaan

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