Merge pull request #7 from FelixKiprotich350/main

(fix) fixed pending issues
palladiumkenya · Nov 8, 2024 · a6306ca · a6306ca
2 parents 06c455d + 0b57032
commit a6306ca
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/...s/esm-medical-supply-dispensing-app/src/dashboard/dispensing-dashboard-link.component.tsx b/...s/esm-medical-supply-dispensing-app/src/dashboard/dispensing-dashboard-link.component.tsx
@@ -26,10 +26,10 @@ function DashboardExtension() {
   return (
     <ConfigurableLink
       className={classNames('cds--side-nav__link', {
-        'active-left-nav-link': navLink.match('dispensing'),
+        'active-left-nav-link': navLink.match('supplies-dispensing'),
       })}
-      to={`${spaBasePath}/dispensing`}>
-      {t('dispensing', 'Dispensing')}
+      to={`${spaBasePath}/suppliesdispensing`}>
+      {t('suppliesdispensing', 'Supplies Dispensing')}
     </ConfigurableLink>
   );
 }
diff --git a/packages/esm-medical-supply-dispensing-app/src/dispensing-link.component.tsx b/packages/esm-medical-supply-dispensing-app/src/dispensing-link.component.tsx
@@ -5,5 +5,5 @@ import { spaBasePath } from './constants';
 
 export default function DispensingLink() {
   const { t } = useTranslation();
-  return <ConfigurableLink to={spaBasePath}>{t('dispensing', 'Dispensing')}</ConfigurableLink>;
+  return <ConfigurableLink to={spaBasePath}>{t('medicalSuppliesDispensing', 'Supplies Dispensing')}</ConfigurableLink>;
 }
