WebSVN – SmartDukaan – Diff – /trunk/profitmandi-fofo/src/main/webapp/resources/js/beat-plan-app.js

 								state.days.push({
 									dayNumber: d.dayNumber,
 									startLat: state.homeLat, startLng: state.homeLng,
 									startName: state.homeName,
 									visits: builtVisits,
-									endAction: d.dayNumber < beat.days.length ? 'DAYBREAK' : 'HOME',
+									endAction: d.endAction || (d.dayNumber < beat.days.length ? 'DAYBREAK' : 'HOME'),
 									totalKm: 0, totalMins: 0
 								});
 							});
 							state.currentDay = 1;
                                     dayNumber: d.dayNumber,
                                     startLat: startLat,
                                     startLng: startLng,
                                     startName: startName,
                                     visits: builtVisits,
+									// Use the actual end_action stored on this schedule row.
+									// The dayNumber-based inference is wrong for multi-instance
+									// beats (same beat scheduled on several dates) — every
+									// instance would have day N but only one was treated HOME.
-                                    endAction: d.dayNumber < beat.days.length ? 'DAYBREAK' : 'HOME',
+									endAction: d.endAction || (d.dayNumber < beat.days.length ? 'DAYBREAK' : 'HOME'),
                                     totalKm: d.totalKm || 0,
                                     totalMins: d.totalMins || 0
                                 });
                             });
 	var addr = partner.address || '';
 	var html = '<div class="marker-popup">';
 	html += '<h4>' + partner.code + ' - ' + name + '</h4>';
 	html += '<div class="popup-meta">' + addr + '</div>';
-	html += '<div class="popup-distance">~' + dist.toFixed(1) + ' km | ~' + fmtMins(travelMins) + ' travel + ' + VISIT_MINS + 'min visit</div>';
+	html += '<div class="popup-distance">~' + dist.toFixed(1) + ' km | ~' + fmtMins(travelMins) + ' travel + ' + VISIT_MINS + ' Minutes Discussion Time</div>';
 	html += '<button class="popup-next" onclick="addVisit(' + partner.fofoId + ',\'next\')">Next Visit</button>';
 	html += '<button class="popup-last" onclick="addVisit(' + partner.fofoId + ',\'last\')">Last Visit</button>';
 	html += '</div>';
 	infoWindow.setContent(html);
 			if (prevLat && prevLng && v.lat && v.lng) {
 				segDist = haversine(prevLat, prevLng, v.lat, v.lng) * ROAD_FACTOR;
 				segTime = (segDist / AVG_SPEED) * 60;
+			}
 			if (segDist > 0) {
+				// Show drive ETA and discussion-time dwell separately so the
+				// planner can see where the time goes.
-				html += '<div class="route-segment"><span class="seg-line"></span><span class="seg-dist">' + segDist.toFixed(1) + ' km | ' + fmtMins(segTime) + '</span></div>';
+				html += '<div class="route-segment"><span class="seg-line"></span><span class="seg-dist">'
+					+ segDist.toFixed(1) + ' km | '
+					+ fmtMins(segTime) + ' drive '
+					+ '<span style="color:#94a3b8;">+ ' + VISIT_MINS + ' Minutes Discussion Time</span>'
+					+ '</span></div>';
+			}
             var isLeadVisit = v.isLead || v.type === 'lead';
+			// Outlet/business name is the primary label; code is the muted subtitle.
+			// v.name is stored as "CODE - Outlet Name" — strip the code prefix.
+			var outletLabel = v.name || '';
+			if (v.code && outletLabel.indexOf(v.code + ' - ') === 0) {
+				outletLabel = outletLabel.substring(v.code.length + 3);
+			}
+			if (!outletLabel) outletLabel = v.code || '';
             html += '<div class="route-stop route-stop-clickable" data-fofoid="' + v.id + '" data-daynum="' + day.dayNumber + '" style="cursor:pointer;' + (isLeadVisit ? 'background:#fff3cd;border-left:3px solid #e67e22;' : '') + '">';
             html += '<span class="stop-num" style="' + (isLeadVisit ? 'background:#e67e22;' : '') + '">' + (i + 1) + '</span>';
