Merge pull request #6302 from msupply-foundation/6263-suggest-next-da…

…te-from-vax-card

6263 suggest next date from vax card

client/packages/system/src/Encounter/DetailView/DetailView.tsx

@@ -37,6 +37,8 @@ import { getLogicalStatus } from '../utils';
 import { PatientTabValue } from '../../Patient/PatientView/PatientView';
 import { VaccinationCard } from '../../Vaccination/Components/VaccinationCard';
 import { ScheduleNextEncounterModal } from './ScheduleNextEncounterModal';
+import { usePatientVaccineCard } from '../../Vaccination/api/usePatientVaccineCard';
+import { getNextVaccinationEncounterDate } from './helpers';
 
 const getPatientBreadcrumbSuffix = (
   encounter: EncounterFragment,
@@ -166,6 +168,15 @@ export const DetailView: FC = () => {
     isError,
   } = useEncounter.document.byId(id);
 
+  // If this is a vaccination encounter, we want to use the suggested
+  // next vaccination dates for the next encounter
+  const {
+    query: { data: vaccineCard },
+  } = usePatientVaccineCard(encounter?.programEnrolment?.id ?? '');
+  const suggestedNextEncounterDate = getNextVaccinationEncounterDate(
+    vaccineCard?.items ?? []
+  );
+
   const handleSave = useEncounter.document.upsertDocument(
     encounter?.patient.id ?? '',
     encounter?.type ?? ''
@@ -363,6 +374,7 @@ export const DetailView: FC = () => {
               encounterConfig={encounter.document.documentRegistry}
               onClose={nextEncounterModal.toggleOff}
               patientId={encounter.patient.id ?? ''}
+              suggestedDate={suggestedNextEncounterDate}
             />
           )}
           <Toolbar onChange={updateEncounter} encounter={encounter} />

client/packages/system/src/Encounter/DetailView/ScheduleNextEncounterModal.tsx

@@ -23,15 +23,18 @@ export const ScheduleNextEncounterModal = ({
   patientId,
   encounterConfig,
   onClose,
+  suggestedDate,
 }: {
   patientId: string;
   encounterConfig: DocumentRegistryFragment;
   onClose: () => void;
+  suggestedDate: Date | null;
 }) => {
   const { user, storeId } = useAuthContext();
   const t = useTranslation();
   const [draft, setDraft] = useState<EncounterSchema>({
     createdDatetime: new Date().toISOString(),
+    startDatetime: suggestedDate?.toISOString(),
     createdBy: { id: user?.id ?? '', username: user?.name ?? '' },
     status: EncounterNodeStatus.Pending,
     location: {

client/packages/system/src/Encounter/DetailView/helpers.test.ts

@@ -0,0 +1,45 @@
+import { DateUtils } from '@common/intl';
+import { VaccinationCardItemFragment } from '../../Vaccination/api/operations.generated';
+import { getNextVaccinationEncounterDate } from './helpers';
+
+describe('getNextVaccinationEncounterDate', () => {
+  it('should return null if there are no items', () => {
+    const items: VaccinationCardItemFragment[] = [];
+    expect(getNextVaccinationEncounterDate(items)).toBeNull();
+  });
+
+  it('should return null if there are no suggested dates', () => {
+    const items = [
+      { id: '1', suggestedDate: null },
+      { id: '2', suggestedDate: null },
+    ] as VaccinationCardItemFragment[];
+    expect(getNextVaccinationEncounterDate(items)).toBeNull();
+  });
+
+  it('should return null if all suggested dates are in the past', () => {
+    const items = [
+      { id: '1', suggestedDate: '2021-01-01' },
+      { id: '2', suggestedDate: '2021-01-02' },
+    ] as VaccinationCardItemFragment[];
+    expect(getNextVaccinationEncounterDate(items)).toBeNull();
+  });
+
+  it('should return the nearest suggested date', () => {
+    const oneMonthFromNow = DateUtils.addMonths(new Date(), 1);
+    const items = [
+      {
+        id: '1',
+        suggestedDate: DateUtils.addMonths(new Date(), 4).toISOString(),
+      },
+      {
+        id: '2',
+        suggestedDate: oneMonthFromNow.toISOString(),
+      },
+      {
+        id: '3',
+        suggestedDate: DateUtils.addMonths(new Date(), 2).toISOString(),
+      },
+    ] as VaccinationCardItemFragment[];
+    expect(getNextVaccinationEncounterDate(items)).toEqual(oneMonthFromNow);
+  });
+});

client/packages/system/src/Encounter/DetailView/helpers.ts

@@ -0,0 +1,23 @@
+import { VaccinationCardItemFragment } from '../../Vaccination/api/operations.generated';
+
+export function getNextVaccinationEncounterDate(
+  items: VaccinationCardItemFragment[]
+): Date | null {
+  const nextSuggestedDate = items.reduce<Date | null>(
+    (nextSuggestedDate, vaccination) => {
+      if (!vaccination.suggestedDate) return nextSuggestedDate;
+
+      const vaccinationDate = new Date(vaccination.suggestedDate);
+
+      if (vaccinationDate < new Date()) return nextSuggestedDate;
+
+      if (!nextSuggestedDate || vaccinationDate < nextSuggestedDate) {
+        return vaccinationDate;
+      }
+      return nextSuggestedDate;
+    },
+    null
+  );
+
+  return nextSuggestedDate;
+}