Merge branch 'O3-3557-2' into fix-dispensing-module

openmrs · Jul 18, 2024 · 810ec0d · 810ec0d
2 parents b5b5eff + c01e083
commit 810ec0d
Show file tree

Hide file tree

Showing 5 changed files with 1,769 additions and 791 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -7,6 +7,7 @@ module.exports = {
     '@openmrs/esm-framework': '@openmrs/esm-framework/mock',
     '\\.(s?css)$': 'identity-obj-proxy',
     '^lodash-es/(.*)$': 'lodash/$1',
+    '^lodash-es$': 'lodash',
     '^uuid$': '<rootDir>/node_modules/uuid/dist/index.js',
     dexie: require.resolve('dexie'),
   },

diff --git a/src/declarations.d.tsx b/src/declarations.d.tsx
@@ -2,4 +2,4 @@ declare module '*.css';
 declare module '*.scss';
 declare module '*.svg';
 declare module '@carbon/react';
-declare type SideNavProps = {};
+
diff --git a/src/forms/dispense-form.component.tsx b/src/forms/dispense-form.component.tsx
@@ -64,6 +64,11 @@ const DispenseForm: React.FC<DispenseFormProps> = ({
   // to prevent duplicate submits
   const [isSubmitting, setIsSubmitting] = useState(false);
 
+  //track quantity to dispense
+  const [currentQuantity, setCurrentQuantity] = useState(
+    quantityRemaining ? quantityRemaining : medicationDispense?.quantity?.value,
+  );
+
   // Submit medication dispense form
   const handleSubmit = () => {
     if (!isSubmitting) {
@@ -165,6 +170,10 @@ const DispenseForm: React.FC<DispenseFormProps> = ({
     }
   };
 
+  const setAvailableQuantity = (batch) => {
+    setCurrentQuantity(Number(batch.quantity));
+  };
+
   // initialize the internal dispense payload with the dispenses passed in as props
   useEffect(() => setMedicationDispensePayload(medicationDispense), [medicationDispense]);
 
@@ -209,13 +218,14 @@ const DispenseForm: React.FC<DispenseFormProps> = ({
               <MedicationDispenseReview
                 medicationDispense={medicationDispensePayload}
                 updateMedicationDispense={setMedicationDispensePayload}
-                quantityRemaining={quantityRemaining}
+                quantityRemaining={currentQuantity}
               />
               {config.enableStockDispense && (
                 <StockDispense
                   inventoryItem={inventoryItem}
                   medicationDispense={medicationDispense}
                   updateInventoryItem={setInventoryItem}
+                  updateAvailableQuantityToMedicationDispenseQuantity={setAvailableQuantity}
                 />
               )}
             </div>

diff --git a/src/forms/stock-dispense/stock-dispense.component.tsx b/src/forms/stock-dispense/stock-dispense.component.tsx
@@ -9,9 +9,14 @@ type StockDispenseProps = {
   medicationDispense: MedicationDispense;
   updateInventoryItem: (inventoryItem: InventoryItem) => void;
   inventoryItem: InventoryItem;
+  updateAvailableQuantityToMedicationDispenseQuantity: (inventoryItem: InventoryItem) => void;
 };
 
-const StockDispense: React.FC<StockDispenseProps> = ({ medicationDispense, updateInventoryItem }) => {
+const StockDispense: React.FC<StockDispenseProps> = ({
+  medicationDispense,
+  updateInventoryItem,
+  updateAvailableQuantityToMedicationDispenseQuantity,
+}) => {
   const { t } = useTranslation();
   const drugUuid = medicationDispense?.medicationReference?.reference?.split('/')[1];
   const { inventoryItems, error, isLoading } = useDispenseStock(drugUuid);