@openmrs/esm-form-engine-lib 4.2.1-pre.2435 → 4.2.1-pre.2439

package/dist/form-engine.component.js

@@ -8,6 +8,7 @@ import { init, teardown } from "./lifecycle.js";
 import { isEmpty, useFormJson } from "./index.js";
 import { formEngineAppName } from "./globals.js";
 import { reportError } from "./utils/error-utils.js";
+import { getDateWithinVisitWindow } from "./utils/common-utils.js";
 import { useFormCollapse } from "./hooks/useFormCollapse.js";
 import { useFormWorkspaceSize } from "./hooks/useFormWorkspaceSize.js";
 import { usePageObserver } from "./components/sidebar/usePageObserver.js";
@@ -22,9 +23,15 @@ const FormEngine = ({ formJson, patientUUID, formUUID, encounterUUID, visit, for
     const { t } = useTranslation();
     const session = useSession();
     const ref = useRef(null);
+    const rawSessionDate = useRef(new Date());
+    // Recompute when the visit bounds arrive or change; the visit prop may not be
+    // fully loaded when the form mounts.
     const sessionDate = useMemo(()=>{
-        return new Date();
-    }, []);
+        return getDateWithinVisitWindow(rawSessionDate.current, visit);
+    }, [
+        visit?.startDatetime,
+        visit?.stopDatetime
+    ]);
     const workspaceSize = useFormWorkspaceSize(ref);
     const { patient, isLoadingPatient } = usePatientData(patientUUID);
     const [isLoadingDependencies, setIsLoadingDependencies] = useState(false);

package/dist/processors/encounter/encounter-processor-helper.js

@@ -32,7 +32,9 @@ export function prepareEncounter(context, encounterDate, encounterRole, encounte
             ];
         }
         // TODO: Question: Should we be editing the location, form and visit here?
