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

     });
 });
 // Called from the picker → swap the start location for the beat being
 // created/edited. Updates state.home* + day 1's start point, then re-draws.
+// Inline typeahead inside the route sidebar — same data source as the
+// Partners tab (state.partners, fed by /beatPlan/getPartners, which mirrors
+// the /getPartnerReadonlyInfo pattern used by the Partner Access tab).
+// User types 2+ chars → suggestions appear → click adds to the current day.
+function renderPartnerQuickAdd() {
+	if (!state.partners || state.partners.length === 0) return '';
+	return ''
+		+ '<div style="position:relative; margin-bottom:10px;">'
+		+ '  <input type="text" id="bp-partner-quick" autocomplete="off"'
+		+ '         placeholder="Search & add a partner..."'
+		+ '         style="width:100%; padding:8px 10px; border:1px solid #475569; border-radius:6px;'
+		+ '                background:#0f172a; color:#e2e8f0; font-size:12px; font-family:inherit;">'
+		+ '  <div id="bp-partner-suggest"'
+		+ '       style="display:none; position:absolute; left:0; right:0; top:100%; z-index:50;'
+		+ '              background:#1e293b; border:1px solid #334155; border-radius:6px;'
+		+ '              margin-top:4px; max-height:260px; overflow-y:auto;'
+		+ '              box-shadow:0 6px 16px rgba(0,0,0,0.4);"></div>'
+		+ '</div>';
+}
+function refreshPartnerSuggestions() {
+	var $input = $('#bp-partner-quick');
+	if (!$input.length) return;
+	var q = ($input.val() || '').trim().toLowerCase();
+	var $sug = $('#bp-partner-suggest');
+	if (q.length < 2) {
+		$sug.hide().empty();
+		return;
+	}
+	// Lookup of fofoId → day number for partners already on the route
+	var inRoute = {};
+	(state.days || []).forEach(function (d) {
+		(d.visits || []).forEach(function (v) {
+			if (!v.isLead && v.type !== 'lead') inRoute[v.id] = d.dayNumber;
+		});
+	});
+	var matches = (state.partners || []).filter(function (p) {
+		var hay = ((p.code || '') + ' '
+			+ (p.outletName || '') + ' '
+			+ (p.businessName || '') + ' '
+			+ (p.city || '')).toLowerCase();
+		return hay.indexOf(q) !== -1;
+	}).slice(0, 10);
+	if (matches.length === 0) {
+		$sug.html('<div style="padding:10px; color:#94a3b8; font-size:11px; text-align:center;">No partners found</div>').show();
+		return;
+	}
+	var html = '';
+	matches.forEach(function (p) {
+		var day = inRoute[p.fofoId];
+		var nameLine = (p.outletName || p.businessName || '');
+		if (p.city) nameLine += (nameLine ? ' - ' : '') + p.city;
+		if (day) {
+			html += '<div class="bp-partner-row in-route" style="padding:8px 10px; font-size:11px;'
+				+ ' color:#94a3b8; border-bottom:1px solid #0f172a; cursor:not-allowed;">'
+				+ '<div style="font-weight:600;">' + (p.code || '') + '</div>'
+				+ '<div>' + nameLine + ' <span style="color:#22c55e;">(in D' + day + ')</span></div>'
+				+ '</div>';
+		} else {
+			html += '<div class="bp-partner-row" data-fofoid="' + p.fofoId + '"'
+				+ ' style="padding:8px 10px; font-size:12px; color:#e2e8f0;'
+				+ ' border-bottom:1px solid #0f172a; cursor:pointer;">'
+				+ '<div style="font-weight:600;">' + (p.code || '') + '</div>'
+				+ '<div style="font-size:11px; color:#94a3b8;">' + nameLine + '</div>'
+				+ '</div>';
+		}
+	});
+	$sug.html(html).show();
+}
+$(document).on('input', '#bp-partner-quick', refreshPartnerSuggestions);
+$(document).on('focus', '#bp-partner-quick', function () {
+	if (($(this).val() || '').trim().length >= 2) refreshPartnerSuggestions();
+});
+// Hide on outside click
+$(document).on('click', function (e) {
+	if (!$(e.target).closest('#bp-partner-quick, #bp-partner-suggest').length) {
+		$('#bp-partner-suggest').hide();
+	}
+});
+$(document).on('mousedown', '#bp-partner-suggest .bp-partner-row', function (e) {
+	if ($(this).hasClass('in-route')) return;
+	e.preventDefault(); // keep input from losing focus before we read fofoid
+	var fofoId = parseInt($(this).data('fofoid'));
+	if (!fofoId) return;
+	if (typeof addVisit === 'function') addVisit(fofoId, 'next');
+	$('#bp-partner-quick').val('').focus();
+	$('#bp-partner-suggest').hide().empty();
+});
 function renderBaseLocationPicker() {
 	var locs = state.baseLocations || [];
 	if (locs.length === 0) return '';
 	var activeId = state.activeBaseLocationId;
 	if (locs.length === 1) {
 									+ '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
-									+ renderBaseLocationPicker());
+									+ renderBaseLocationPicker()
+									+ renderPartnerQuickAdd());
 								initMap();
 								// Add lead markers (orange) on the map
 								state.days.forEach(function (day) {
 									day.visits.forEach(function (v) {
+	}
 	recalcDay();
 	drawRoute();
 	renderRoutePanel();
-	if (typeof renderPartnersPanel === 'function') renderPartnersPanel();
 	if (action === 'last') {
 		// Last visit — end day, go home
 		day.endAction = 'HOME';
 		day.stayLat = state.homeLat;
 	var html = '';
     if (state.mode === 'create' && state.beatTitle) {
         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</button></div>';
         html += '<div style="font-size:14px;font-weight:600;color:#60a5fa;margin-bottom:10px;">' + state.beatTitle + '</div>';
 		html += renderBaseLocationPicker();
+		html += renderPartnerQuickAdd();
+    }
 	state.days.forEach(function (day) {
 		var isCurrent = day.dayNumber === state.currentDay;
         var isLastDay = day.dayNumber === state.days.length;
 		html += '<div class="route-day">';
 	recalcDay();
 	drawRoute();
 	renderRoutePanel();
 	updateBottomBar();
-	if (typeof renderPartnersPanel === 'function') renderPartnersPanel();
 });
 // ============ LAST VISIT (from sidebar) — marks beat as complete, return home ============
 $(document).on('click', '.btn-last-visit', function (e) {
     e.stopPropagation();
 						+ (extras.length ? '\n\n' + extras.join('\n') : '') + '.');
 				} else {
 					alert('Beat "' + beatTitle + '" saved successfully!');
+				}
+				// Wipe in-progress beat state for this user — the next "+ New Beat"
+				// must start from a clean slate (no leftover days/visits/title/leads).
 				state.editingBeatId = null;
+				state.editingDate = null;
+				state.beatTitle = null;
+				state.days = [];
+				state.currentDay = 1;
+				state.originalDayCount = null;
+				state.originalLeads = [];
+				state.savedPlanGroupId = null;
+				// Clear map artifacts from the just-saved route so the canvas
+				// doesn't show stale polylines/labels behind the beat list.
+				routeLines.forEach(function (l) {
+					l.setMap(null);
+				});
+				routeLines = [];
+				if (previewLine) {
+					previewLine.setMap(null);
+					previewLine = null;
+				}
+				if (typeof resetMarkerColors === 'function') resetMarkerColors();
 				state.mode = 'list';
 				showBeatList();
 			} else {
 				$('#btn-finish').prop('disabled', false).text(isEdit ? 'Save Changes' : 'Finish Plan');
 				alert('Error saving beat plan');
 $('.panel-tab').on('click', function () {
 	var tab = $(this).data('tab');
 	$('.panel-tab').removeClass('active');
 	$(this).addClass('active');
 	$('#panel-route').toggle(tab === 'route');
-	$('#panel-partners').toggle(tab === 'partners');
 	$('#panel-calendar').toggle(tab === 'calendar');
 	$('#cal-grid-container').toggle(tab === 'calendar');
-	$('#bottom-bar').toggle((tab === 'route' || tab === 'partners') && (state.mode === 'create' || state.mode === 'edit') && 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 === 'partners') renderPartnersPanel();
 	if (tab === 'calendar' && !state.calMonth) {
 		var now = new Date();
 		state.calMonth = now.getFullYear() + '-' + ('0' + (now.getMonth() + 1)).slice(-2);
 		loadCalendarData();
+	}
 });
-// ============ PARTNERS PANEL (search + tick to add) ============
-function renderPartnersPanel() {
-	var $list = $('#partners-list');
-	if (!$list.length) return;
-	if (!state.partners || state.partners.length === 0) {
-		$list.html('<p style="color:#64748b;font-size:12px;text-align:center;padding:20px 10px;">Load a user first.</p>');
-		$('#partners-count').text('0 / 0');
-		return;
-	}
-	var q = ($('#partners-search').val() || '').trim().toLowerCase();
-	// Build a lookup: fofoId -> dayNumber it's already in (current day's visits)
-	var inRoute = {};
-	(state.days || []).forEach(function (d) {
-		(d.visits || []).forEach(function (v) {
-			if (v.type === 'partner' || v.type == null) inRoute[v.id] = d.dayNumber;
-		});
-	});
-	var filtered = state.partners.filter(function (p) {
-		if (!q) return true;
-		var hay = ((p.code || '') + ' ' + (p.outletName || '') + ' ' + (p.businessName || '') + ' ' + (p.city || '')).toLowerCase();
-		return hay.indexOf(q) !== -1;
-	});
-	// Sort: in-route first (so user can see what's already added), then by code
-	filtered.sort(function (a, b) {
-		var aIn = inRoute[a.fofoId] ? 0 : 1;
-		var bIn = inRoute[b.fofoId] ? 0 : 1;
-		if (aIn !== bIn) return aIn - bIn;
-		return (a.code || '').localeCompare(b.code || '');
-	});
-	var html = '';
-	filtered.forEach(function (p) {
-		var checked = inRoute[p.fofoId];
-		var name = (p.outletName || p.businessName || '');
-		var city = p.city || '';
-		html += '<label class="partner-row' + (checked ? ' in-route' : '') + '">'
-			+ '<input type="checkbox" class="partner-tick" data-fofoid="' + p.fofoId + '"' + (checked ? ' checked' : '') + '>'
-			+ '<div class="pr-info">'
-			+ '<div class="pr-code">' + (p.code || '') + (name ? ' <span class="pr-name">- ' + name + '</span>' : '') + '</div>'
-			+ (city ? '<div class="pr-name">' + city + '</div>' : '')
-			+ '</div>'
-			+ (checked ? '<span class="pr-day">D' + checked + '</span>' : '')
-			+ '</label>';
-	});
-	if (html === '') html = '<p style="color:#64748b;font-size:12px;text-align:center;padding:20px 10px;">No partners match.</p>';
-	$list.html(html);
-	$('#partners-count').text(filtered.length + ' / ' + state.partners.length);
-}
-$(document).on('input', '#partners-search', function () {
-	renderPartnersPanel();
-});
-$(document).on('change', '.partner-tick', function () {
-	var fofoId = parseInt($(this).data('fofoid'));
-	var checked = this.checked;
-	if (checked) {
-		// Add to current day
-		if (!state.days || state.days.length === 0) {
-			alert('Set a home location first to start the route.');
-			this.checked = false;
-			return;
-		}
-		addVisit(fofoId, 'next');
-		renderPartnersPanel();
-		return;
-	}
-	// Untick → remove from whichever day it's in
-	var foundDay = null;
-	(state.days || []).forEach(function (d) {
-		if (d.visits && d.visits.some(function (v) {
-			return v.id === fofoId;
-		})) foundDay = d;
-	});
-	if (!foundDay) {
-		renderPartnersPanel();
-		return;
-	}
-	foundDay.visits = foundDay.visits.filter(function (v) {
-		return v.id !== fofoId;
-	});
-	// Reset that marker to red
-	if (markers[fofoId]) {
-		var p = state.partners.find(function (x) {
-			return x.fofoId === fofoId;
-		});
-		markers[fofoId].setIcon({
-			path: google.maps.SymbolPath.CIRCLE, scale: 14,
-			fillColor: '#ef4444', fillOpacity: 0.9, strokeColor: '#fff', strokeWeight: 1
-		});
-		markers[fofoId].setLabel({text: (p ? p.code : '') || '', color: '#fff', fontSize: '10px', fontWeight: '600'});
-	}
-	// Re-number remaining markers on that day
-	foundDay.visits.forEach(function (v, i) {
-		if (markers[v.id]) {
-			markers[v.id].setLabel({text: '' + (i + 1), color: '#fff', fontSize: '11px', fontWeight: '700'});
-		}
-	});
-	recalcDay();
-	drawRoute();
-	renderRoutePanel();
-	updateBottomBar();
-	renderPartnersPanel();
-});
 // 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();

Subversion Repositories SmartDukaan

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