Add ccc and patient name to manifest samples table and flu sample types

packages/esm-lab-manifest-app/src/config-schema.ts

@@ -28,8 +28,14 @@ export const configSchema = {
       { sampleType: 'DBS', labManifestType: ['1'] },
     ],
   },
+  cccNumberIdentifierType: {
+    _type: Type.UUID,
+    _description: 'List of sample types and list of manifest type id it applies',
+    _default: '05ee9cf4-7242-4a17-b4d4-00f707265c8a',
+  },
 };
 export interface LabManifestConfig {
   labmanifestTypes: Array<{ id: number; type: string }>;
   sampleTypes: Array<{ sampleType: string; labManifestType: Array<string> }>;
+  cccNumberIdentifierType: string;
 }

packages/esm-lab-manifest-app/src/forms/lab-manifest-form.scss

@@ -1,22 +1,22 @@
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
+@use '@carbon/type';
 @use '@carbon/layout';
-@import '~@openmrs/esm-styleguide/src/vars';
+@use '@carbon/colors';
 
 .heading {
   @include type.type-style('heading-compact-01');
-  margin: spacing.$spacing-05 0 spacing.$spacing-05;
+  margin: layout.$spacing-05 0 layout.$spacing-05;
 }
 
 .warningContainer {
-  background-color: $carbon--red-50;
-  padding: spacing.$spacing-04;
-  margin: spacing.$spacing-03 0 spacing.$spacing-03;
+  background-color: colors.$red-50;
+  padding: layout.$spacing-04;
+  margin: layout.$spacing-03 0 layout.$spacing-03;
   display: flex;
   justify-content: space-between;
+
   .warning {
     @include type.type-style('heading-01');
-    color: $ui-05;
+    color: colors.$gray-100;
   }
 }
 
@@ -28,33 +28,32 @@
 }
 
 .grid {
-  margin: 0 spacing.$spacing-05;
+  margin: 0 layout.$spacing-05;
   padding: 0rem;
 }
 
 .input {
-  margin-top: spacing.$spacing-05;
+  margin-top: layout.$spacing-05;
 }
 
 .inputRow {
-  margin-top: spacing.$spacing-05;
-  width: 50%; // Adjust width as per your design requirements
+  margin-top: layout.$spacing-05;
+  display: flex;
+  flex: 1;
+
 }
 
 .datePickersRow {
   display: flex;
   flex-wrap: nowrap;
-  gap: spacing.$spacing-05; // Adjust gap between columns
+  gap: layout.$spacing-05; // Adjust gap between columns
   align-items: center;
   width: 100%;
 }
 
-.datePickerInput {
-  flex-grow: 1;
-}
 
 .button {
-  height: spacing.$spacing-10;
+  height: layout.$spacing-10;
   display: flex;
   align-content: flex-start;
   align-items: baseline;
@@ -63,11 +62,11 @@
 
 .buttonSet {
   padding: 0rem;
-  margin-top: spacing.$spacing-05;
+  margin-top: layout.$spacing-05;
   display: flex;
   justify-content: space-between;
   width: 100%;
-  margin-bottom: spacing.$spacing-05;
+  margin-bottom: layout.$spacing-05;
 }
 
 .datesContainer {
@@ -76,17 +75,19 @@
   width: 100%;
   display: flex;
 }
+
 .inlineActions {
   display: flex;
-  gap: spacing.$spacing-05; /* Adjust the spacing as needed */
+  gap: layout.$spacing-05;
+  /* Adjust the spacing as needed */
 }
 
 .formTitle {
   @include type.type-style('heading-02');
   display: flex;
   align-items: center;
   justify-content: space-between;
-  margin: spacing.$spacing-05;
+  margin: layout.$spacing-05;
   row-gap: 1.5rem;
   position: relative;
 
@@ -100,7 +101,7 @@
     left: 0;
   }
 
-  & > span {
+  &>span {
     @include type.type-style('body-01');
   }
 }
@@ -115,14 +116,21 @@
   }
 
   .buttonSet {
-    padding: spacing.$spacing-06 spacing.$spacing-05;
-    background-color: $ui-02;
+    padding: layout.$spacing-06 layout.$spacing-05;
+    background-color: colors.$white;
     justify-content: flex-end;
-    gap: spacing.$spacing-05;
+    gap: layout.$spacing-05;
   }
 }
 
 .previewContainer {
-  margin-top: spacing.$spacing-05;
-  margin-bottom: spacing.$spacing-05;
+  margin-top: layout.$spacing-05;
+  margin-bottom: layout.$spacing-05;
 }
+
+.datePickerInput span,
+.datePickerInput div,
+.datePickerInput input,
+.datePickerInput {
+  min-width: 100%;
+}

packages/esm-lab-manifest-app/src/forms/lab-manifest-form.workspace.tsx

