U4X-288 : Approval for stock operation fails on the UI Operations sta…

…tus are not completed (#50) * edit oparations setup * fix : show items list on edit * ft : set edit values * fix : canEdit check * ft : add approval button setup * ft : add print setup * ft : stock approval setup * ft : approval button setups * fix : update button display * ft : close overlay and modal * fix : add operation type * fix : ui * its * fix build
openmrs · Dec 20, 2023 · 46d1aec · 46d1aec
1 parent 1df1e47
commit 46d1aec
Show file tree

Hide file tree

Showing 24 changed files with 1,135 additions and 340 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -30,6 +30,14 @@ export const stockManagementDashboard = getAsyncLifecycle(
   options
 );
 
+export const stockOperationDialog = getAsyncLifecycle(
+  () =>
+    import(
+      "./stock-operations/stock-operations-dialog/stock-operations-dialog.component"
+    ),
+  options
+);
+
 export function startupApp() {
   defineConfigSchema(moduleName, configSchema);
 }
diff --git a/src/routes.json b/src/routes.json
@@ -14,6 +14,10 @@
       "name": "stock-management-admin-card-link",
       "slot": "system-admin-page-card-link-slot",
       "component": "stockManagementAdminCardLink"
+    },
+    {
+      "name": "stock-operation-dialog",
+      "component": "stockOperationDialog"
     }
   ],
   "pages": [

diff --git a/src/stock-items/add-stock-item/stock-item-details/stock-item-details.component.tsx b/src/stock-items/add-stock-item/stock-item-details/stock-item-details.component.tsx
@@ -83,8 +83,8 @@ const StockItemDetails = forwardRef<never, StockItemDetailsProps>(
             }}
             name="isDrug"
           >
