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

 	var uid = $('#bp-auth-user').val();
 	if (!uid) {
 		alert('Select a user');
 		return;
+	}
+	// Hard reset of any previous user's cached state so calendar chips,
+	// route lines, partner markers, and the route-detail view don't leak.
 	state.authUserId = parseInt(uid);
 	state.categoryId = parseInt($('#bp-category').val());
+	state.mode = 'list';
+	state.days = [];
+	state.partners = [];
+	state.currentDay = 1;
+	state.calMonth = null;
+	state.calData = null;
+	state.calSelectedBeat = null;
+	state.calPickedDates = [];
+	state.homeLat = null;
+	state.homeLng = null;
+	state.homeName = '';
+	state.activeBaseLocationId = null;
+	state.baseLocations = [];
+	state.viewDate = null;
+	state.originalDayCount = 0;
+	// Clear the rendered calendar grid + route map / panel so nothing from
+	// the previous user is briefly visible while the new fetch is in flight.
+	$('#cal-grid-content').empty();
+	$('#route-list').empty();
+	if (typeof clearRoute === 'function') {
+		try {
+			clearRoute();
+		} catch (e) {
+		}
+	}
-    state.mode = 'list'; // 'list' or 'create' or 'view'
+	if (typeof markers === 'object' && markers) {
+		for (var k in markers) {
+			try {
+				markers[k].setMap(null);
+			} catch (e) {
+			}
+		}
+		markers = {};
+	}
+	if (typeof homeMarker !== 'undefined' && homeMarker) {
+		try {
+			homeMarker.setMap(null);
+		} catch (e) {
+		}
+		homeMarker = null;
+	}
 	$('#bp-user-label').text($('#bp-auth-user option:selected').text());
 	// Load all saved base locations — default goes in state.home*, the rest is
 	// exposed via a picker in the route panel so the planner can pick a
 	// different starting point for this one beat without changing the default.
 				state.activeBaseLocationId = def.id;
 			} else {
 				state.activeBaseLocationId = null;
+            }
             showBeatList();
+			// If the user is currently on the Calendar tab when Load is clicked,
+			// re-fetch immediately. Otherwise the calendar grid stays blank
+			// until they click the tab (which would auto-fetch on its own).
+			if ($('.panel-tab[data-tab="calendar"]').hasClass('active')) {
+				var now = new Date();
+				state.calMonth = now.getFullYear() + '-' + ('0' + (now.getMonth() + 1)).slice(-2);
+				loadCalendarData();
+			}
+        }
     });
 });
 // Called from the picker → swap the start location for the beat being
             row += '<td class="' + cls.join(' ') + '" data-date="' + ds + '" data-hasbeat="' + (hasBeats ? '1' : '0') + '" style="' + style + '">';
 			row += '<div class="cal-date">' + d.getDate() + '</div>';
 			if (hol) row += '<div class="cal-holiday-label">' + holidayMap[ds] + '</div>';
 			beats.forEach(function (b) {
+				// The "running"/[live] state only applies to TODAY's chip — future
+				// chips of the same beat are still freely editable (drag + ×).
+				// Past chips are always locked.
+				var isLiveChip = b.status === 'running' && isToday;
+				var isLockedChip = isPast || isLiveChip;
 				var chipCls = 'cal-chip';
-				if (b.status === 'running') chipCls += ' running';
+				if (isLiveChip) chipCls += ' running';
 				if (b.status === 'completed') chipCls += ' completed';
-                var removeBtn = (!isPast && b.status !== 'running' && b.status !== 'completed')
+				var removeBtn = !isLockedChip
                     ? '<span class="cal-chip-remove" data-date="' + ds + '" data-plangroup="' + (b.planGroupId || '') + '" title="Remove">&times;</span>'
                     : '';
-				var draggable = (!isPast && b.status !== 'running' && b.status !== 'completed') ? ' draggable="true"' : '';
+				var draggable = !isLockedChip ? ' draggable="true"' : '';
 				var cursor = draggable ? 'grab' : 'pointer';
 				row += '<span class="' + chipCls + ' cal-chip-view"' + draggable + ' data-plangroup="' + (b.planGroupId || '') + '" data-date="' + ds + '" style="background:' + b.color + ';position:relative;cursor:' + cursor + ';" title="Drag to another date to shuffle">'
-                    + b.name + ' D' + b.day + (b.status === 'running' ? ' [live]' : '') + ' (' + b.visits + ')'
+					+ b.name + ' D' + b.day + (isLiveChip ? ' [live]' : '') + ' (' + b.visits + ')'
                     + removeBtn + '</span>';
 			});
 			if (isPicked) {
 				var idx = state.calPickedDates.indexOf(ds) + 1;
 	$(this).css('opacity', '');
 });
 $(document).on('dragover', '.cal-grid td', function (e) {
 	var $td = $(this);
+	// Today is the live/running slot — nothing can be shuffled onto it. The
+	// shuffle is only valid between future dates.
-	if ($td.hasClass('past') || $td.hasClass('blocked') || $td.hasClass('holiday') || $td.hasClass('sunday')) return;
+	if ($td.hasClass('past') || $td.hasClass('blocked') || $td.hasClass('holiday') || $td.hasClass('sunday') || $td.hasClass('today')) return;
 	e.preventDefault();
 	e.originalEvent.dataTransfer.dropEffect = 'move';
 	$td.css('box-shadow', 'inset 0 0 0 2px #60a5fa');
 });
 });
 $(document).on('drop', '.cal-grid td', function (e) {
 	var $td = $(this);
 	$td.css('box-shadow', '');
-	if ($td.hasClass('past') || $td.hasClass('blocked') || $td.hasClass('holiday') || $td.hasClass('sunday')) return;
+	if ($td.hasClass('past') || $td.hasClass('blocked') || $td.hasClass('holiday') || $td.hasClass('sunday') || $td.hasClass('today')) return;
 	e.preventDefault();
 	var raw;
 	try {
 		raw = e.originalEvent.dataTransfer.getData('text/plain');

Subversion Repositories SmartDukaan

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