diff --git a/packages/esm-medical-supply-dispensing-app/src/forms/pause-dispense-form.component.tsx b/packages/esm-medical-supply-dispensing-app/src/forms/pause-dispense-form.component.tsx
@@ -99,7 +99,7 @@ const PauseDispenseForm: React.FC<PauseDispenseFormProps> = ({
       delete medicationDispensePayload['dsiplay'];
       delete medicationDispensePayload['statusReasonCodeableConcept'];
       delete medicationDispensePayload['medicalSupplyOrderStatus'];
-      saveMedicationSupplyDispense(medicationDispensePayload, MedicationDispenseStatus.paused, abortController)
+      saveMedicationSupplyDispense(medicationDispensePayload, MedicationDispenseStatus.in_progress, abortController)
         .then((response) => {
           if (response.ok) {
             showToast({

diff --git a/packages/esm-medical-supply-dispensing-app/src/routes.json b/packages/esm-medical-supply-dispensing-app/src/routes.json
@@ -27,7 +27,7 @@
   "pages": [
     {
       "component": "supplyDispensingDashboard",
-      "route": "medical-supply-dispensing"
+      "route": "supplies-dispensing"
     }
   ]
 }
diff --git a/packages/esm-medical-supply-dispensing-app/src/types/index.ts b/packages/esm-medical-supply-dispensing-app/src/types/index.ts
@@ -285,7 +285,7 @@ export interface MedicationDispense {
 }
 export enum MedicationDispenseStatus {
   //in_progress = "in-progress",  NOT YET IMPLEMENTED
-  paused = 'paused',
+  in_progress = 'in_progress',
   completed = 'completed',
   declined = 'declined',
 }

diff --git a/packages/esm-medical-supply-dispensing-app/src/utils.test.ts b/packages/esm-medical-supply-dispensing-app/src/utils.test.ts
@@ -655,7 +655,7 @@ describe('Util Tests', () => {
       },
       performer: undefined,
       resourceType: 'MedicationDispense',
-      status: MedicationDispenseStatus.paused,
+      status: MedicationDispenseStatus.in_progress,
       subject: { display: '', reference: '', type: '' },
       substitution: { reason: [], type: undefined, wasSubstituted: false },
       type: undefined,
@@ -863,7 +863,7 @@ describe('Util Tests', () => {
 
     test('when adding new dispense should return on-hold if status of new dispense is on-hold and if restrict total quantity dispensed config is false', () => {
       newMedicationDispense.extension[0].valueDateTime = '2023-01-03T14:00:00-05:00';
-      newMedicationDispense.status = MedicationDispenseStatus.paused;
+      newMedicationDispense.status = MedicationDispenseStatus.in_progress;
       newMedicationDispense.quantity.value = 0;
       expect(
         computeNewFulfillerStatusAfterDispenseEvent(
@@ -902,7 +902,7 @@ describe('Util Tests', () => {
 
     test('when adding new on-hold dispense should return on-hold if restrict total quantity dispensed config is true', () => {
       newMedicationDispense.extension[0].valueDateTime = '2023-01-03T14:00:00-05:00';
-      newMedicationDispense.status = MedicationDispenseStatus.paused;
+      newMedicationDispense.status = MedicationDispenseStatus.in_progress;
       newMedicationDispense.quantity.value = 0;
       expect(
         computeNewFulfillerStatusAfterDispenseEvent(
@@ -915,10 +915,10 @@ describe('Util Tests', () => {
 
     test('when adding new dispense to request with existing dispense should return complete if meets total quantity ordered and restrict total quantity dispensed config is true', () => {
       newMedicationDispense.extension[0].valueDateTime = '2023-01-03T14:00:00-05:00';
-      newMedicationDispense.status = MedicationDispenseStatus.paused;
+      newMedicationDispense.status = MedicationDispenseStatus.in_progress;
       newMedicationDispense.quantity.value = 20;
       existingMedicationDispense.extension[0].valueDateTime = '2023-01-03T14:00:00-05:00';
-      existingMedicationDispense.status = MedicationDispenseStatus.paused;
+      existingMedicationDispense.status = MedicationDispenseStatus.in_progress;
       existingMedicationDispense.quantity.value = 10;
       expect(
         computeNewFulfillerStatusAfterDispenseEvent(
@@ -2191,7 +2191,7 @@ describe('Util Tests', () => {
           },
           performer: undefined,
           resourceType: 'MedicationDispense',
-          status: MedicationDispenseStatus.paused,
+          status: MedicationDispenseStatus.in_progress,
           subject: { display: '', reference: '', type: '' },
           substitution: { reason: [], type: undefined, wasSubstituted: false },
           type: undefined,
@@ -2302,7 +2302,7 @@ describe('Util Tests', () => {
           },
           performer: undefined,
           resourceType: 'MedicationDispense',
-          status: MedicationDispenseStatus.paused,
+          status: MedicationDispenseStatus.in_progress,
           subject: { display: '', reference: '', type: '' },
           substitution: { reason: [], type: undefined, wasSubstituted: false },
           type: undefined,
@@ -2404,7 +2404,7 @@ describe('Util Tests', () => {
           },
           performer: undefined,
           resourceType: 'MedicationDispense',
-          status: MedicationDispenseStatus.paused,
+          status: MedicationDispenseStatus.in_progress,
           subject: { display: '', reference: '', type: '' },
           substitution: { reason: [], type: undefined, wasSubstituted: false },
           type: undefined,
@@ -2753,7 +2753,7 @@ describe('Util Tests', () => {
       },
       performer: undefined,
       resourceType: 'MedicationDispense',
-      status: MedicationDispenseStatus.paused,
+      status: MedicationDispenseStatus.in_progress,
       subject: { display: '', reference: '', type: '' },
       substitution: { reason: [], type: undefined, wasSubstituted: false },
       type: undefined,

diff --git a/packages/esm-medical-supply-dispensing-app/src/utils.ts b/packages/esm-medical-supply-dispensing-app/src/utils.ts
@@ -49,7 +49,7 @@ export function computeFulfillerStatus(
     return MedicationRequestFulfillerStatus.declined;
   }
 
-  if (mostRecentMedicationDispenseStatus === MedicationDispenseStatus.paused) {
+  if (mostRecentMedicationDispenseStatus === MedicationDispenseStatus.in_progress) {
     return MedicationRequestFulfillerStatus.on_hold;
   }