@openmrs/esm-stock-management-app 1.0.1-pre.530 → 1.0.1-pre.532

package/dist/openmrs-esm-stock-management-app.js.buildmanifest.json

@@ -85,9 +85,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1736785,
+      "size": 1739723,
       "sizes": {
-        "javascript": 1736575,
+        "javascript": 1739513,
         "consume-shared": 210
       },
       "names": [],
@@ -101,7 +101,7 @@
       "auxiliaryFiles": [
         "157.js.map"
       ],
-      "hash": "b8776b32894c2d4f",
+      "hash": "bcd63c999312972c",
       "childrenByOrder": {}
     },
     {
@@ -109,10 +109,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 5405212,
+      "size": 5408150,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 5383262,
+        "javascript": 5386200,
         "share-init": 252,
         "runtime": 21446
       },
@@ -129,7 +129,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "0928e485f903a05b",
+      "hash": "e8093a2504e96a84",
       "childrenByOrder": {}
     },
     {
@@ -251,9 +251,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 10907,
+      "size": 10901,
       "sizes": {
-        "javascript": 10907
+        "javascript": 10901
       },
       "names": [],
       "idHints": [],
@@ -265,7 +265,7 @@
         "574.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "532db745e309f76a",
+      "hash": "73adef869115d16f",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.24.0"},"extensions":[{"name":"stock-nav-menu","slot":"stock-sidebar-slot","component":"stockNavMenu","online":true,"offline":true},{"name":"overview-db-link","slot":"stock-page-dashboard-slot","component":"stockOverviewLink","meta":{"name":"overview","slot":"overview-dashboard-slot","title":"overview"},"order":0,"online":true,"offline":true},{"name":"stock-overview-db","slot":"overview-dashboard-slot","component":"stockOverview"},{"name":"operations-db-link","slot":"stock-page-dashboard-slot","component":"stockOperationsLink","meta":{"name":"operations","slot":"operations-dashboard-slot","title":"operations"},"order":2,"online":true,"offline":true},{"name":"stock-operations-db","slot":"operations-dashboard-slot","component":"stockOperations"},{"name":"items-db-link","slot":"stock-page-dashboard-slot","component":"stockItemsLink","meta":{"name":"items","slot":"items-dashboard-slot","title":"items"},"order":1,"online":true,"offline":true},{"name":"stock-items-db","slot":"items-dashboard-slot","component":"stockItems"},{"name":"user-scopes-db-link","slot":"stock-page-dashboard-slot","component":"stockUserScopesLink","meta":{"name":"user-scopes","slot":"user-scopes-dashboard-slot","title":"user-scopes"},"order":3,"online":true,"offline":true},{"name":"stock-user-scopes-db","slot":"user-scopes-dashboard-slot","component":"stockUserScopes"},{"name":"sources-db-link","slot":"stock-page-dashboard-slot","component":"stockSourcesLink","meta":{"name":"sources","slot":"sources-dashboard-slot","title":"Sources"},"order":2,"online":true,"offline":true},{"name":"stock-sources-db","slot":"sources-dashboard-slot","component":"stockSources"},{"name":"locations-db-link","slot":"stock-page-dashboard-slot","component":"stockLocationsLink","meta":{"name":"locations","slot":"locations-dashboard-slot","title":"Locations"},"order":4,"online":true,"offline":true},{"name":"stock-locations-db","slot":"locations-dashboard-slot","component":"stockLocations"},{"name":"reports-db-link","slot":"stock-page-dashboard-slot","component":"stockReportsLink","meta":{"name":"reports","slot":"reports-dashboard-slot","title":"Reports"},"order":5,"online":true,"offline":true},{"name":"stock-reports-db","slot":"reports-dashboard-slot","component":"stockReports"},{"name":"settings-db-link","slot":"stock-page-dashboard-slot","component":"stockSettingsLink","meta":{"name":"settings","slot":"settings-dashboard-slot","title":"Settings"},"order":6,"online":true,"offline":true},{"name":"stock-settings-db","slot":"settings-dashboard-slot","component":"stockSettings"},{"name":"stock-management-admin-card-link","slot":"system-admin-page-card-link-slot","component":"stockManagementAdminCardLink"},{"name":"stock-operation-dialog","component":"stockOperationDialog"},{"name":"import-bulk-stock-items","component":"importBulkStockItemsDialog"},{"name":"delete-stock-modal","component":"deleteStockModal"},{"name":"delete-stock-user-scope-modal","component":"deleteUserScopeModal"},{"name":"stock-management-app-menu-item","component":"stockManagementAppMenuItem","slot":"app-menu-item-slot","meta":{"name":" Stock Management"}},{"name":"delete-stock-rule-modal","component":"deleteStockRuleModal"},{"name":"delete-packaging-unit-modal","component":"deletePackagingUnitModal"},{"name":"delete-packaging-unit-button","component":"deletePackagingUnitButton"}],"pages":[{"component":"root","route":"stock-management"}],"version":"1.0.1-pre.530"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.24.0"},"extensions":[{"name":"stock-nav-menu","slot":"stock-sidebar-slot","component":"stockNavMenu","online":true,"offline":true},{"name":"overview-db-link","slot":"stock-page-dashboard-slot","component":"stockOverviewLink","meta":{"name":"overview","slot":"overview-dashboard-slot","title":"overview"},"order":0,"online":true,"offline":true},{"name":"stock-overview-db","slot":"overview-dashboard-slot","component":"stockOverview"},{"name":"operations-db-link","slot":"stock-page-dashboard-slot","component":"stockOperationsLink","meta":{"name":"operations","slot":"operations-dashboard-slot","title":"operations"},"order":2,"online":true,"offline":true},{"name":"stock-operations-db","slot":"operations-dashboard-slot","component":"stockOperations"},{"name":"items-db-link","slot":"stock-page-dashboard-slot","component":"stockItemsLink","meta":{"name":"items","slot":"items-dashboard-slot","title":"items"},"order":1,"online":true,"offline":true},{"name":"stock-items-db","slot":"items-dashboard-slot","component":"stockItems"},{"name":"user-scopes-db-link","slot":"stock-page-dashboard-slot","component":"stockUserScopesLink","meta":{"name":"user-scopes","slot":"user-scopes-dashboard-slot","title":"user-scopes"},"order":3,"online":true,"offline":true},{"name":"stock-user-scopes-db","slot":"user-scopes-dashboard-slot","component":"stockUserScopes"},{"name":"sources-db-link","slot":"stock-page-dashboard-slot","component":"stockSourcesLink","meta":{"name":"sources","slot":"sources-dashboard-slot","title":"Sources"},"order":2,"online":true,"offline":true},{"name":"stock-sources-db","slot":"sources-dashboard-slot","component":"stockSources"},{"name":"locations-db-link","slot":"stock-page-dashboard-slot","component":"stockLocationsLink","meta":{"name":"locations","slot":"locations-dashboard-slot","title":"Locations"},"order":4,"online":true,"offline":true},{"name":"stock-locations-db","slot":"locations-dashboard-slot","component":"stockLocations"},{"name":"reports-db-link","slot":"stock-page-dashboard-slot","component":"stockReportsLink","meta":{"name":"reports","slot":"reports-dashboard-slot","title":"Reports"},"order":5,"online":true,"offline":true},{"name":"stock-reports-db","slot":"reports-dashboard-slot","component":"stockReports"},{"name":"settings-db-link","slot":"stock-page-dashboard-slot","component":"stockSettingsLink","meta":{"name":"settings","slot":"settings-dashboard-slot","title":"Settings"},"order":6,"online":true,"offline":true},{"name":"stock-settings-db","slot":"settings-dashboard-slot","component":"stockSettings"},{"name":"stock-management-admin-card-link","slot":"system-admin-page-card-link-slot","component":"stockManagementAdminCardLink"},{"name":"stock-operation-dialog","component":"stockOperationDialog"},{"name":"import-bulk-stock-items","component":"importBulkStockItemsDialog"},{"name":"delete-stock-modal","component":"deleteStockModal"},{"name":"delete-stock-user-scope-modal","component":"deleteUserScopeModal"},{"name":"stock-management-app-menu-item","component":"stockManagementAppMenuItem","slot":"app-menu-item-slot","meta":{"name":" Stock Management"}},{"name":"delete-stock-rule-modal","component":"deleteStockRuleModal"},{"name":"delete-packaging-unit-modal","component":"deletePackagingUnitModal"},{"name":"delete-packaging-unit-button","component":"deletePackagingUnitButton"}],"pages":[{"component":"root","route":"stock-management"}],"version":"1.0.1-pre.532"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-stock-management-app",
-  "version": "1.0.1-pre.530",
+  "version": "1.0.1-pre.532",
   "license": "MPL-2.0",
   "description": "Stock management microfrontend for OpenMRS 3.x",
   "browser": "dist/openmrs-esm-stock-management-app.js",