-            <RadioButton value={true} id="isDrug-true" labelText="Drug" />
-            <RadioButton value={false} id="isDrug-false" labelText="Other" />
+            <RadioButton value={isDrug} id="isDrug-true" labelText="Drug" />
+            <RadioButton value={isDrug} id="isDrug-false" labelText="Other" />
           </ControlledRadioButtonGroup>
         </FormGroup>
         {isDrug && (

diff --git a/src/stock-operations/add-stock-operation/add-stock-operation.component.tsx b/src/stock-operations/add-stock-operation/add-stock-operation.component.tsx
@@ -10,17 +10,56 @@ import { useInitializeStockOperations } from "./add-stock-operation.resource";
 import { AccordionSkeleton } from "@carbon/react";
 import { closeOverlay } from "../../core/components/overlay/hook";
 import { addOrEditStockOperation } from "../stock-operation.utils";
+import StockOperationApprovalButton from "../stock-operations-dialog/stock-operations-approve-button.component";
+import StockOperationRejectButton from "../stock-operations-dialog/stock-operations-reject-button.component";
+import StockOperationReturnButton from "../stock-operations-dialog/stock-operations-return-button.component";
+import StockOperationCancelButton from "../stock-operations-dialog/stock-operations-cancel-button.component";
+import StockOperationPrintButton from "../stock-operations-dialog/stock-operations-print-button.component";
+import StockOperationApproveDispatchButton from "../stock-operations-dialog/stock-operations-approve-dispatch-button.component";
+import StockOperationCompleteDispatchButton from "../stock-operations-dialog/stock-operations-completed-dispatch-button.component";
+import StockOperationIssueStockButton from "../stock-operations-dialog/stock-operations-issue-stock-button.component";
+import {
+  OperationType,
+  StockOperationType,
+  StockOperationTypeCanCapturePurchasePrice,
+  StockOperationTypeIsNegativeQtyAllowed,
+  StockOperationTypeIsQuantityOptional,
+  StockOperationTypeRequiresActualBatchInformation,
+  StockOperationTypeRequiresBatchUuid,
+  StockOperationTypeRequiresDispatchAcknowledgement,
+  StockOperationTypeRequiresStockAdjustmentReason,
+  operationFromString,
+} from "../../core/api/types/stockOperation/StockOperationType";
 
 const AddStockOperation: React.FC<AddStockOperationProps> = (props) => {
   const { t } = useTranslation();
   const { isLoading, isError, result } = useInitializeStockOperations(props);
-  const [isEditing, setIsEditing] = useState(props.isEditing);
-  const [manageStockItems, setManageStockItems] = useState(props.isEditing);
+  const [canPrint, setCanPrint] = useState(props?.canPrint);
+  const [canEdit, setCanEdit] = useState(props?.canEdit);
+
+  const [isEditing, setIsEditing] = useState<boolean>(props?.isEditing);
+  const [manageStockItems, setManageStockItems] = useState(props?.isEditing);
   const [manageSubmitOrComplete, setManageSubmitOrComplete] = useState(
     props.isEditing
   );
   const [selectedIndex, setSelectedIndex] = useState(0);
 
+  const [stockOperationType, setStockOperationType] = useState<
+    StockOperationType | null | undefined
+  >(null);
+  const [isNegativeQtyAllowed, setIsNegativeQtyAllowed] = useState(false);
+  const [requiresBatchUuid, setRequiresBatchUuid] = useState(false);
+  const [requiresActualBatchInformation, setRequiresActualBatchInformation] =
+    useState(false);
+  const [isQuantityOptional, setIsQuantityOptional] = useState(false);
+  const [canCapturePurchasePrice, setCanCapturePurchasePrice] = useState(false);
+  const [requireStockAdjustmentReason, setRequireStockAdjustmentReason] =
+    useState(false);
+  const [requiresDispatchAcknowledgement, setRequiresDispatchAcknowledgement] =
+    useState(false);
+  const [allowExpiredBatchNumbers, setAllowExpiredBatchNumbers] =
+    useState(false);
+
   if (isLoading) return <AccordionSkeleton />;
   if (isError) {
     closeOverlay();
@@ -30,12 +69,16 @@ const AddStockOperation: React.FC<AddStockOperationProps> = (props) => {
 
   const tabs: TabItem[] = [
     {
-      name: `${props.operation.name} Details`,
+      name: isEditing
+        ? `${props.model.operationTypeName} Details`
+        : `${props.operation.name} Details`,
       component: (
         <BaseOperationDetails
           {...props}
+          isEditing={isEditing}
           setup={result}
-          model={result?.dto}
+          canEdit={canEdit}
+          model={isEditing ? props?.model : result.dto}
           onSave={async () => {
             setManageStockItems(true);
             setSelectedIndex(1);
@@ -48,8 +91,10 @@ const AddStockOperation: React.FC<AddStockOperationProps> = (props) => {
       component: (
         <StockItemsAddition
           {...props}
+          isEditing={isEditing}
           setup={result}
-          model={result?.dto}
+          canEdit={canEdit}
+          model={isEditing ? props?.model : result.dto}
           onSave={async () => {
             setManageSubmitOrComplete(true);
             setSelectedIndex(2);
@@ -65,16 +110,21 @@ const AddStockOperation: React.FC<AddStockOperationProps> = (props) => {
       component: (
         <StockOperationSubmission
           {...props}
+          isEditing={isEditing}
           setup={result}
-          model={result?.dto}
+          canEdit={canEdit}
+          locked={false}
+          model={isEditing ? props?.model : result.dto}
+          requiresDispatchAcknowledgement={false}
           actions={{
             onSave: async (model) => {
               // TODO: Update
               await addOrEditStockOperation(
                 model,
-                props.operation,
                 props.isEditing,
-                props.operations
+                props.operation,
+                props.operations,
+                props.canPrint
               );
             },
             onGoBack: () => {
@@ -96,12 +146,171 @@ const AddStockOperation: React.FC<AddStockOperationProps> = (props) => {
     },
   ];
 
+  // const currentStockOperationType = props.operations?.find(
+  //   (p) => p.uuid === props.operation?.uuid
+  // );
+
+  // console.info("data operations-->", props);
+
+  // console.info("data-->", currentStockOperationType);
+  // const operationType: OperationType = operationFromString(
+  //   currentStockOperationType?.operationType ?? ""
+  // );
+
+  // setStockOperationType(currentStockOperationType);
+  // setIsNegativeQtyAllowed(
+  //   StockOperationTypeIsNegativeQtyAllowed(operationType)
+  // );
+  // setRequiresBatchUuid(StockOperationTypeRequiresBatchUuid(operationType));
+  // setRequiresActualBatchInformation(
+  //   StockOperationTypeRequiresActualBatchInformation(operationType)
+  // );
+  // setIsQuantityOptional(StockOperationTypeIsQuantityOptional(operationType));
+  // setCanCapturePurchasePrice(
+  //   StockOperationTypeCanCapturePurchasePrice(operationType)
+  // );
+  // setRequireStockAdjustmentReason(
+  //   StockOperationTypeRequiresStockAdjustmentReason(operationType)
+  // );
+  // setRequiresDispatchAcknowledgement(
+  //   StockOperationTypeRequiresDispatchAcknowledgement(operationType)
+  // );
+  // setAllowExpiredBatchNumbers(
+  //   currentStockOperationType?.allowExpiredBatchNumbers ?? false
+  // );
+
   return (
-    <VerticalTabs
-      tabs={tabs}
-      selectedIndex={selectedIndex}
-      onChange={setSelectedIndex}
-    />
+    <>
+      <div
+        style={{
+          display: "flex",
+          justifyContent: "space-between",
+          margin: "5px",
+        }}
+      >
+        <div style={{ margin: "10px" }}>
+          <div style={{ display: "flex", flexDirection: "row" }}>
+            <span style={{ margin: "4px" }}>Status :</span>
+            <span style={{ margin: "4px" }}>{props.model.status}</span>
+          </div>
+
+          <div style={{ display: "flex", flexDirection: "row" }}>
+            {props.model.status === "NEW" && (
+              <div style={{ margin: "4px" }}>
+                <span>Started : </span>
+                <span>By </span>
+                <span>
+                  {props.model.creatorFamilyName} {""}
+                  {props.model.creatorGivenName}
+                </span>
+              </div>
+            )}
+            {props.model.status === "SUBMITTED" && (
+              <div style={{ margin: "4px" }}>
+                <span>Submitted : </span>
+                <span>By </span>
+                <span>
+                  {props.model.submittedByFamilyName} {""}
+                  {props.model.submittedByGivenName}
+                </span>
+              </div>
+            )}
+            {props.model.status === "COMPLETED" && (
+              <div style={{ margin: "4px" }}>
+                <span>Completed : </span>
+                <span>By </span>
+                <span>
+                  {props.model.completedByFamilyName} {""}
+                  {props.model.completedByGivenName}
+                </span>
+              </div>
+            )}
+          </div>
+        </div>
+
+        {((!props.model?.permission?.canEdit &&
+          (props.model?.permission?.canApprove ||
+            props.model?.permission?.canReceiveItems)) ||
+          props.model?.permission?.canEdit ||
+          canPrint ||
+          props.model?.permission?.isRequisitionAndCanIssueStock) && (
+          <div
+            style={{
+              margin: "10px",
+              display: "flex",
+              flexDirection: "row",
+            }}
+          >
+            <>
+              {!props.model?.permission?.canEdit &&
+                props.model?.permission?.canApprove && (
+                  <>
+                    {!requiresDispatchAcknowledgement && (
+                      <div style={{ margin: "2px" }}>
+                        <StockOperationApprovalButton operation={props.model} />
+                      </div>
+                    )}
+                    {requiresDispatchAcknowledgement && (
+                      <div style={{ margin: "2px" }}>
+                        <StockOperationApproveDispatchButton
+                          operation={props.model}
+                        />
+                      </div>
+                    )}
+
+                    <div style={{ margin: "2px" }}>
+                      <StockOperationRejectButton operation={props.model} />
+                    </div>
+                    <div style={{ margin: "2px" }}>
+                      <StockOperationReturnButton operation={props.model} />
+                    </div>
+                    <div style={{ margin: "2px" }}>
+                      <StockOperationCancelButton operation={props.model} />
+                    </div>
+                  </>
+                )}
+
+              {!props.model?.permission?.canEdit &&
+                props.model?.permission?.canReceiveItems && (
+                  <>
+                    <div style={{ margin: "2px" }}>
+                      <StockOperationCompleteDispatchButton
+                        operation={props.model}
+                      />
+                    </div>
+                    <div style={{ margin: "2px" }}>
+                      <StockOperationReturnButton operation={props.model} />
+                    </div>
+                  </>
+                )}
+
+              {props.model?.permission?.canEdit && (
+                <div style={{ margin: "2px" }}>
+                  <StockOperationCancelButton operation={props.model} />
+                </div>
+              )}
+
+              {props.model?.permission?.isRequisitionAndCanIssueStock && (
+                <div style={{ margin: "2px" }}>
+                  <StockOperationIssueStockButton operation={props.model} />
+                </div>
+              )}
+
+              {canPrint && (
+                <div style={{ margin: "2px" }}>
+                  <StockOperationPrintButton operation={props.model} />
+                </div>
+              )}
+            </>
+          </div>
+        )}
+      </div>
+      <VerticalTabs
+        tabs={tabs}
+        selectedIndex={selectedIndex}
+        onChange={setSelectedIndex}
+      />
+    </>
   );
 };