fix(ehr): date validation messages, encounter sort, payment edit prefill

- Reports filters: show inline "Invalid date" message and skip applying
  the filter until a typed date parses (was red border only).
- Clinical forms (immunization etc.) + shared masked date field: show an
  inline "Invalid date" hint as the user types/blurs, not only on save.
- Patient Snapshot Encounter History: sort latest -> oldest by date.
- Encounter status save: surface a warning when the patient-scoped status
  PUT fails instead of swallowing it silently.
- Payment edit: refetch the full transaction by id; add a normalizeEditItem
  hook so the Payment History list-edit form maps collectedAt/paymentMethodType
  onto paymentDate/paymentMethod (Date + Method opened blank before).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: Baranidharan12

src/vs/workbench/contrib/ciyexEhr/browser/ciyexDateMask.ts

@@ -79,6 +79,12 @@ export function createUsDateField(
 	hidden.type = 'hidden';
 	hidden.value = isoValue || '';
 
+	// Inline validation hint shown directly under the field so a typed-but-invalid
+	// date (e.g. 23/45/2000) surfaces a readable message as the user types, not
+	// only when they hit Save.
+	const err = doc.createElement('div');
+	err.style.cssText = 'font-size:10px;color:#ef4444;margin-top:3px;display:none;';
+
 	const sync = () => {
 		const masked = maskUsDate(visible.value);
 		if (masked !== visible.value) { visible.value = masked; }
@@ -90,6 +96,8 @@ export function createUsDateField(
 		// saving the empty ISO value the parser produced.
 		hidden.dataset.invalid = bad ? '1' : '';
 		visible.style.borderColor = bad ? '#ef4444' : '';
+		err.textContent = bad ? 'Invalid date — please enter a real date (MM/DD/YYYY)' : '';
+		err.style.display = bad ? 'block' : 'none';
 	};
 	visible.addEventListener('input', sync);
 	visible.addEventListener('blur', sync);
@@ -103,6 +111,9 @@ export function createUsDateField(
 		visible.value = isoToUsDate(picker.value);
 		hidden.value = picker.value;
 		hidden.dataset.invalid = '';
+		visible.style.borderColor = '';
+		err.textContent = '';
+		err.style.display = 'none';
 	});
 
 	const icon = doc.createElement('span');
@@ -113,6 +124,7 @@ export function createUsDateField(
 	wrap.appendChild(hidden);
 	wrap.appendChild(picker);
 	wrap.appendChild(icon);
+	wrap.appendChild(err);
 	container.appendChild(wrap);
 	return { hidden, visible, picker };
 }

src/vs/workbench/contrib/ciyexEhr/browser/editors/clinicalListEditor.ts

@@ -1707,14 +1707,28 @@ export abstract class ClinicalListEditorBase extends EditorPane {
 				visible.maxLength = 10;
 				const hidden = DOM.append(wrap, DOM.$('input')) as HTMLInputElement;
 				hidden.type = 'hidden';
+				// Inline validation hint shown directly under the field. usToIsoDate
+				// returns '' for an impossible calendar date (e.g. 23/45/2000), so we
+				// flag the field red AND surface a readable message immediately as the
+				// user types — not only when they hit Save (QA: date fields silently
+				// accept invalid dates with no error message).
+				const dateErr = DOM.append(wrap, DOM.$('div'));
+				dateErr.style.cssText = 'font-size:10px;color:#ef4444;margin-top:3px;display:none;';
+				const syncDateError = () => {
+					const iso = usToIso(visible.value);
+					const bad = !!visible.value && !iso;
+					visible.style.borderColor = bad ? '#ef4444' : '';
+					dateErr.textContent = bad ? 'Invalid date — please enter a real date (MM/DD/YYYY)' : '';
+					dateErr.style.display = bad ? 'block' : 'none';
+				};
 				visible.addEventListener('input', () => {
 					// Auto-insert slashes and cap the year at 4 digits as the user types.
 					const masked = maskUsDate(visible.value);
 					if (masked !== visible.value) { visible.value = masked; }
-					const iso = usToIso(visible.value);
-					hidden.value = iso;
-					visible.style.borderColor = visible.value && !iso ? '#ef4444' : '';
+					hidden.value = usToIso(visible.value);
+					syncDateError();
 				});
+				visible.addEventListener('blur', syncDateError);
 				// Native picker — fully overlaid on top of the icon area so clicking
 				// the icon opens the calendar. We hide the native chrome via opacity:0.
 				const picker = DOM.append(wrap, DOM.$('input')) as HTMLInputElement;
@@ -1724,6 +1738,9 @@ export abstract class ClinicalListEditorBase extends EditorPane {
 				picker.addEventListener('change', () => {
 					visible.value = isoToUs(picker.value);
 					hidden.value = picker.value;
+					visible.style.borderColor = '';
+					dateErr.textContent = '';
+					dateErr.style.display = 'none';
 				});
 				// Visible icon (decorative) — sits behind the transparent picker so
 				// clicks fall through to the picker. pointer-events:none keeps the

src/vs/workbench/contrib/ciyexEhr/browser/editors/patientSnapshotEditor.ts

@@ -890,18 +890,41 @@ export class PatientSnapshotEditor extends EditorPane {
 			// endpoint, since the encounter-form composition save below only carries
 			// clinical content, not the Encounter's own fields. Mirrors encounterListPane.
 			const reason = String(values['chiefComplaint'] || values['reason'] || '').trim();
-			await this.apiService.fetch(`/api/${pid}/encounters/${encounterId}`, {
-				method: 'PUT',
-				headers: { 'Content-Type': 'application/json' },
-				body: JSON.stringify({
-					visitCategory: values['type'] || undefined,
-					encounterDate: values['startDate'] || undefined,
-					endDate: endDate || undefined,
-					encounterProvider: String(values['provider'] || '').trim() || undefined,
-					status: statusVal,
-					reasonForVisit: reason || undefined,
-				}),
-			}).catch(() => { /* non-fatal: the composition save below still runs */ });
+			// Persist the encounter-level status (Signed/Unsigned) here. This is the
+			// SAME endpoint the Encounters side-menu list reads, so a successful PUT is
+			// what makes a status change in the snapshot show up there too. Previously
+			// the result was swallowed with `.catch(() => {})`, so a status PUT that the
+			// server rejected (4xx/5xx resolves without throwing) failed silently — the
+			// snapshot showed the new status from its local overlay while the encounter
+			// list kept the old one (QA: status change not reflected in side-menu). Now
+			// we check the response and warn the user when the status did not persist.
+			try {
+				const stRes = await this.apiService.fetch(`/api/${pid}/encounters/${encounterId}`, {
+					method: 'PUT',
+					headers: { 'Content-Type': 'application/json' },
+					body: JSON.stringify({
+						visitCategory: values['type'] || undefined,
+						encounterDate: values['startDate'] || undefined,
+						endDate: endDate || undefined,
+						encounterProvider: String(values['provider'] || '').trim() || undefined,
+						status: statusVal,
+						reasonForVisit: reason || undefined,
+					}),
+				});
+				if (!stRes.ok) {
+					this.notificationService.notify({
+						severity: Severity.Warning,
+						message: `Encounter status could not be updated (HTTP ${stRes.status}); the clinical note was still saved.`,
+					});
+				}
+			} catch {
+				// Network failure only — the composition save below still runs so the
+				// clinical content isn't lost.
+				this.notificationService.notify({
+					severity: Severity.Warning,
+					message: 'Encounter status could not be updated (network error); the clinical note was still saved.',
+				});
+			}
 		}
 		const headers = { 'Content-Type': 'application/json' };
 		// Convert the structured-field textareas (diagnoses/procedures/plan/ROS/PE)
@@ -1072,6 +1095,26 @@ export class PatientSnapshotEditor extends EditorPane {
 	 * Payment form opened with Payment Date and Method blank (Payment Date is
 	 * required, so the form could not even be saved).
 	 */
+	/**
+	 * Re-fetch the full payment transaction by id before opening the Edit form.
+	 * The Payment History list rows can be a trimmed projection (so the Edit form
+	 * opened with Date of Service / Reference Type / Receipt Email / allocation
+	 * fields blank even though the stored transaction carried them — QA: "edit
+	 * doesn't fetch all the data"). GET /api/payments/transactions/{id} returns the
+	 * canonical record; merge it over the list row so every field pre-fills. Falls
+	 * back to the list row if the id is non-numeric or the fetch fails.
+	 */
+	private async _loadFullPayment(item: Record<string, unknown>): Promise<Record<string, unknown>> {
+		const id = String(item.id ?? item.transactionId ?? '').trim();
+		if (!/^\d+$/.test(id)) { return item; }
+		try {
+			const res = await this._fetch(`/api/payments/transactions/${id}`);
+			const full = (res && (res.data ?? res)) as Record<string, unknown> | null;
+			if (full && typeof full === 'object') { return { ...item, ...full }; }
+		} catch { /* fall through with the list row */ }
+		return item;
+	}
+
 	private _normalizePaymentForEdit(item: Record<string, unknown>): Record<string, unknown> {
 		const dateOnly = (v: unknown): string => { const s = String(v ?? '').trim(); return s ? s.slice(0, 10) : ''; };
 		const out: Record<string, unknown> = { ...item };
@@ -1170,6 +1213,15 @@ export class PatientSnapshotEditor extends EditorPane {
 			// list view so users can keep managing the collection.
 			closeOnSave: initialMode === 'create',
 			loadList: () => this._loadEntityList(entity),
+			// Payment History opens this dialog in LIST mode; clicking a row's edit
+			// pencil seeds the form from the raw transaction row, whose field names
+			// (collectedAt / paymentMethodType / …) differ from the form keys
+			// (paymentDate / paymentMethod / …). Map them so the edit form pre-fills
+			// Payment Date, Method and the allocation breakdown instead of opening
+			// blank (QA: payment edit "doesn't fetch all the data").
+			normalizeEditItem: entity === 'payment'
+				? (row: Record<string, unknown>) => this._normalizePaymentForEdit(row)
+				: undefined,
 			saveRecord: async (next, existingId) => {
 				// Encounters need a two-step save (mirrors EncounterFormEditor):
 				//   1. POST /api/{patientId}/encounters to mint a real Encounter id
@@ -1290,7 +1342,7 @@ export class PatientSnapshotEditor extends EditorPane {
 		// form (QA issue 2: encounter edit opened with start/end date, provider
 		// and vitals all blank).
 		const initialItem = entity === 'encounters' ? await this._loadEncounterForEdit(item)
-			: entity === 'payment' ? this._normalizePaymentForEdit(item)
+			: entity === 'payment' ? this._normalizePaymentForEdit(await this._loadFullPayment(item))
 				: item;
 		openListAndFormDialog({
 			title: reg.title,
@@ -3221,7 +3273,16 @@ export class PatientSnapshotEditor extends EditorPane {
 		this._revealVitalsEntry?.();
 	}
 
-	private _renderEncounterClinicalRows(card: HTMLElement, encs: Record<string, unknown>[]): void {
+	private _renderEncounterClinicalRows(card: HTMLElement, encsInput: Record<string, unknown>[]): void {
+		// Show the most recent encounter first, then older ones (QA: Encounter
+		// History should list latest → oldest). Read the date from any of the keys
+		// an encounter row can carry; rows with no parseable date sort to the bottom.
+		const encDateMs = (e: Record<string, unknown>): number => {
+			const raw = e.encounterDate || e.startDate || e.start || e.date || e.periodStart || e.createdAt || '';
+			const t = raw ? new Date(String(raw)).getTime() : NaN;
+			return isNaN(t) ? -Infinity : t;
+		};
+		const encs = [...encsInput].sort((a, b) => encDateMs(b) - encDateMs(a));
 		if (encs.length === 0) {
 			const empty = DOM.append(card, DOM.$('div'));
 			empty.textContent = 'No encounters found';

src/vs/workbench/contrib/ciyexEhr/browser/editors/reportsEditor.ts

@@ -1270,9 +1270,21 @@ export class ReportsEditor extends EditorPane {
 			visible.maxLength = 10;
 			visible.value = isoToUs(this.filterValues[key] || '');
 			visible.style.cssText = INPUT_STYLE + 'padding-right:30px;width:130px;';
+			// Inline validation message — usToIsoDate returns '' for an impossible
+			// calendar date (e.g. 12/45/2000), so we flag the field red AND surface a
+			// readable "Invalid date" hint below it instead of silently swallowing the
+			// value (QA: report filters accept invalid dates with no error).
+			const errEl = DOM.append(wrap, DOM.$('div'));
+			errEl.style.cssText = 'position:absolute;top:100%;left:0;margin-top:2px;font-size:10px;color:#ef4444;white-space:nowrap;display:none;z-index:5;';
 			visible.addEventListener('input', () => {
 				const iso = usToIso(visible.value);
-				visible.style.borderColor = visible.value && !iso ? '#ef4444' : '';
+				const bad = !!visible.value && !iso;
+				visible.style.borderColor = bad ? '#ef4444' : '';
+				errEl.textContent = bad ? 'Invalid date — use MM/DD/YYYY' : '';
+				errEl.style.display = bad ? 'block' : 'none';
+				// Don't reset the page / re-render the table on a half-typed or invalid
+				// date — only apply the filter once it parses (or is cleared).
+				if (bad) { return; }
 				this.filterValues[key] = iso;
 				this.currentPage = 0;
 				this._render();
@@ -1283,6 +1295,9 @@ export class ReportsEditor extends EditorPane {
 			picker.style.cssText = 'position:absolute;top:0;right:0;width:30px;height:100%;opacity:0;cursor:pointer;border:none;background:transparent;color-scheme:dark light;padding:0;margin:0;';
 			picker.addEventListener('change', () => {
 				visible.value = isoToUs(picker.value);
+				visible.style.borderColor = '';
+				errEl.textContent = '';
+				errEl.style.display = 'none';
 				this.filterValues[key] = picker.value;
 				this.currentPage = 0;
 				this._render();

src/vs/workbench/contrib/ciyexEhr/browser/sidebarActions.ts

@@ -2067,6 +2067,14 @@ export interface IListAndFormDialogOptions {
 	 *  view. Used for focused single-record edits (e.g. the snapshot's edit-pencil)
 	 *  where bouncing back to the full list after saving is unwanted. */
 	closeOnSave?: boolean;
+	/** Optional transform applied to a stored row before it seeds the EDIT form,
+	 *  so a record whose backend field names differ from the form keys pre-fills
+	 *  correctly. Example: a payment row stores `collectedAt`/`paymentMethodType`
+	 *  but the form fields are keyed `paymentDate`/`paymentMethod`, so without this
+	 *  the list-edit form opened with Payment Date and Method blank (QA: "edit
+	 *  doesn't fetch all the data"). Only runs in edit mode; the row id is taken
+	 *  from the original row for save, so the mapping can't break the PUT target. */
+	normalizeEditItem?: (row: Record<string, unknown>) => Record<string, unknown>;
 }
 
 /** Field-group sections for the unified list/form popup. Clinical forms (the
@@ -2711,6 +2719,11 @@ export function openListAndFormDialog(opts: IListAndFormDialogOptions): void {
 		currentMode = 'form';
 		editingItem = existing;
 		const isEdit = !!existing;
+		// Seed the form from a normalized view of the row when editing, so stored
+		// field names that differ from the form keys (e.g. payment `collectedAt` →
+		// `paymentDate`) still pre-fill. `editingItem` keeps the original row so the
+		// save id is unchanged; only the values used to populate inputs are mapped.
+		const seed = isEdit && opts.normalizeEditItem ? opts.normalizeEditItem(existing!) : existing;
 		titleEl.textContent = `${isEdit ? 'Edit' : 'New'} ${singular}`;
 		subtitleEl.textContent = isEdit ? 'Update the details below' : `Add a new ${singular.toLowerCase()} record`;
 		addBtn.style.display = 'none';
@@ -2797,7 +2810,7 @@ export function openListAndFormDialog(opts: IListAndFormDialogOptions): void {
 				// configured default — including dynamic defaults like an auto-generated
 				// lab order number. Without this the "Order Number" input rendered blank
 				// even though the field defines an auto-generated default.
-				const provided = existing?.[field.key];
+				const provided = seed?.[field.key];
 				const initial = (provided !== undefined && provided !== null && provided !== '')
 					? String(provided as string | number)
 					: (isEdit ? '' : (resolveFieldDefault(field) ?? ''));