OH2-442 | Remove trans unit from opd context operation and update operation row form

src/components/accessories/patientOPD/patientOPDForm/PatientOPDForm.tsx

@@ -36,11 +36,11 @@ import { object, string } from "yup";
 import checkIcon from "../../../../assets/check-icon.png";
 import warningIcon from "../../../../assets/warning-icon.png";
 import { OpdWithOperationRowDTO, OperationRowDTO } from "../../../../generated";
-import { renderDate } from "../../../../libraries/formatUtils/dataFormatting";
 import {
   formatAllFieldValues,
   getFromFields,
 } from "../../../../libraries/formDataHandling/functions";
+import { renderDate } from "../../../../libraries/formatUtils/dataFormatting";
 import {
   createOperationRowReset,
   deleteOperationRow,
@@ -58,8 +58,8 @@ import { CustomDialog } from "../../customDialog/CustomDialog";
 import DateField from "../../dateField/DateField";
 import ContentCutIcon from "../../icons/content-cut";
 import InfoBox from "../../infoBox/InfoBox";
-import OperationRowForm from "../../patientOperation/operationForm/OperationRowForm";
 import { opRowFields } from "../../patientOperation/opRowFields";
+import OperationRowForm from "../../patientOperation/operationForm/OperationRowForm";
 import TextField from "../../textField/TextField";
 import "./styles.scss";
 import { TProps } from "./types";
@@ -662,6 +662,7 @@ const PatientOPDForm: FunctionComponent<TProps> = ({
         content={
           <>
             <OperationRowForm
+              opd={true}
               fields={operationsRowFields}
               onSubmit={handleAddOperationRow}
               creationMode={operationCreationMode}

src/components/accessories/patientOperation/operationForm/OperationRowForm.tsx

@@ -7,11 +7,11 @@ import { useTranslation } from "react-i18next";
 import { number, object, string } from "yup";
 import warningIcon from "../../../../assets/warning-icon.png";
 import { OperationDTO } from "../../../../generated";
-import { renderDate } from "../../../../libraries/formatUtils/dataFormatting";
 import {
   formatAllFieldValues,
   getFromFields,
 } from "../../../../libraries/formDataHandling/functions";
+import { renderDate } from "../../../../libraries/formatUtils/dataFormatting";
 import { FIELD_VALIDATION, IState } from "../../../../types";
 import AutocompleteField from "../../autocompleteField/AutocompleteField";
 import Button from "../../button/Button";
@@ -32,6 +32,7 @@ const OperationRowForm: FC<OperationRowProps> = ({
   shouldResetForm,
   resetFormCallback,
   hideResultField,
+  opd,
 }) => {
   const { t } = useTranslation();
 
@@ -82,6 +83,10 @@ const OperationRowForm: FC<OperationRowProps> = ({
         (item) => item.code === formattedValues.operation
       );
 
+      if (opd) {
+        formattedValues.transUnit = 0;
+      }
+
       onSubmit(formattedValues);
     },
   });
@@ -166,22 +171,6 @@ const OperationRowForm: FC<OperationRowProps> = ({
         >
           <div className="row start-sm center-xs">
             <div className="fullWidth patientOperationForm__item">
-              <AutocompleteField
-                fieldName="operation"
-                fieldValue={formik.values.operation}
-                label={t("operation.operation")}
-                isValid={isValid("operation")}
-                errorText={getErrorText("operation")}
-                onBlur={onBlurCallback("operation")}
-                options={renderOptions(operationList)}
-                loading={operationStatus === "LOADING"}
-                disabled={isLoading}
-              />
-            </div>
-          </div>
-
-          <div className="row start-sm center-xs">
-            <div className="patientOperationForm__item">
               <DateField
                 fieldName="opDate"
                 fieldValue={formik.values.opDate}
@@ -196,19 +185,37 @@ const OperationRowForm: FC<OperationRowProps> = ({
                 required={FIELD_VALIDATION.REQUIRED}
               />
             </div>
-            <div className="patientOperationForm__item">
-              <TextField
-                field={formik.getFieldProps("transUnit")}
-                theme="regular"
-                label={t("operation.transUnit")}
-                isValid={isValid("transUnit")}
-                errorText={getErrorText("transUnit")}
-                onBlur={formik.handleBlur}
-                type="number"
+            <div className="fullWidth patientOperationForm__item">
+              <AutocompleteField
+                fieldName="operation"
+                fieldValue={formik.values.operation}
+                label={t("operation.operation")}
+                isValid={isValid("operation")}
+                errorText={getErrorText("operation")}
+                onBlur={onBlurCallback("operation")}
+                options={renderOptions(operationList)}
+                loading={operationStatus === "LOADING"}
                 disabled={isLoading}
               />
             </div>
           </div>
+
+          <div className="row start-sm center-xs">
+            {!opd && (
+              <div className="patientOperationForm__item">
+                <TextField
+                  field={formik.getFieldProps("transUnit")}
+                  theme="regular"
+                  label={t("operation.transUnit")}
+                  isValid={isValid("transUnit")}
+                  errorText={getErrorText("transUnit")}
+                  onBlur={formik.handleBlur}
+                  type="number"
+                  disabled={isLoading}
+                />
+              </div>
+            )}
+          </div>
           {!hideResultField && (
             <div className="row start-sm center-xs">
               <div className="fullWidth patientOperationForm__item">

src/components/accessories/patientOperation/operationForm/types.ts

@@ -8,7 +8,10 @@ interface IOperationRowProps {
   resetButtonLabel: string;
   isLoading: boolean;
   shouldResetForm: boolean;
-  opdId?: number;
+  /**
+   * Set to true if the operation row is in opd context
+   */
+  opd?: boolean;
   admissionId?: number;
   creationMode: boolean;
   resetFormCallback: () => void;