package/src/stock-operations/add-stock-operation/add-stock-operation.component.tsx

@@ -182,9 +182,6 @@ const AddStockOperation: React.FC<AddStockOperationProps> = (props) => {
               : result.requiresDispatchAcknowledgement
           }
           actions={{
-            onGoBack: () => {
-              setSelectedIndex(1);
-            },
             onSave: async (model) => {
               // TODO: Update
               await addOrEditStockOperation(
@@ -196,15 +193,17 @@ const AddStockOperation: React.FC<AddStockOperationProps> = (props) => {
                 props.canPrint
               );
             },
-
+            onGoBack: () => {
+              setSelectedIndex(1);
+            },
             onComplete: async () => {
-              await showActionDialogButton("Complete", false, props?.model);
+              await showActionDialogButton("Complete", true, props?.model);
             },
             onSubmit: async () => {
-              await showActionDialogButton("Submit", false, props?.model);
+              await showActionDialogButton("Submit", true, props?.model);
             },
             onDispatch: async () => {
-              await showActionDialogButton("Dispatch", false, props?.model);
+              await showActionDialogButton("Dispatch", true, props?.model);
             },
           }}
         />
@@ -506,7 +505,6 @@ const AddStockOperation: React.FC<AddStockOperationProps> = (props) => {
                       <div style={{ margin: "2px" }}>
                         <StockOperationCompleteDispatchButton
                           operation={props?.model}
-                          reason={false}
                         />
                       </div>
                       <div style={{ margin: "2px" }}>

package/src/stock-operations/add-stock-operation/stock-operation-submission.component.tsx

@@ -50,7 +50,7 @@ const StockOperationSubmission: React.FC<StockOperationSubmissionProps> = ({
   const { t } = useTranslation();
   const [isSaving, setIsSaving] = useState(false);
   const [approvalRequired, setApprovalRequired] = useState<boolean | null>(
-    model?.approvalRequired
+    null
   );
 
   const handleRadioButtonChange = (selectedItem: boolean) => {
@@ -68,7 +68,7 @@ const StockOperationSubmission: React.FC<StockOperationSubmissionProps> = ({
               "Does the transaction require approval ?"
             )}
             onChange={handleRadioButtonChange}
-            defaultSelected={model?.approvalRequired}
+            defaultSelected={approvalRequired}
           >
             <RadioButton
               value={true}
@@ -111,10 +111,15 @@ const StockOperationSubmission: React.FC<StockOperationSubmissionProps> = ({
                   kind="primary"
                   onClick={async () => {
                     delete model?.dateCreated;
-                    model.status = "COMPLETED";
+                    delete model?.status;
                     setIsSaving(true);
-                    await actions.onComplete(model);
-                    setIsSaving(false);
+                    await actions.onSave(model).then(() => {
+                      delete model?.dateCreated;
+                      model.status = "COMPLETED";
+                      setIsSaving(true);
+                      actions.onComplete(model);
+                      setIsSaving(false);
+                    });
                   }}
                   renderIcon={ListChecked}
                 >
@@ -132,9 +137,13 @@ const StockOperationSubmission: React.FC<StockOperationSubmissionProps> = ({
                     delete model?.dateCreated;
                     delete model?.status;
                     setIsSaving(true);
-                    model.status = "DISPATCHED";
-                    await actions.onDispatch(model);
-                    setIsSaving(false);
+                    await actions.onSave(model).then(() => {
+                      delete model?.dateCreated;
+                      model.status = "COMPLETED";
+                      setIsSaving(true);
+                      actions.onDispatch(model);
+                      setIsSaving(false);
+                    });
                   }}
                   renderIcon={Departure}
                 >
@@ -151,7 +160,7 @@ const StockOperationSubmission: React.FC<StockOperationSubmissionProps> = ({
                   onClick={actions.onSubmit}
                   renderIcon={SendFilled}
                 >
-                  {t("submitForReview", "Submit For Review")}
+                  {t("submit", "Submit For Review")}
                 </Button>
               )}
             </>
@@ -166,7 +175,6 @@ const StockOperationSubmission: React.FC<StockOperationSubmissionProps> = ({
               delete model?.dateCreated;
               delete model?.status;
               setIsSaving(true);
-              model.approvalRequired = approvalRequired ? true : false;
               await actions.onSave(model);
               setIsSaving(false);
             }}

package/src/stock-operations/stock-operations-dialog/stock-operations-complete-button.component.tsx

@@ -8,18 +8,17 @@ import { StockOperationDTO } from "../../core/api/types/stockOperation/StockOper
 
 interface StockOperationCompleteButtonProps {
   operation: StockOperationDTO;
-  reason: boolean;
 }
 
 const StockOperationCompleteButton: React.FC<
   StockOperationCompleteButtonProps
-> = ({ operation, reason }) => {
+> = ({ operation }) => {
   const { t } = useTranslation();
   const launchCompleteModal = useCallback(() => {
     const dispose = showModal("stock-operation-dialog", {
       title: "Complete",
       operation: operation,
-      requireReason: reason,
+      requireReason: true,
       closeModal: () => dispose(),
     });
   }, [operation]);

package/src/stock-operations/stock-operations-dialog/stock-operations-completed-dispatch-button.component.tsx

@@ -8,18 +8,17 @@ import { StockOperationDTO } from "../../core/api/types/stockOperation/StockOper
 
 interface StockOperationCompleteDispatchButtonProps {
   operation: StockOperationDTO;
-  reason: boolean;
 }
 
 const StockOperationCompleteDispatchButton: React.FC<
   StockOperationCompleteDispatchButtonProps
-> = ({ operation, reason }) => {
+> = ({ operation }) => {
   const { t } = useTranslation();
   const launchcompletedDispatchModal = useCallback(() => {
     const dispose = showModal("stock-operation-dialog", {
       title: "Complete Dispatch",
       operation: operation,
-      requireReason: reason,
+      requireReason: false,
       closeModal: () => dispose(),
     });
   }, [operation]);

package/src/stock-operations/stock-operations-table.component.tsx

@@ -24,14 +24,14 @@ import {
   StructuredListRow,
   StructuredListCell,
   StructuredListBody,
+  OverflowMenu,
+  OverflowMenuItem,
   DatePickerInput,
   DatePicker,
   TableToolbarMenu,
   TableToolbarAction,
-  Button,
 } from "@carbon/react";
-import { ArrowRight, Edit } from "@carbon/react/icons";
-
+import { ArrowRight } from "@carbon/react/icons";
 import { formatDisplayDate } from "../core/utils/datetimeUtils";
 import styles from "../stock-items/stock-items-table.scss";
 import {
@@ -341,22 +341,22 @@ const StockOperations: React.FC<StockOperationsTableProps> = () => {
         </div>
       ),
       actions: (
-        <Button
-          kind="ghost"
-          size="md"
-          onClick={() => {
-            launchAddOrEditDialog(
-              t,
-              filteredItems[index],
-              true,
-              operation,
-              operations,
-              false
-            );
-          }}
-          iconDescription={t("editStockItem", "Edit Stock Item")}
-          renderIcon={(props) => <Edit size={16} {...props} />}
-        ></Button>
+        <OverflowMenu flipped={"true"} aria-label="overflow-menu">
+          <OverflowMenuItem itemText="Complete" onClick={handleOnComplete} />
+          <OverflowMenuItem
+            itemText="Edit"
+            onClick={() => {
+              launchAddOrEditDialog(
+                t,
+                filteredItems[index],
+                true,
+                operation,
+                operations,
+                false
+              );
+            }}
+          />
+        </OverflowMenu>
       ),
     }));
   }, [handleOnComplete, filteredItems, operation, operations, t]);
@@ -522,6 +522,10 @@ const StockOperations: React.FC<StockOperationsTableProps> = () => {
                               <StructuredListCell head>
                                 {t("dateCompleted", "Date Completed")}
                               </StructuredListCell>
+                              <StructuredListCell head>
+                                {t("batchNumber", "Batch Number")}
+                              </StructuredListCell>
+                              <StructuredListCell head>Qty</StructuredListCell>
                             </StructuredListRow>
                           </StructuredListHead>
                           <StructuredListBody>
@@ -554,6 +558,24 @@ const StockOperations: React.FC<StockOperationsTableProps> = () => {
                                   ? filteredItems[index]?.creatorFamilyName
                                   : ""}
                               </StructuredListCell>
+                              <StructuredListCell>
+                                {filteredItems[index]?.stockOperationItems
+                                  ? filteredItems[
+                                      index
+                                    ].stockOperationItems?.map(
+                                      (item) => item.batchNo
+                                    )[0]
+                                  : ""}
+                              </StructuredListCell>
+                              <StructuredListCell>
+                                {filteredItems[index]?.stockOperationItems
+                                  ? filteredItems[
+                                      index
+                                    ].stockOperationItems?.map(
+                                      (item) => item.quantity
+                                    )[0]
+                                  : ""}
+                              </StructuredListCell>
                             </StructuredListRow>
                             <StructuredListRow>
                               <StructuredListCell noWrap>
@@ -598,6 +620,24 @@ const StockOperations: React.FC<StockOperationsTableProps> = () => {
                                   ? items[index]?.creatorFamilyName
                                   : ""}
                               </StructuredListCell>
+                              <StructuredListCell>
+                                {filteredItems[index]?.stockOperationItems
+                                  ? filteredItems[
+                                      index
+                                    ].stockOperationItems?.map(
+                                      (item) => item.batchNo
+                                    )[1]
+                                  : ""}
+                              </StructuredListCell>
+                              <StructuredListCell>
+                                {filteredItems[index]?.stockOperationItems
+                                  ? filteredItems[
+                                      index
+                                    ].stockOperationItems?.map(
+                                      (item) => item.quantity
+                                    )[1]
+                                  : ""}
+                              </StructuredListCell>
                             </StructuredListRow>
                           </StructuredListBody>
                         </>

package/translations/en.json

@@ -52,8 +52,8 @@
   "code": "Code",
   "comingSoonUnderDev": "Exciting updates are on the way! In the meantime, use the link below to access Admin UI settings.",
   "commonName": "Common Name",
-  "completedispatch": "Complete Dispatch ",
-  "complete": "Complete",
+  "complete": "Complete Dispatch ",
+  "completed": "Completed",
   "continue": "Continue",
   "created": "Created",
   "createLocation": "Create Location",