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

                 });
                 var statusCls = b.status === 'running' ? 'status-running' : b.status === 'completed' ? 'status-completed' : 'status-scheduled';
                 var statusLabel = b.status === 'running' ? 'Live' : b.status === 'completed' ? 'Done' : b.status === 'unscheduled' ? 'Unscheduled' : 'Scheduled';
-                html += '<div class="beat-card beat-list-item" data-plangroup="' + b.planGroupId + '" style="cursor:pointer;">';
+				html += '<div class="beat-card beat-list-item" data-plangroup="' + b.planGroupId + '" style="cursor:pointer; position:relative;">';
                 html += '<div class="beat-name"><span style="display:inline-block;width:12px;height:12px;border-radius:2px;background:' + b.beatColor + ';"></span> ' + b.beatName + ' <span class="status-badge ' + statusCls + '">' + statusLabel + '</span></div>';
                 html += '<div class="beat-meta">' + b.days.length + ' days | ' + totalV + ' visits | ' + totalKm.toFixed(0) + ' km';
                 if (item.count > 1) html += ' | ' + item.count + 'x scheduled';
                 html += '</div>';
+				html += '<button class="beat-edit-btn" data-plangroup="' + b.planGroupId + '" '
+					+ 'style="position:absolute;top:8px;right:8px;background:#475569;color:#e2e8f0;'
+					+ 'border:none;border-radius:4px;padding:3px 8px;font-size:10px;cursor:pointer;'
+					+ 'font-family:inherit;">Edit</button>';
                 html += '</div>';
             });
             $('#route-list').html(html);
+        }
 $(document).on('click', '.beat-list-item', function () {
     var pg = $(this).data('plangroup');
     viewBeat(pg);
 });