-            html += '<div class="stop-info"><div class="stop-name">' + (v.code || '') + (isLeadVisit ? ' <span style="color:#e67e22;font-size:10px;">LEAD VISIT</span>' : '') + '</div>';
+			html += '<div class="stop-info"><div class="stop-name">' + outletLabel + (isLeadVisit ? ' <span style="color:#e67e22;font-size:10px;">LEAD VISIT</span>' : '') + '</div>';
-            html += '<div class="stop-meta">' + (v.name || '') + '</div>';
+			html += '<div class="stop-meta">' + (v.code || '') + '</div>';
             // Show "Last Visit" + "Day Break" buttons on last stop of current day
             if (isLastStop && isCurrent && !day.endAction) {
                 html += '<div style="margin-top:4px;display:flex;gap:4px;">';
                 html += '<button class="btn-last-visit" data-daynum="' + day.dayNumber + '" style="font-size:10px;padding:2px 8px;border:none;border-radius:3px;background:#22c55e;color:#fff;cursor:pointer;font-weight:600;">Last Visit</button>';
 			if (lastV.lat && lastV.lng && state.homeLat && state.homeLng) {
 				retDist = haversine(lastV.lat, lastV.lng, state.homeLat, state.homeLng) * ROAD_FACTOR;
 				retTime = (retDist / AVG_SPEED) * 60;
+			}
 			if (retDist > 0) {
+				// Return-home leg = travel time only (no discussion at home).
-                html += '<div class="route-segment"><span class="seg-line seg-line-home"></span><span class="seg-dist">' + retDist.toFixed(1) + ' km | ' + fmtMins(retTime) + ' (return)</span></div>';
+				html += '<div class="route-segment"><span class="seg-line seg-line-home"></span><span class="seg-dist">'
+					+ retDist.toFixed(1) + ' km | ' + fmtMins(retTime) + ' drive (return)'
+					+ '</span></div>';
+			}
 			html += '<div class="route-stop route-stop-home"><span class="stop-num">H</span><div class="stop-info"><div class="stop-name">Home</div></div></div>';
+		}
         // Day break indicator
 			+ 'Current:  ' + state.days.length + ' day(s)\n\n'
 			+ 'Please create a new beat for additional days.');
 		return;
+	}
+	// Build plan data — recompute every day's totals + per-leg distance/time
+	// fresh from the current state. recalcDay() only refreshes the CURRENT day,
+	// so older days could carry stale values; doing it here guarantees DB rows
-	// Build plan data
+	// match what the user sees in the panel.
 	var daysData = [];
 	state.days.forEach(function (day) {
 		if (day.visits.length === 0) return;
+		// Walk the visits in order, computing each leg from the previous point.
+		// Day always starts at (startLat, startLng); for the LAST stop, if
+		// endAction === 'HOME' we ALSO add the return-to-home leg into the day total
+		// (but not stored per-visit, just rolled into totalDistanceKm/totalTimeMins).
+		var prevLat = day.startLat, prevLng = day.startLng;
+		var dayKm = 0, dayMins = 0;
+		var visitsOut = [];
+		day.visits.forEach(function (v) {
+			var legKm = null, legMins = null;
+			if (prevLat != null && prevLng != null && v.lat != null && v.lng != null) {
+				legKm = haversine(prevLat, prevLng, v.lat, v.lng) * ROAD_FACTOR;
+				legMins = Math.round((legKm / AVG_SPEED) * 60);
+				dayKm += legKm;
+				dayMins += legMins;
+			}
+			visitsOut.push({
+				id: v.id,
+				type: v.type || 'partner',
+				distanceFromPrevKm: legKm != null ? Number(legKm.toFixed(3)) : null,
+				timeFromPrevMins: legMins
+			});
+			if (v.lat != null && v.lng != null) {
+				prevLat = v.lat;
+				prevLng = v.lng;
+			}
+		});
+		// Return-home leg if applicable
+		if (day.endAction === 'HOME' && day.visits.length > 0
+			&& state.homeLat != null && state.homeLng != null) {
+			var last = day.visits[day.visits.length - 1];
+			if (last.lat != null && last.lng != null) {
+				var retKm = haversine(last.lat, last.lng, state.homeLat, state.homeLng) * ROAD_FACTOR;
+				dayKm += retKm;
+				dayMins += (retKm / AVG_SPEED) * 60;
+			}
+		}
+		// Add per-stop dwell time
+		dayMins += day.visits.length * VISIT_MINS;
 		daysData.push({
 			dayNumber: day.dayNumber,
 			startLocationName: day.startName,
 			startLatitude: day.startLat ? day.startLat.toString() : null,
 			startLongitude: day.startLng ? day.startLng.toString() : null,
 			endAction: day.endAction,
 			stayLocationName: day.stayName,
 			stayLatitude: day.stayLat ? day.stayLat.toString() : null,
 			stayLongitude: day.stayLng ? day.stayLng.toString() : null,
-			totalDistanceKm: day.totalKm,
+			totalDistanceKm: Number(dayKm.toFixed(3)),
-			totalTimeMins: Math.round(day.totalMins),
+			totalTimeMins: Math.round(dayMins),
-			visits: day.visits.map(function (v) {
+			visits: visitsOut
-				return {id: v.id, type: v.type || 'partner'};
-			})
 		});
 	});
 	// EDIT RULE: detect removed leads → show popup with cancel/reschedule per lead
 	var removedLeads = [];

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/webapp/resources/js/beat-plan-app.js – Rev 36700 → 36711