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

 											&& Math.abs(parseFloat(l.longitude) - day1.startLng) < 1e-4;
 									});
 									if (match) state.activeBaseLocationId = match.id;
+								}
+								// renderRoutePanel now builds the edit header (back btn, EDITING
+								// title, date label, base picker, partner search) inline — so we
+								// just call it without the one-time prepend that used to live here.
 								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
-									+ renderBaseLocationPicker()
-									+ renderPartnerQuickAdd());
 								initMap();
 								// Add lead markers (orange) on the map
 								state.days.forEach(function (day) {
 									day.visits.forEach(function (v) {
     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();
+	} else if (state.mode === 'edit' && state.beatTitle) {
+		// Edit header used to be injected via a one-time prepend() in editBeat's
+		// success callback — that meant any addVisit-triggered re-render wiped the
+		// back button / title / base picker / search box. Building it here keeps
+		// them present across every re-render so users can keep adding partners.
+		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>';
+		html += '<div style="font-size:14px;font-weight:600;color:#f59e0b;margin-bottom:4px;">EDITING: ' + state.beatTitle + '</div>';
+		html += state.editingDate
+			? '<div style="font-size:11px;color:#f59e0b;margin-bottom:8px;">Editing run on: ' + state.editingDate + ' (leads on this date can be removed)</div>'
+			: '<div style="font-size:11px;color:#94a3b8;margin-bottom:8px;">Editing beat template (partners only)</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">';
+	}
 	html += '</table>';
 	$('#cal-grid-content').html(html);
+}
+// Lists the scheduled dates for a beat (grouped by day number) inside a beat card.
+// Output looks like:  "Schedule: D1 May 27 | D2 May 28 | D3 May 29"
+// Unscheduled days show as "—"; if NO real dates exist, returns empty string.
+function renderBeatScheduledDates(instances) {
+	if (!instances || !instances.length) return '';
+	// Collect planDates per dayNumber across every instance of this beat
+	var byDay = {};
+	var today = fmtDate(new Date());
+	instances.forEach(function (inst) {
+		(inst.days || []).forEach(function (d) {
+			if (!d.planDate) return; // skip unscheduled placeholders
+			if (!byDay[d.dayNumber]) byDay[d.dayNumber] = [];
+			byDay[d.dayNumber].push(d.planDate);
+		});
+	});
+	var dayNums = Object.keys(byDay).map(function (n) {
+		return parseInt(n, 10);
+	}).sort(function (a, b) {
+		return a - b;
+	});
+	if (dayNums.length === 0) {
+		return '<div class="beat-meta" style="color:#475569; margin-top:4px;">Not scheduled yet</div>';
+	}
+	var MONTHS = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
+	function fmt(ds) {
+		// ds = "yyyy-mm-dd"
+		var p = ds.split('-');
+		if (p.length !== 3) return ds;
+		return MONTHS[parseInt(p[1], 10) - 1] + ' ' + parseInt(p[2], 10);
+	}
+	var parts = dayNums.map(function (n) {
+		// De-dup + sort dates for this day (could repeat if beat scheduled multiple times)
+		var dates = (byDay[n] || []).filter(function (v, i, a) {
+			return a.indexOf(v) === i;
+		}).sort();
+		var label = dates.map(function (ds) {
+			var color = ds === today ? '#ef4444' : (ds < today ? '#64748b' : '#60a5fa');
+			return '<span style="color:' + color + ';">' + fmt(ds) + '</span>';
+		}).join(', ');
+		return '<span style="color:#94a3b8;">D' + n + '</span> ' + label;
+	});
+	return '<div class="beat-meta" style="margin-top:4px; line-height:1.6;">'
+		+ '<span style="color:#64748b;">Schedule:</span> '
+		+ parts.join('<span style="color:#334155;"> | </span>')
+		+ '</div>';
+}
 function renderBeatCards(beats) {
 	var html = '';
 	if (!beats || beats.length === 0) {
 		html = '<p style="color:#64748b;font-size:12px;padding:20px;">No beats scheduled. Create a beat first.</p>';
         $('#cal-beat-cards').html(html);
         html += '<div class="beat-card" data-plangroup="' + primaryPg + '" data-beatname="' + (group.beatName || '') + '" draggable="true">';
         html += '<div class="beat-name"><span style="display:inline-block;width:12px;height:12px;border-radius:2px;background:' + group.beatColor + ';"></span> ' + group.beatName + '</div>';
         html += '<div class="beat-meta">' + first.days.length + ' days | ' + totalV + ' visits | ' + totalKm.toFixed(0) + ' km</div>';
         html += '<div class="beat-meta" style="color:#94a3b8;">' + statusText + ' (' + totalInstances + ' total)</div>';
+		html += renderBeatScheduledDates(group.instances);
         html += '<div class="beat-actions">';
         if (isScheduling) {
             html += '<button class="btn-sm btn-confirm-schedule" data-pg="' + primaryPg + '" data-days="' + first.days.length + '" style="background:#22c55e;color:#fff;">Confirm (' + state.calPickedDates.length + ' dates)</button>';
             html += '<button class="btn-sm btn-cancel-schedule" style="background:#475569;color:#e2e8f0;">Cancel</button>';

Subversion Repositories SmartDukaan

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