+// Edit button on a beat card → load in EDIT mode (modifiable)
+$(document).on('click', '.beat-edit-btn', function (e) {
+	e.stopPropagation(); // don't also trigger beat-list-item view
+	var pg = $(this).data('plangroup');
+	var date = $(this).data('date') || null;
+	editBeat(String(pg), date ? String(date) : null);
+});
+// Loads a beat into edit mode — same UI as create but Finish becomes Save.
+// When planDate is provided: leads scheduled on that date are loaded too and
+// can be removed (template = partners stays the same across runs).
+function editBeat(planGroupId, planDate) {
+	state.mode = 'edit';
+	state.editingBeatId = planGroupId;
+	state.editingDate = planDate || null;
+	state.viewDate = null;
+	state.savedPlanGroupId = null;
+	isSubmittingBeat = false;
+	$.ajax({
+		url: context + '/beatPlan/getPartners', type: 'GET', dataType: 'json',
+		data: {
+			authUserId: state.authUserId, categoryId: state.categoryId,
+			startLat: state.homeLat, startLng: state.homeLng
+		},
+		success: function (r) {
+			var pData = r.response || r;
+			state.partners = pData.partners || [];
+			var partnerMap = {};
+			state.partners.forEach(function (p) {
+				partnerMap[p.fofoId] = p;
+			});
+			$.ajax({
+				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 String(b.planGroupId) === String(planGroupId);
+					});
+					if (!beat) {
+						alert('Beat not found');
+						return;
+					}
+					state.beatTitle = beat.beatName || 'Beat';
+					// Pass planDate to getBeatVisits so leads for that date are included
+					var visitsData = planDate
+						? {planGroupId: planGroupId, planDate: planDate}
+						: {planGroupId: planGroupId};
+					$.ajax({
+						url: context + '/beatPlan/getBeatVisits', type: 'GET', dataType: 'json',
+						data: visitsData,
+						success: function (r3) {
+							var visits = (r3.response || r3) || [];
+							var dayVisitsMap = {};
+							visits.forEach(function (v) {
+								if (!dayVisitsMap[v.dayNumber]) dayVisitsMap[v.dayNumber] = [];
+								dayVisitsMap[v.dayNumber].push(v);
+							});
+							// Collect lead IDs so we can fetch their name/geo in parallel
+							var leadIdsToFetch = [];
+							visits.forEach(function (v) {
+								if (v.visitType === 'lead') leadIdsToFetch.push(v.fofoId);
+							});
+							state.days = [];
+							var seen = {};
+							beat.days.forEach(function (d) {
+								if (seen[d.dayNumber]) return;
+								seen[d.dayNumber] = true;
+								var dayVisits = (dayVisitsMap[d.dayNumber] || []).sort(function (a, b) {
+									return a.sequenceOrder - b.sequenceOrder;
+								});
+								var builtVisits = [];
+								dayVisits.forEach(function (v) {
+									if (v.visitType === 'lead') {
+										builtVisits.push({
+											id: v.fofoId, type: 'lead',
+											name: 'LEAD #' + v.fofoId, code: 'LEAD',
+											lat: null, lng: null, isLead: true
+										});
+									} else {
+										var p = partnerMap[v.fofoId];
+										if (p) builtVisits.push({
+											id: p.fofoId, type: 'partner',
+											name: p.code + ' - ' + (p.outletName || p.businessName || ''),
+											code: p.code,
+											lat: p.latitude ? parseFloat(p.latitude) : null,
+											lng: p.longitude ? parseFloat(p.longitude) : null
+										});
+									}
+								});
+								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',
+									totalKm: 0, totalMins: 0
+								});
+							});
+							state.currentDay = 1;
+							// Async enrich each lead with name + geo
+							var leadPromises = [];
+							state.days.forEach(function (day) {
+								day.visits.forEach(function (v) {
+									if (!v.isLead) return;
+									leadPromises.push(
+										$.get(context + '/lead-geo/check/' + v.id).then(function (rr) {
+											var g = rr.response || rr;
+											if (g && g.hasApprovedGeo) {
+												v.lat = g.latitude;
+												v.lng = g.longitude;
+											}
+										}),
+										$.get(context + '/getLead?leadId=' + v.id).then(function (rr) {
+											var l = rr.response || rr;
+											if (l && l.firstName) v.name = 'LEAD - ' + l.firstName + ' ' + (l.lastName || '');
+										})
+									);
+								});
+							});
+							$.when.apply($, leadPromises).always(function () {
+								renderRoutePanel();
+								var dateLabel = planDate
+									? '<div style="font-size:11px;color:#f59e0b;margin-bottom:8px;">Editing run on: ' + planDate + ' (leads on this date can be removed)</div>'
+									: '<div style="font-size:11px;color:#94a3b8;margin-bottom:8px;">Editing 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:#f59e0b;margin-bottom:4px;">'
+									+ 'EDITING: ' + state.beatTitle + '</div>' + dateLabel);
+								initMap();
+								// Add lead markers (orange) on the map
+								state.days.forEach(function (day) {
+									day.visits.forEach(function (v) {
+										if (v.isLead && v.lat && v.lng) {
+											var m = new google.maps.Marker({
+												map: map,
+												position: {lat: v.lat, lng: v.lng},
+												title: v.name,
+												label: {text: 'L', color: '#fff', fontSize: '11px', fontWeight: '700'},
+												icon: {
+													path: google.maps.SymbolPath.CIRCLE, scale: 16,
+													fillColor: '#e67e22', fillOpacity: 0.95,
+													strokeColor: '#fff', strokeWeight: 2
+												}
+											});
+											markers[v.id] = m;
+										}
+									});
+								});
+								resetMarkerColors();
+								drawRoute();
+								updateBottomBar();
+								$('#bottom-bar').show();        // make Save bar visible
+								$('#btn-finish').text('Save Changes').prop('disabled', false);
+							});
+						}
+					});
+				}
+			});
+		}
+	});
+}
 function viewBeat(planGroupId, planDate) {
     state.mode = 'view';
 	state.viewDate = planDate || null; // when set, show that run's leads
     $('#bottom-bar').hide();
 	state.days = [{
 		dayNumber: 1, startLat: state.homeLat, startLng: state.homeLng, startName: state.homeName,
 		visits: [], endAction: null, stayName: null, stayLat: null, stayLng: null, totalKm: 0, totalMins: 0
 	}];
 	state.currentDay = 1;
-    if (state.mode === 'create') $('#bottom-bar').show();
+	if (state.mode === 'create' || state.mode === 'edit') $('#bottom-bar').show();
 	renderRoutePanel();
+}
 function initMap() {
 	var center = {lat: state.homeLat, lng: state.homeLng};
                 html += '<button class="btn-day-break" data-daynum="' + day.dayNumber + '" style="font-size:10px;padding:2px 8px;border:none;border-radius:3px;background:#f59e0b;color:#0f172a;cursor:pointer;font-weight:600;">Day Break</button>';
                 html += '</div>';
+            }
             html += '</div>';