-        encounterForSubmission.encounterDatetime = encounterDate;
+        if (encounterDate) {
+            encounterForSubmission.encounterDatetime = encounterDate;
+        }
         encounterForSubmission.location = location;
         encounterForSubmission.form = {
             uuid: formJson.uuid
@@ -46,7 +48,6 @@ export function prepareEncounter(context, encounterDate, encounterRole, encounte
     } else {
         encounterForSubmission = {
             patient: patient.id,
-            encounterDatetime: encounterDate,
             location: location,
             encounterType: formJson.encounterType,
             encounterProviders: [
@@ -63,6 +64,9 @@ export function prepareEncounter(context, encounterDate, encounterRole, encounte
             orders: ordersForSubmission,
             diagnoses: diagnosesForSubmission
         };
+        if (encounterDate) {
+            encounterForSubmission.encounterDatetime = encounterDate;
+        }
     }
     return encounterForSubmission;
 }
@@ -134,16 +138,22 @@ export function saveAttachments(fields, encounter, abortController) {
     return Promise.all(allPromises);
 }
 export function getMutableSessionProps(context) {
-    const { formFields, location, currentProvider, customDependencies, domainObjectValue: encounter } = context;
+    const { formFields, location, currentProvider, customDependencies, sessionDate, domainObjectValue: encounter, visit } = context;
     const { defaultEncounterRole } = customDependencies;
     const encounterRole = formFields.find((field)=>field.type === 'encounterRole')?.meta.submission?.newValue || defaultEncounterRole?.uuid;
     const encounterProvider = formFields.find((field)=>field.type === 'encounterProvider')?.meta.submission?.newValue || currentProvider.uuid;
-    const encounterDate = formFields.find((field)=>field.type === 'encounterDatetime')?.meta.submission?.newValue;
+    const explicitEncounterDate = formFields.find((field)=>field.type === 'encounterDatetime')?.meta.submission?.newValue;
+    // Stopped visits need an explicit datetime because the backend defaults omitted
+    // encounter datetimes to server "now", which can be outside the visit window.
+    // Active visits should use the backend default so client clock skew does not
+    // submit future encounter datetimes.
+    const defaultEncounterDate = visit?.stopDatetime ? sessionDate : undefined;
+    const encounterDate = explicitEncounterDate ?? (encounter?.encounterDatetime ? new Date(encounter.encounterDatetime) : defaultEncounterDate);
     const encounterLocation = formFields.find((field)=>field.type === 'encounterLocation')?.meta.submission?.newValue || encounter?.location?.uuid || location.uuid;
     return {
         encounterRole: encounterRole,
         encounterProvider: encounterProvider,
-        encounterDate: encounterDate,
+        encounterDate,
         encounterLocation: encounterLocation
     };
 }

package/dist/src/form-engine.component.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-engine.component.d.ts","sourceRoot":"","sources":["../../src/form-engine.component.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4D,MAAM,OAAO,CAAC;AAIjF,OAAO,EAAc,KAAK,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAUhE,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAQtF,UAAU,eAAe;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,UAAU,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;IAC/B,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,6BAA6B,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,SAAS,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACjF,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IAC7C,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;CACzC;AA+KD,iBAAS,aAAa,CAAC,KAAK,EAAE,eAAe,qBAM5C;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"form-engine.component.d.ts","sourceRoot":"","sources":["../../src/form-engine.component.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4D,MAAM,OAAO,CAAC;AAIjF,OAAO,EAAc,KAAK,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAWhE,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAQtF,UAAU,eAAe;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,UAAU,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;IAC/B,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,6BAA6B,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,SAAS,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACjF,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IAC7C,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;CACzC;AAkLD,iBAAS,aAAa,CAAC,KAAK,EAAE,eAAe,qBAM5C;AAED,eAAe,aAAa,CAAC"}

package/dist/src/processors/encounter/encounter-processor-helper.d.ts

@@ -1,6 +1,12 @@
 import { type FormField, type FormProcessorContextProps, type OpenmrsEncounter, type PatientIdentifier, type PatientProgram, type PatientProgramPayload, type PersonAttribute } from '../../types';
 import { type FormContextProps } from '../../provider/form-provider';
-export declare function prepareEncounter(context: FormContextProps, encounterDate: Date, encounterRole: string, encounterProvider: string, location: string): OpenmrsEncounter;
+type MutableSessionProps = {
+    encounterRole: string;
+    encounterProvider: string;
+    encounterDate?: Date;
+    encounterLocation: string;
+};
+export declare function prepareEncounter(context: FormContextProps, encounterDate: Date | undefined, encounterRole: string, encounterProvider: string, location: string): OpenmrsEncounter;
 export declare function preparePatientIdentifiers(fields: FormField[], encounterLocation: string): PatientIdentifier[];
 export declare function savePatientIdentifiers(patient: fhir.Patient, identifiers: PatientIdentifier[]): Promise<import("@openmrs/esm-api").FetchResponse<any>>[];
 export declare function preparePersonAttributes(fields: FormField[]): PersonAttribute[];
@@ -8,12 +14,8 @@ export declare function savePersonAttributes(patient: fhir.Patient, attributes:
 export declare function preparePatientPrograms(fields: FormField[], patient: fhir.Patient, currentPatientPrograms: Array<PatientProgram>): Array<PatientProgramPayload>;
 export declare function savePatientPrograms(patientPrograms: PatientProgramPayload[]): Promise<import("@openmrs/esm-api").FetchResponse<any>[]>;
 export declare function saveAttachments(fields: FormField[], encounter: OpenmrsEncounter, abortController: AbortController): any[] | Promise<import("@openmrs/esm-api").FetchResponse<any>[]>;
-export declare function getMutableSessionProps(context: FormContextProps): {
-    encounterRole: string;
-    encounterProvider: string;
-    encounterDate: Date;
-    encounterLocation: string;
-};
+export declare function getMutableSessionProps(context: FormContextProps): MutableSessionProps;
 export declare function inferInitialValueFromDefaultFieldValue(field: FormField): any;
 export declare function hydrateRepeatField(field: FormField, encounter: OpenmrsEncounter, initialValues: Record<string, any>, context: FormProcessorContextProps): Promise<FormField[]>;
+export {};
 //# sourceMappingURL=encounter-processor-helper.d.ts.map

package/dist/src/processors/encounter/encounter-processor-helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"encounter-processor-helper.d.ts","sourceRoot":"","sources":["../../../../src/processors/encounter/encounter-processor-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,SAAS,EACd,KAAK,yBAAyB,EAC9B,KAAK,gBAAgB,EAErB,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACnB,KAAK,qBAAqB,EAC1B,KAAK,eAAe,EACrB,MAAM,aAAa,CAAC;AAKrB,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAQrE,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,gBAAgB,EACzB,aAAa,EAAE,IAAI,EACnB,aAAa,EAAE,MAAM,EACrB,iBAAiB,EAAE,MAAM,EACzB,QAAQ,EAAE,MAAM,oBA6DjB;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,iBAAiB,EAAE,MAAM,GAAG,iBAAiB,EAAE,CAI7G;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,4DAI7F;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,eAAe,EAAE,CAI9E;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,4DAIxF;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,SAAS,EAAE,EACnB,OAAO,EAAE,IAAI,CAAC,OAAO,EACrB,sBAAsB,EAAE,KAAK,CAAC,cAAc,CAAC,GAC5C,KAAK,CAAC,qBAAqB,CAAC,CA+B9B;AAED,wBAAgB,mBAAmB,CAAC,eAAe,EAAE,qBAAqB,EAAE,4DAG3E;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,gBAAgB,EAAE,eAAe,EAAE,eAAe,oEAcjH;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,gBAAgB;mBAa5B,MAAM;uBACE,MAAM;mBACd,IAAI;uBACI,MAAM;EAEjD;AA4FD,wBAAgB,sCAAsC,CAAC,KAAK,EAAE,SAAS,OAetE;AAED,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,SAAS,EAChB,SAAS,EAAE,gBAAgB,EAC3B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAClC,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,SAAS,EAAE,CAAC,CAwEtB"}
+{"version":3,"file":"encounter-processor-helper.d.ts","sourceRoot":"","sources":["../../../../src/processors/encounter/encounter-processor-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,SAAS,EACd,KAAK,yBAAyB,EAC9B,KAAK,gBAAgB,EAErB,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACnB,KAAK,qBAAqB,EAC1B,KAAK,eAAe,EACrB,MAAM,aAAa,CAAC;AAKrB,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAQrE,KAAK,mBAAmB,GAAG;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,CAAC,EAAE,IAAI,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,gBAAgB,EACzB,aAAa,EAAE,IAAI,GAAG,SAAS,EAC/B,aAAa,EAAE,MAAM,EACrB,iBAAiB,EAAE,MAAM,EACzB,QAAQ,EAAE,MAAM,oBAiEjB;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,iBAAiB,EAAE,MAAM,GAAG,iBAAiB,EAAE,CAI7G;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,4DAI7F;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,eAAe,EAAE,CAI9E;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,4DAIxF;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,SAAS,EAAE,EACnB,OAAO,EAAE,IAAI,CAAC,OAAO,EACrB,sBAAsB,EAAE,KAAK,CAAC,cAAc,CAAC,GAC5C,KAAK,CAAC,qBAAqB,CAAC,CA+B9B;AAED,wBAAgB,mBAAmB,CAAC,eAAe,EAAE,qBAAqB,EAAE,4DAG3E;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,gBAAgB,EAAE,eAAe,EAAE,eAAe,oEAcjH;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,gBAAgB,GAAG,mBAAmB,CAmCrF;AA4FD,wBAAgB,sCAAsC,CAAC,KAAK,EAAE,SAAS,OAetE;AAED,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,SAAS,EAChB,SAAS,EAAE,gBAAgB,EAC3B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAClC,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,SAAS,EAAE,CAAC,CAwEtB"}

package/dist/src/utils/common-utils.d.ts

@@ -1,4 +1,5 @@
 import { type FormSchema, type FormField, type OpenmrsObs, type RenderType } from '../types';
+import { type Visit } from '@openmrs/esm-framework';
 export declare function flattenObsList(obsList: OpenmrsObs[]): OpenmrsObs[];
 export declare function hasRendering(field: FormField, rendering: RenderType): boolean;
 export declare function clearSubmission(field: FormField): void;
@@ -6,6 +7,13 @@ export declare function gracefullySetSubmission(field: FormField, newValue: any,
 export declare function hasSubmission(field: FormField): boolean;
 export declare function isViewMode(sessionMode: string): sessionMode is "view" | "embedded-view";
 export declare function parseToLocalDateTime(dateString: string): Date;
+/**
+ * Returns `date` if it falls within the visit's start/stop window, otherwise the
+ * visit's start datetime. This keeps default encounter datetimes valid when filling
+ * forms against a past (stopped) visit via retrospective data entry; the backend
+ * rejects encounters dated outside the visit window.
+ */
+export declare function getDateWithinVisitWindow(date: Date, visit?: Visit): Date;
 export declare function formatDateAsDisplayString(field: FormField, date: Date): string;
 /**
  * Creates a new copy of `formJson` with updated references at the page and section levels.

package/dist/src/utils/common-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common-utils.d.ts","sourceRoot":"","sources":["../../../src/utils/common-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,SAAS,EAAE,KAAK,UAAU,EAAE,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AAI7F,wBAAgB,cAAc,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,CAgBlE;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,WAEnE;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,SAAS,QAS/C;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,OAWxF;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,SAAS,WAE7C;AAED,wBAAgB,UAAU,CAAC,WAAW,EAAE,MAAM,2CAE7C;AAED,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAgB7D;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,UAQrE;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,UAAU;;;;;;;;;;;;;;;eA9E1D,CAAH;cAGD,CAAF;;;;;;;;gBAQmB,CAAC;4BAA0B,CAAC;;;;EAyE9C;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAW,UAExD"}
+{"version":3,"file":"common-utils.d.ts","sourceRoot":"","sources":["../../../src/utils/common-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,SAAS,EAAE,KAAK,UAAU,EAAE,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AAE7F,OAAO,EAAsC,KAAK,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAExF,wBAAgB,cAAc,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,CAgBlE;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,WAEnE;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,SAAS,QAS/C;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,OAWxF;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,SAAS,WAE7C;AAED,wBAAgB,UAAU,CAAC,WAAW,EAAE,MAAM,2CAE7C;AAED,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAgB7D;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,CAUxE;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,UAQrE;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,UAAU;;;;;;;;;;;;;;;eAjG5C,CAAC;cACd,CAAC;;;;;;;;gBAWD,CAAC;4BAA0B,CAAC;;;;EA2FlC;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAW,UAExD"}

package/dist/utils/common-utils.js

@@ -69,6 +69,22 @@ export function parseToLocalDateTime(dateString) {
     }
     return dateObj;
 }
+/**
+ * Returns `date` if it falls within the visit's start/stop window, otherwise the
+ * visit's start datetime. This keeps default encounter datetimes valid when filling
+ * forms against a past (stopped) visit via retrospective data entry; the backend
+ * rejects encounters dated outside the visit window.
+ */ export function getDateWithinVisitWindow(date, visit) {
+    if (!visit) {
+        return date;
+    }
+    const visitStart = visit.startDatetime ? new Date(visit.startDatetime) : null;
+    const visitStop = visit.stopDatetime ? new Date(visit.stopDatetime) : null;
+    if (visitStart && date < visitStart || visitStop && date > visitStop) {
+        return visitStart ?? visitStop;
+    }
+    return date;
+}
 export function formatDateAsDisplayString(field, date) {
     const options = {
         noToday: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-form-engine-lib",
-  "version": "4.2.1-pre.2435",
+  "version": "4.2.1-pre.2439",
   "description": "React Form Engine for O3",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/src/form-engine.component.tsx

@@ -8,6 +8,7 @@ import { init, teardown } from './lifecycle';
 import { isEmpty, useFormJson } from '.';
 import { formEngineAppName } from './globals';
 import { reportError } from './utils/error-utils';
+import { getDateWithinVisitWindow } from './utils/common-utils';
 import { useFormCollapse } from './hooks/useFormCollapse';
 import { useFormWorkspaceSize } from './hooks/useFormWorkspaceSize';
 import { usePageObserver } from './components/sidebar/usePageObserver';
@@ -58,9 +59,12 @@ const FormEngine = ({
   const { t } = useTranslation();
   const session = useSession();
   const ref = useRef(null);
+  const rawSessionDate = useRef(new Date());
+  // Recompute when the visit bounds arrive or change; the visit prop may not be
+  // fully loaded when the form mounts.
   const sessionDate = useMemo(() => {
-    return new Date();
-  }, []);
+    return getDateWithinVisitWindow(rawSessionDate.current, visit);
+  }, [visit?.startDatetime, visit?.stopDatetime]);
   const workspaceSize = useFormWorkspaceSize(ref);
   const { patient, isLoadingPatient } = usePatientData(patientUUID);
   const [isLoadingDependencies, setIsLoadingDependencies] = useState(false);

package/src/processors/encounter/encounter-processor-helper.ts

@@ -21,9 +21,16 @@ import { assignedOrderIds } from '../../adapters/orders-adapter';
 import { type OpenmrsResource } from '@openmrs/esm-framework';
 import { assignedDiagnosesIds } from '../../adapters/encounter-diagnosis-adapter';
 
+type MutableSessionProps = {
+  encounterRole: string;
+  encounterProvider: string;
+  encounterDate?: Date;
+  encounterLocation: string;
+};
+
 export function prepareEncounter(
   context: FormContextProps,
-  encounterDate: Date,
+  encounterDate: Date | undefined,
   encounterRole: string,
   encounterProvider: string,
   location: string,
@@ -54,7 +61,9 @@ export function prepareEncounter(
       ];
     }
     // TODO: Question: Should we be editing the location, form and visit here?
-    encounterForSubmission.encounterDatetime = encounterDate;
+    if (encounterDate) {
+      encounterForSubmission.encounterDatetime = encounterDate;
+    }
     encounterForSubmission.location = location;
     encounterForSubmission.form = {
       uuid: formJson.uuid,
@@ -68,7 +77,6 @@ export function prepareEncounter(
   } else {
     encounterForSubmission = {
       patient: patient.id,
-      encounterDatetime: encounterDate,
       location: location,
       encounterType: formJson.encounterType,
       encounterProviders: [
@@ -85,6 +93,9 @@ export function prepareEncounter(
       orders: ordersForSubmission,
       diagnoses: diagnosesForSubmission,
     };
+    if (encounterDate) {
+      encounterForSubmission.encounterDatetime = encounterDate;
+    }
   }
   return encounterForSubmission;
 }
@@ -171,14 +182,31 @@ export function saveAttachments(fields: FormField[], encounter: OpenmrsEncounter
   return Promise.all(allPromises);
 }
 
-export function getMutableSessionProps(context: FormContextProps) {
-  const { formFields, location, currentProvider, customDependencies, domainObjectValue: encounter } = context;
+export function getMutableSessionProps(context: FormContextProps): MutableSessionProps {
+  const {
+    formFields,
+    location,
+    currentProvider,
+    customDependencies,
+    sessionDate,
+    domainObjectValue: encounter,
+    visit,
+  } = context;
   const { defaultEncounterRole } = customDependencies;
   const encounterRole =
     formFields.find((field) => field.type === 'encounterRole')?.meta.submission?.newValue || defaultEncounterRole?.uuid;
   const encounterProvider =
     formFields.find((field) => field.type === 'encounterProvider')?.meta.submission?.newValue || currentProvider.uuid;
-  const encounterDate = formFields.find((field) => field.type === 'encounterDatetime')?.meta.submission?.newValue;
+  const explicitEncounterDate = formFields.find((field) => field.type === 'encounterDatetime')?.meta.submission
+    ?.newValue as Date | undefined;
+  // Stopped visits need an explicit datetime because the backend defaults omitted
+  // encounter datetimes to server "now", which can be outside the visit window.
+  // Active visits should use the backend default so client clock skew does not
+  // submit future encounter datetimes.
+  const defaultEncounterDate = visit?.stopDatetime ? sessionDate : undefined;
+  const encounterDate =
+    explicitEncounterDate ??
+    (encounter?.encounterDatetime ? new Date(encounter.encounterDatetime) : defaultEncounterDate);
   const encounterLocation =
     formFields.find((field) => field.type === 'encounterLocation')?.meta.submission?.newValue ||
     encounter?.location?.uuid ||
@@ -186,7 +214,7 @@ export function getMutableSessionProps(context: FormContextProps) {
   return {
     encounterRole: encounterRole as string,
     encounterProvider: encounterProvider as string,
-    encounterDate: encounterDate as Date,
+    encounterDate,
     encounterLocation: encounterLocation as string,
   };
 }

package/src/utils/common-utils.ts

@@ -1,7 +1,7 @@
 import dayjs from 'dayjs';
 import { type FormSchema, type FormField, type OpenmrsObs, type RenderType } from '../types';
 import { isEmpty } from '../validators/form-validator';
-import { formatDate, type FormatDateOptions } from '@openmrs/esm-framework';
+import { formatDate, type FormatDateOptions, type Visit } from '@openmrs/esm-framework';
 
 export function flattenObsList(obsList: OpenmrsObs[]): OpenmrsObs[] {
   const flattenedList: OpenmrsObs[] = [];
@@ -75,6 +75,24 @@ export function parseToLocalDateTime(dateString: string): Date {
   return dateObj;
 }
 
+/**
+ * Returns `date` if it falls within the visit's start/stop window, otherwise the
+ * visit's start datetime. This keeps default encounter datetimes valid when filling
+ * forms against a past (stopped) visit via retrospective data entry; the backend
+ * rejects encounters dated outside the visit window.
+ */
+export function getDateWithinVisitWindow(date: Date, visit?: Visit): Date {
+  if (!visit) {
+    return date;
+  }
+  const visitStart = visit.startDatetime ? new Date(visit.startDatetime) : null;
+  const visitStop = visit.stopDatetime ? new Date(visit.stopDatetime) : null;
+  if ((visitStart && date < visitStart) || (visitStop && date > visitStop)) {
+    return visitStart ?? visitStop;
+  }
+  return date;
+}
+
 export function formatDateAsDisplayString(field: FormField, date: Date) {
   const options: Partial<FormatDateOptions> = { noToday: true };
   if (field.datePickerFormat === 'calendar') {