@@ -76,6 +76,7 @@ const LabManifestForm: React.FC<LabManifestFormProps> = ({ closeWorkspace, manif
                 dateFormat="d/m/Y"
                 id="startDate"
                 datePickerType="single"
+                className={styles.datePickerInput}
                 invalid={form.formState.errors[field.name]?.message}
                 invalidText={form.formState.errors[field.name]?.message}>
                 <DatePickerInput
@@ -97,6 +98,7 @@ const LabManifestForm: React.FC<LabManifestFormProps> = ({ closeWorkspace, manif
               <DatePicker
                 value={field.value}
                 onChange={field.onChange}
+                className={styles.datePickerInput}
                 dateFormat="d/m/Y"
                 id="endDate"
                 datePickerType="single"
@@ -146,6 +148,7 @@ const LabManifestForm: React.FC<LabManifestFormProps> = ({ closeWorkspace, manif
                 dateFormat="d/m/Y"
                 id="dispatchDate"
                 datePickerType="single"
+                className={styles.datePickerInput}
                 {...field}
                 invalid={form.formState.errors[field.name]?.message}
                 invalidText={form.formState.errors[field.name]?.message}>

packages/esm-lab-manifest-app/src/forms/lab-manifest-orders-to-manifest.modal.tsx

@@ -17,8 +17,8 @@ import { showSnackbar, useConfig } from '@openmrs/esm-framework';
 import React from 'react';
 import { Controller, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
-import { mutate } from 'swr';
 import { z } from 'zod';
+import { LabManifestConfig } from '../config-schema';
 import { useLabManifest } from '../hooks';
 import {
   addOrderToManifest,
@@ -28,7 +28,6 @@ import {
 import { ActiveRequestOrder } from '../types';
 import ActiveOrdersSelectionPreview from './active-order-selection-preview';
 import styles from './lab-manifest-form.scss';
-import { LabManifestConfig } from '../config-schema';
 
 interface LabManifestOrdersToManifestFormProps {
   onClose: () => void;
@@ -54,7 +53,6 @@ const LabManifestOrdersToManifestForm: React.FC<LabManifestOrdersToManifestFormP
 }) => {
   const { t } = useTranslation();
   const form = useForm<OrderToManifestFormType>({
-    defaultValues: {},
     resolver: zodResolver(labManifestOrderToManifestFormSchema),
   });
   const { sampleTypes } = useConfig<LabManifestConfig>();
@@ -67,15 +65,27 @@ const LabManifestOrdersToManifestForm: React.FC<LabManifestOrdersToManifestFormP
       );
       results.forEach((res) => {
         if (res.status === 'fulfilled') {
-          showSnackbar({ title: 'Success', kind: 'success', subtitle: 'Order added succesfully' });
+          showSnackbar({
+            title: 'Success',
+            kind: 'success',
+            subtitle: t('manifestorderAddSuccess', 'Order added succesfully'),
+          });
         } else {
-          showSnackbar({ title: 'Failure', kind: 'error', subtitle: 'Error adding order to the manifest' });
+          showSnackbar({
+            title: 'Failure',
+            kind: 'error',
+            subtitle: t('manifestOrderError', 'Error adding order to the manifest') + ` ${res.reason}`,
+          });
         }
       });
       mutateManifestLinks(manifest?.uuid, manifest?.manifestStatus);
       onClose();
     } catch (error) {
-      showSnackbar({ title: 'Failure', kind: 'error', subtitle: 'Error adding orders to the manifest' });
+      showSnackbar({
+        title: 'Failure',
+        kind: 'error',
+        subtitle: t('manifestOrderError', 'Error adding order to the manifest') + ` ${error?.message}`,
+      });
     }
   };
 
@@ -112,12 +122,13 @@ const LabManifestOrdersToManifestForm: React.FC<LabManifestOrdersToManifestFormP
               />
             </Column>
             <Row className={styles.datePickersRow}>
-              <Column className={styles.datePickerInput}>
+              <Column className={styles.inputRow}>
                 <Controller
                   control={form.control}
                   name="sampleCollectionDate"
                   render={({ field }) => (
                     <DatePicker
+                      className={styles.datePickerInput}
                       dateFormat="d/m/Y"
                       id="sampleCollectionDate"
                       datePickerType="single"
@@ -129,17 +140,19 @@ const LabManifestOrdersToManifestForm: React.FC<LabManifestOrdersToManifestFormP
                         invalidText={form.formState.errors[field.name]?.message}
                         placeholder="mm/dd/yyyy"
                         labelText={t('sampleCollectionDate', 'Sample collection date')}
+                        size="xl"
                       />
                     </DatePicker>
                   )}
                 />
               </Column>
-              <Column className={styles.datePickerInput}>
+              <Column className={styles.inputRow}>
                 <Controller
                   control={form.control}
                   name="sampleSeparationDate"
                   render={({ field }) => (
                     <DatePicker
+                      className={styles.datePickerInput}
                       dateFormat="d/m/Y"
                       id="sampleSeparationDate"
                       datePickerType="single"
@@ -151,6 +164,7 @@ const LabManifestOrdersToManifestForm: React.FC<LabManifestOrdersToManifestFormP
                         invalidText={form.formState.errors[field.name]?.message}
                         placeholder="mm/dd/yyyy"
                         labelText={t('sampleSeparationDate', 'Sample seperation date')}
+                        size="xl"
                       />
                     </DatePicker>
                   )}

packages/esm-lab-manifest-app/src/forms/sample-delete-confirm-dialog.modal.tsx

@@ -19,6 +19,8 @@ import React from 'react';
 import { useTranslation } from 'react-i18next';
 import styles from '../tables/lab-manifest-table.scss';
 import { LabManifestSample } from '../types';
+import PatientNameCell from '../tables/patient-name-cell.component';
+import PatientCCCNumbercell from '../tables/patient-ccc-no-cell.component';
 
 interface SampleDeleteConfirmDialogProps {
   onClose: () => void;
@@ -30,7 +32,11 @@ const SampleDeleteConfirmDialog: React.FC<SampleDeleteConfirmDialogProps> = ({ o
 
   const headers = [
     {
-      header: t('patientIdentifier', 'Patient Identifier'),
+      header: t('patient', 'Patient'),
+      key: 'patient',
+    },
+    {
+      header: t('cccKDODNumber', 'CCC/KDOD Number'),
       key: 'cccKDODNumber',
     },
     {
@@ -62,7 +68,12 @@ const SampleDeleteConfirmDialog: React.FC<SampleDeleteConfirmDialogProps> = ({ o
         sampleType: sample.sampleType ?? '--',
         status: sample.status,
         batchNumber: sample.batchNumber ?? '--',
-        cccKDODNumber: sample?.order?.patient?.identifiers[0]?.identifier ?? '--',
+        patient: sample?.order?.patient?.uuid ? <PatientNameCell patientUuid={sample?.order?.patient?.uuid} /> : '--',
+        cccKDODNumber: sample?.order?.patient?.uuid ? (
+          <PatientCCCNumbercell patientUuid={sample?.order?.patient?.uuid} />
+        ) : (
+          '--'
+        ),
         dateRequested: sample.dateSent ? formatDate(parseDate(sample.dateSent)) : '--',
         resultDate: sample.resultDate ? formatDate(parseDate(sample.resultDate)) : '--',
         result: sample.result ?? '--',

packages/esm-lab-manifest-app/src/hooks/usePatient.ts

@@ -0,0 +1,16 @@
+import { FetchResponse, openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
+import useSWR from 'swr';
+
+const usePatient = (patientUuid: string) => {
+  const customerep = 'custom:(person:(display),identifiers:(identifier,identifierType:(uuid)))';
+  const url = `${restBaseUrl}/patient/${patientUuid}?v=${customerep}`;
+  const { data, error, isLoading } = useSWR<
+    FetchResponse<{
+      person: { display: string };
+      identifiers: Array<{ identifier: string; identifierType: { uuid: string } }>;
+    }>
+  >(url, openmrsFetch);
+  return { patient: data?.data, error, isLoading };
+};
+
+export default usePatient;

packages/esm-lab-manifest-app/src/tables/lab-manifest-samples.component.tsx

@@ -15,7 +15,15 @@ import {
   TableSelectRow,
 } from '@carbon/react';
 import { ArrowRight, Printer, TrashCan } from '@carbon/react/icons';
-import { ErrorState, formatDate, parseDate, showModal, showSnackbar, usePagination } from '@openmrs/esm-framework';
+import {
+  ConfigurableLink,
+  ErrorState,
+  formatDate,
+  parseDate,
+  showModal,
+  showSnackbar,
+  usePagination,
+} from '@openmrs/esm-framework';
 import { CardHeader, EmptyState, usePaginationInfo } from '@openmrs/esm-patient-common-lib';
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -28,6 +36,8 @@ import {
 } from '../lab-manifest.resources';
 import { LabManifestSample } from '../types';
 import styles from './lab-manifest-table.scss';
+import PatientNameCell from './patient-name-cell.component';
+import PatientCCCNumbercell from './patient-ccc-no-cell.component';
 
 interface LabManifestSamplesProps {
   manifestUuid: string;
@@ -45,6 +55,10 @@ const LabManifestSamples: React.FC<LabManifestSamplesProps> = ({ manifestUuid })
   const headers = [
     {
       header: t('patient', 'Patient'),
+      key: 'patientName',
+    },
+    {
+      header: t('cccKDODNumber', 'CCC/KDOD Number'),
       key: 'cccKDODNumber',
     },
     {
@@ -130,7 +144,16 @@ const LabManifestSamples: React.FC<LabManifestSamplesProps> = ({ manifestUuid })
         sampleType: sample.sampleType ?? '--',
         status: sample.status,
         batchNumber: sample.batchNumber ?? '--',
-        cccKDODNumber: sample?.order?.patient?.identifiers[0]?.identifier ?? '--',
+        patientName: sample?.order?.patient?.uuid ? (
+          <PatientNameCell patientUuid={sample?.order?.patient?.uuid} />
+        ) : (
+          '--'
+        ),
+        cccKDODNumber: sample?.order?.patient ? (
+          <PatientCCCNumbercell patientUuid={sample?.order?.patient?.uuid} />
+        ) : (
+          '--'
+        ),
         dateRequested: sample.dateSent ? formatDate(parseDate(sample.dateSent)) : '--',
         resultDate: sample.resultDate ? formatDate(parseDate(sample.resultDate)) : '--',
         result: sample.result ?? '--',