-            if (state.mode === 'create') {
+			if (state.mode === 'create' || state.mode === 'edit') {
                 html += '<span class="stop-remove" data-fofoid="' + v.id + '" data-daynum="' + day.dayNumber + '" title="Remove">&times;</span>';
+            }
 			html += '</div>';
 			prevLat = v.lat;
 	// Dates will be assigned later via calendar — pass nulls for now
 	var dates = daysData.map(function () {
 		return null;
 	});
-	var planData = JSON.stringify({days: daysData, dates: dates, beatName: beatTitle.trim()});
+	var planPayload = {days: daysData, dates: dates, beatName: beatTitle.trim()};
+	// When editing a specific scheduled date, pass it so leads removed from that date get cancelled
+	if (state.mode === 'edit' && state.editingDate) {
+		planPayload.planDate = state.editingDate;
+	}
+	var planData = JSON.stringify(planPayload);
 	isSubmittingBeat = true;
+	var isEdit = state.mode === 'edit' && state.editingBeatId;
-	$('#btn-finish').prop('disabled', true).text('Saving...');
+	$('#btn-finish').prop('disabled', true).text(isEdit ? 'Updating...' : 'Saving...');
+	var url = isEdit ? '/beatPlan/updateBeat' : '/beatPlan/submitPlan';
+	var ajaxData = isEdit
+		? {beatId: state.editingBeatId, planData: planData}
+		: {authUserId: state.authUserId, planData: planData};
 	$.ajax({
-		url: context + "/beatPlan/submitPlan",
+		url: context + url,
 		type: "POST",
-		data: {authUserId: state.authUserId, planData: planData},
+		data: ajaxData,
 		success: function (response) {
 			var data = (typeof response === 'string' ? JSON.parse(response) : response);
 			var result = data.response || data;
 			if (result.status) {
 				state.savedPlanGroupId = result.planGroupId;
 				$('#bottom-bar').hide();
                 if (result.duplicate) {
 					alert('This beat already exists.');
+				} else if (isEdit) {
+					alert('Beat "' + beatTitle + '" updated successfully!');
                 } else {
                     alert('Beat "' + beatTitle + '" saved successfully!');
+                }
-                // Go back to beat list
+				// Reset edit state, go back to beat list
+				state.editingBeatId = null;
+				state.mode = 'list';
                 showBeatList();
 			} else {
-				$('#btn-finish').prop('disabled', false).text('Finish Plan');
+				$('#btn-finish').prop('disabled', false).text(isEdit ? 'Save Changes' : 'Finish Plan');
 				alert('Error saving beat plan');
+			}
 			isSubmittingBeat = false;
 		},
 		error: function (xhr) {
 			isSubmittingBeat = false;
-			$('#btn-finish').prop('disabled', false).text('Finish Plan');
+			$('#btn-finish').prop('disabled', false).text(isEdit ? 'Save Changes' : 'Finish Plan');
 			alert('Error: ' + (xhr.responseText || xhr.statusText));
+		}
 	});
 });
 	$('.panel-tab').removeClass('active');
 	$(this).addClass('active');
 	$('#panel-route').toggle(tab === 'route');
 	$('#panel-calendar').toggle(tab === 'calendar');
 	$('#cal-grid-container').toggle(tab === 'calendar');
-    $('#bottom-bar').toggle(tab === 'route' && state.mode === 'create' && state.days && state.days.length > 0);
+	$('#bottom-bar').toggle(tab === 'route' && (state.mode === 'create' || state.mode === 'edit') && state.days && state.days.length > 0);
 	if (tab === 'calendar' && !state.calMonth) {
 		var now = new Date();
 		state.calMonth = now.getFullYear() + '-' + ('0' + (now.getMonth() + 1)).slice(-2);
 		loadCalendarData();
 	var autoUid = getParam('autoUserId');
 	console.log('[BEAT-AUTO] autoUserId =', autoUid);
 	if (!autoUid) return;
 	var autoName = getParam('autoUserName');
+	var editBeatId = getParam('editBeatId');
+	var editDate = getParam('editDate');
 	state.authUserId = parseInt(autoUid);
 	state.categoryId = parseInt($('#bp-category').val()) || 4;
 	state.mode = 'list';
 	$('#bp-user-label').text(autoName || ('User #' + autoUid));
 			if (data.locationName) {
 				state.homeLat = parseFloat(data.latitude);
 				state.homeLng = parseFloat(data.longitude);
 				state.homeName = data.locationName;
+			}
-			showBeatList();
+			if (editBeatId) {
-			// Jump straight to the Calendar tab (that's what the user came here for)
+				console.log('[BEAT-AUTO] entering edit for beat', editBeatId, 'date', editDate);
+				editBeat(String(editBeatId), editDate || null);
+			} else {
+				showBeatList();
-			setTimeout(function () {
+				setTimeout(function () {
-				$('.panel-tab[data-tab="calendar"]').click();
+					$('.panel-tab[data-tab="calendar"]').click();
-			}, 100);
+				}, 100);
+			}
 		},
 		error: function (xhr) {
 			console.error('[BEAT-AUTO] getBaseLocation failed:', xhr.status, xhr.responseText);
+		}
 	});

Subversion Repositories SmartDukaan

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