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

 var VISIT_MINS = 30;
 var AVG_SPEED = 30;
 var DAY_LIMIT = 540;
 var ROAD_FACTOR = 1.3;
+var isSubmittingBeat = false; // guard against double-submit
 var COLORS = ['#3b82f6', '#ef4444', '#22c55e', '#a855f7', '#f59e0b', '#06b6d4', '#ec4899', '#334155', '#14b8a6', '#dc2626'];
 // ============ TOP BAR ============
 $('#bp-level').on('change', function () {
 	var level = $(this).val();
 $(document).on('click', '.beat-list-item', function () {
     var pg = $(this).data('plangroup');
     viewBeat(pg);
 });
-function viewBeat(planGroupId) {
+function viewBeat(planGroupId, planDate) {
     state.mode = 'view';
+	state.viewDate = planDate || null; // when set, show that run's leads
     $('#bottom-bar').hide();
     // Load partners first (for coordinates), then load beat visits
     $.ajax({
         url: context + "/beatPlan/getPartners", type: "GET", dataType: "json",
                 url: context + "/beatPlan/calendar", type: "GET", dataType: "json",
                 data: {authUserId: state.authUserId, month: '2020-01'},
                 success: function (r2) {
                     var calData = r2.response || r2;
                     var beat = (calData.scheduledBeats || []).find(function (b) {
-                        return b.planGroupId === planGroupId;
+						return String(b.planGroupId) === String(planGroupId);
                     });
                     if (!beat) {
                         alert('Beat not found');
                         return;
+                    }
                     // Reconstruct state.days from beat data for map drawing
                     // We need actual visit fofoIds — fetch from beat_plan records
                     $.ajax({
                         url: context + "/beatPlan/getBeatVisits", type: "GET", dataType: "json",
+						data: planDate
+							? {planGroupId: planGroupId, planDate: planDate}
-                        data: {planGroupId: planGroupId},
+							: {planGroupId: planGroupId},
                         success: function (r3) {
                             var visits = (r3.response || r3) || [];
                             // Group visits by dayNumber
                             var dayVisitsMap = {};
                             visits.forEach(function (v) {
                                 if (!dayVisitsMap[v.dayNumber]) dayVisitsMap[v.dayNumber] = [];
                                 dayVisitsMap[v.dayNumber].push(v);
                             });
-                            // Build days for route display
+							// Build days for route display.
+							// A beat scheduled on multiple dates has multiple schedule
+							// rows per day_number — dedupe so each day appears once.
                             state.days = [];
+							var seenDayNumbers = {};
                             beat.days.forEach(function (d) {
+								if (seenDayNumbers[d.dayNumber]) return; // skip duplicate day
+								seenDayNumbers[d.dayNumber] = true;
                                 var dayVisits = (dayVisitsMap[d.dayNumber] || []).sort(function (a, b) {
                                     return a.sequenceOrder - b.sequenceOrder;
                                 });
                                 var startLat = state.homeLat, startLng = state.homeLng, startName = state.homeName;
+                                }
                                 var builtVisits = [];
                                 dayVisits.forEach(function (v) {
                                     if (v.visitType === 'lead') {
-                                        // Lead visit — get lead geo from API (sync for simplicity)
-                                        var leadVisit = {
+										builtVisits.push({
                                             id: v.fofoId, type: 'lead',
                                             name: 'LEAD #' + v.fofoId,
                                             code: 'LEAD',
                                             lat: null, lng: null,
                                             isLead: true
-                                        };
-                                        $.ajax({
-                                            url: context + '/lead-geo/check/' + v.fofoId,
-                                            method: 'GET',
-                                            async: false,
-                                            success: function (resp) {
-                                                var geoData = resp.response || resp;
-                                                if (geoData && geoData.hasApprovedGeo) {
-                                                    leadVisit.lat = geoData.latitude;
-                                                    leadVisit.lng = geoData.longitude;
-                                                }
-                                            }
-                                        });
-                                        // Also get lead name
-                                        $.ajax({
-                                            url: context + '/getLead?leadId=' + v.fofoId,
-                                            method: 'GET',
-                                            async: false,
-                                            success: function (resp) {
-                                                var lead = resp.response || resp;
-                                                if (lead && lead.firstName) {
-                                                    leadVisit.name = 'LEAD - ' + lead.firstName + ' ' + (lead.lastName || '');
-                                                }
-                                            }
                                         });
-                                        builtVisits.push(leadVisit);
                                     } else {
                                         var p = partnerMap[v.fofoId];
                                         if (p) {
                                             builtVisits.push({
                                                 id: p.fofoId, type: 'partner',
                                 });
                             });
                             state.currentDay = 1;
-                            // Render left panel
+							// Collect all lead data promises across all days
+							var allLeadPromises = [];
-                            var html = '<div style="margin-bottom:8px;"><button class="btn-back-to-list" style="font-size:11px;padding:4px 10px;border:1px solid #475569;border-radius:4px;background:none;color:#94a3b8;cursor:pointer;font-family:inherit;">← Back to list</button></div>';
+							state.days.forEach(function (d) {
+								d.visits.forEach(function (v) {
+									if (v.isLead) {
+										allLeadPromises.push(
-                            html += '<div style="font-size:14px;font-weight:600;color:#60a5fa;margin-bottom:10px;">' + beat.beatName + '</div>';
+											$.get(context + '/lead-geo/check/' + v.id).then(function (resp) {
-                            $('#route-list').html(html);
+												var geoData = resp.response || resp;
+												if (geoData && geoData.hasApprovedGeo) {
+													v.lat = geoData.latitude;
+													v.lng = geoData.longitude;
+												}
+											})
+										);
+										allLeadPromises.push(
+											$.get(context + '/getLead?leadId=' + v.id).then(function (resp) {
+												var lead = resp.response || resp;
+												if (lead && lead.firstName) {
+													v.name = 'LEAD - ' + lead.firstName + ' ' + (lead.lastName || '');
+												}
+											})
+										);
+									}
+								});
+							});
+							// Wait for all lead data, then render
-                            // Use renderRoutePanel for consistent display (but without remove/daybreak buttons)
+							$.when.apply($, allLeadPromises).always(function () {
+								// Render left panel
-                            state.mode = 'view';
+								state.mode = 'view';
-                            renderRoutePanel();
+								renderRoutePanel();
+								var dateLabel = state.viewDate
+									? '<div style="font-size:11px;color:#f59e0b;margin-bottom:8px;">Run date: ' + state.viewDate + ' (showing this day\'s leads)</div>'
-                            // Prepend the back button + title before route days
+									: '<div style="font-size:11px;color:#94a3b8;margin-bottom:8px;">Beat template (partners only)</div>';
-                            $('#route-list').prepend('<div style="margin-bottom:8px;"><button class="btn-back-to-list" style="font-size:11px;padding:4px 10px;border:1px solid #475569;border-radius:4px;background:none;color:#94a3b8;cursor:pointer;font-family:inherit;">← Back to list</button></div><div style="font-size:14px;font-weight:600;color:#60a5fa;margin-bottom:10px;">' + beat.beatName + '</div>');
+								$('#route-list').prepend('<div style="margin-bottom:8px;"><button class="btn-back-to-list" style="font-size:11px;padding:4px 10px;border:1px solid #475569;border-radius:4px;background:none;color:#94a3b8;cursor:pointer;font-family:inherit;">← Back to list</button></div><div style="font-size:14px;font-weight:600;color:#60a5fa;margin-bottom:4px;">' + beat.beatName + '</div>' + dateLabel);
-                            // Init map with all partners + highlight beat route
+								// Init map with all partners + lead markers
-                            initMap();
+								initMap();
-                            // Add lead markers to map
-                            state.days.forEach(function (d) {
+								state.days.forEach(function (d) {
-                                d.visits.forEach(function (v, i) {
+									d.visits.forEach(function (v) {
-                                    if (v.isLead && v.lat && v.lng) {
+										if (v.isLead && v.lat && v.lng) {
-                                        var m = new google.maps.Marker({
+											var m = new google.maps.Marker({
-                                            map: map,
+												map: map,
-                                            position: {lat: v.lat, lng: v.lng},
+												position: {lat: v.lat, lng: v.lng},
-                                            title: v.name,
+												title: v.name,
-                                            label: {text: 'L', color: '#fff', fontSize: '11px', fontWeight: '700'},
+												label: {text: 'L', color: '#fff', fontSize: '11px', fontWeight: '700'},
-                                            icon: {
+												icon: {
-                                                path: google.maps.SymbolPath.CIRCLE,
+													path: google.maps.SymbolPath.CIRCLE,
-                                                scale: 16,
+													scale: 16,
-                                                fillColor: '#e67e22',
+													fillColor: '#e67e22',
-                                                fillOpacity: 0.95,
+													fillOpacity: 0.95,
-                                                strokeColor: '#fff',
+													strokeColor: '#fff',
-                                                strokeWeight: 2
+													strokeWeight: 2
-                                            }
+												}
-                                        });
+											});
-                                        markers[v.id] = m;
+											markers[v.id] = m;
-                                    }
+										}
-                                });
+									});
-                            });
+								});
-                            resetMarkerColors();
+								resetMarkerColors();
-                            drawRoute();
+								drawRoute();
+							});
+                        }
                     });
+                }
             });
+        }
     var beatTitle = prompt('Enter beat name:', '');
     if (!beatTitle || !beatTitle.trim()) return;
     state.beatTitle = beatTitle.trim();
     state.mode = 'create';
+	state.savedPlanGroupId = null; // reset — this is a fresh beat
+	state.days = [];               // clear any leftover route data
+	isSubmittingBeat = false;
     if (!state.homeLat) {
         showHomeModal();
     } else {
         loadPartners();
 	renderRoutePanel();
     updateBottomBar();
 });
 $('#btn-finish').on('click', function () {
+	// Guard 1: already submitting — ignore duplicate clicks
+	if (isSubmittingBeat) {
+		return;
+	}
+	// Guard 2: this beat was already saved — don't re-submit
+	if (state.savedPlanGroupId) {
+		alert('This beat is already saved.');
+		showBeatList();
+		return;
+	}
 	if (state.days.every(function (d) {
 		return d.visits.length === 0;
 	})) {
 		alert('No visits added');
 		return;
 	var dates = daysData.map(function () {
 		return null;
 	});
 	var planData = JSON.stringify({days: daysData, dates: dates, beatName: beatTitle.trim()});
+	isSubmittingBeat = true;
 	$('#btn-finish').prop('disabled', true).text('Saving...');
 	$.ajax({
 		url: context + "/beatPlan/submitPlan",
 		type: "POST",
 		data: {authUserId: state.authUserId, planData: planData},
 		success: function (response) {
 			var data = (typeof response === 'string' ? JSON.parse(response) : response);
 			var result = data.response || data;
-			$('#btn-finish').prop('disabled', false).text('Finish Plan');
 			if (result.status) {
+				// Mark as saved — finish button stays disabled, no re-submit possible
 				state.savedPlanGroupId = result.planGroupId;
 				$('#bottom-bar').hide();
                 if (result.duplicate) {
-                    alert('This beat already exists (same visits).');
+					alert('This beat already exists.');
                 } else {
                     alert('Beat "' + beatTitle + '" saved successfully!');
+                }
                 // Go back to beat list
                 showBeatList();
 			} else {
+				$('#btn-finish').prop('disabled', false).text('Finish Plan');
 				alert('Error saving beat plan');
+			}
+			isSubmittingBeat = false;
 		},
 		error: function (xhr) {
+			isSubmittingBeat = false;
 			$('#btn-finish').prop('disabled', false).text('Finish Plan');
 			alert('Error: ' + (xhr.responseText || xhr.statusText));
+		}
 	});
 });
 		state.calMonth = now.getFullYear() + '-' + ('0' + (now.getMonth() + 1)).slice(-2);
 		loadCalendarData();
+	}
 });
+// Click a beat chip on the calendar → view that specific day's route
+// (partners + only the leads scheduled for that exact date)
+$(document).on('click', '.cal-chip-view', function (e) {
+	if ($(e.target).hasClass('cal-chip-remove')) return; // handled separately
+	e.stopPropagation();
+	var pg = $(this).data('plangroup');
+	var date = $(this).data('date');
+	if (!pg || !date) return;
+	// Switch to Route tab and load that day's run
+	$('.panel-tab[data-tab="route"]').click();
+	viewBeat(String(pg), String(date));
+});
 // ============ CALENDAR ============
 $('#cal-prev').on('click', function () {
 	navMonth(-1);
 });
 $('#cal-next').on('click', function () {
 				if (b.status === 'running') chipCls += ' running';
 				if (b.status === 'completed') chipCls += ' completed';
                 var removeBtn = (!isPast && b.status !== 'running' && b.status !== 'completed')
                     ? '<span class="cal-chip-remove" data-date="' + ds + '" data-plangroup="' + (b.planGroupId || '') + '" title="Remove">&times;</span>'
                     : '';
-                row += '<span class="' + chipCls + '" style="background:' + b.color + ';position:relative;">'
+				row += '<span class="' + chipCls + ' cal-chip-view" data-plangroup="' + (b.planGroupId || '') + '" data-date="' + ds + '" style="background:' + b.color + ';position:relative;cursor:pointer;">'
                     + b.name + ' D' + b.day + (b.status === 'running' ? ' [live]' : '') + ' (' + b.visits + ')'
                     + removeBtn + '</span>';
 			});
 			if (isPicked) {
 	var ds = $(this).data('date');
     if (!ds || isDateBlocked(ds)) return;
     // Find the beat to get days needed
     var beat = (state.calData.scheduledBeats || []).find(function (b) {
-        return b.planGroupId === state.calSelectedBeat;
+		return String(b.planGroupId) === String(state.calSelectedBeat);
     });
     var daysNeeded = beat ? beat.days.length : 1;
     // Auto-fill consecutive slots from clicked date
     var slots = findConsecutiveSlots(ds, daysNeeded);
 		alert('Need ' + daysNeeded + ' dates but only ' + state.calPickedDates.length + ' selected.');
 		return;
+	}
 	var beat = (state.calData.scheduledBeats || []).find(function (b) {
-		return b.planGroupId === pg;
+		return String(b.planGroupId) === String(pg);
 	});
 	if (!beat) return;
 	$.ajax({
 		url: context + "/beatPlan/scheduleOnCalendar", type: "POST",
         alert('Cannot schedule on this date (past, Sunday, or holiday)');
         return;
+    }
     var beat = (state.calData.scheduledBeats || []).find(function (b) {
-        return b.planGroupId === pg;
+		return String(b.planGroupId) === String(pg);
     });
     if (!beat) return;
     var beatName = beat.beatName || 'Beat';
     var daysNeeded = beat.days ? beat.days.length : 1;

Subversion Repositories SmartDukaan

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