6180 prescribed quantity

client/packages/common/src/intl/locales/en/common.json

@@ -942,6 +942,7 @@
   "label.picked": "Picked",
   "label.placeholder": "Placeholder",
   "label.prescription-date": "Prescription Date",
+  "label.prescribed-quantity": "Prescribed Quantity",
   "label.previous-encounters": "Previous Encounters",
   "label.prescriber": "Prescriber",
   "label.pricing": "Pricing",

client/packages/common/src/types/schema.ts

@@ -2949,6 +2949,7 @@ export type InsertPrescriptionLineInput = {
   invoiceId: Scalars['String']['input'];
   note?: InputMaybe<Scalars['String']['input']>;
   numberOfPacks: Scalars['Float']['input'];
+  prescribedQuantity?: InputMaybe<Scalars['Float']['input']>;
   stockLineId: Scalars['String']['input'];
 };
 
@@ -3424,6 +3425,7 @@ export type InvoiceLineNode = {
   note?: Maybe<Scalars['String']['output']>;
   numberOfPacks: Scalars['Float']['output'];
   packSize: Scalars['Float']['output'];
+  prescribedQuantity?: Maybe<Scalars['Float']['output']>;
   pricing: PricingNode;
   returnReason?: Maybe<ReturnReasonNode>;
   returnReasonId?: Maybe<Scalars['String']['output']>;
@@ -8264,6 +8266,7 @@ export type UpdateOutboundShipmentLineErrorInterface = {
 export type UpdateOutboundShipmentLineInput = {
   id: Scalars['String']['input'];
   numberOfPacks?: InputMaybe<Scalars['Float']['input']>;
+  prescribedQuantity?: InputMaybe<Scalars['Float']['input']>;
   stockLineId?: InputMaybe<Scalars['String']['input']>;
   tax?: InputMaybe<TaxInput>;
 };
@@ -8416,6 +8419,7 @@ export type UpdatePrescriptionLineInput = {
   id: Scalars['String']['input'];
   note?: InputMaybe<Scalars['String']['input']>;
   numberOfPacks?: InputMaybe<Scalars['Float']['input']>;
+  prescribedQuantity?: InputMaybe<Scalars['Float']['input']>;
   stockLineId?: InputMaybe<Scalars['String']['input']>;
 };
 

client/packages/invoices/src/OutboundShipment/DetailView/OutboundLineEdit/OutboundLineEdit.tsx

@@ -145,7 +145,7 @@ export const OutboundLineEdit: React.FC<ItemDetailsModalProps> = ({
     const newAllocateQuantities = allocateQuantities(
       status,
       draftStockOutLines
-    )(newVal, packSize);
+    )(newVal, packSize, undefined, null);
     setIsDirty(true);
     setDraftStockOutLines(newAllocateQuantities ?? draftStockOutLines);
     setIsAutoAllocated(autoAllocated);

client/packages/invoices/src/OutboundShipment/DetailView/OutboundServiceLineEdit/useDraftServiceLines.ts

@@ -28,6 +28,7 @@ const createDraftLine = ({
   totalAfterTax: 0,
   totalBeforeTax: 0,
   numberOfPacks: 0,
+  prescribedQuantity: 0,
   packSize: 0,
   sellPricePerPack: 0,
   note: '',

client/packages/invoices/src/Prescriptions/LineEditView/PrescriptionLineEdit.tsx

@@ -41,7 +41,7 @@ export const PrescriptionLineEdit: React.FC<PrescriptionLineEditProps> = ({
     isDisabled,
   } = usePrescription();
   const { status = InvoiceNodeStatus.New, prescriptionDate } = data ?? {};
-  const { updateQuantity, isLoading, updateNotes } = useDraftPrescriptionLines(
+  const { isLoading, updateQuantity, updateNotes } = useDraftPrescriptionLines(
     currentItem,
     draftPrescriptionLines,
     updateLines,
@@ -65,12 +65,13 @@ export const PrescriptionLineEdit: React.FC<PrescriptionLineEditProps> = ({
   const onAllocate = (
     numPacks: number,
     packSize: number | null,
-    autoAllocated = false
+    autoAllocated = false,
+    prescribedQuantity: number | null
   ) => {
     const newAllocateQuantities = allocateQuantities(
       status,
       draftPrescriptionLines
-    )(numPacks, packSize, true);
+    )(numPacks, packSize, true, prescribedQuantity);
 
     // Don't make saveable (isDirty) if item is new and has no auto-allocatable
     // stock

client/packages/invoices/src/Prescriptions/LineEditView/PrescriptionLineEditForm.tsx

@@ -43,7 +43,8 @@ interface PrescriptionLineEditFormProps {
   onChangeQuantity: (
     quantity: number,
     packSize: number | null,
-    isAutoAllocated: boolean
+    isAutoAllocated: boolean,
+    prescribedQuantity: number | null
   ) => DraftStockOutLine[] | undefined;
   packSizeController: PackSizeController;
   disabled: boolean;
@@ -82,21 +83,28 @@ export const PrescriptionLineEditForm: React.FC<
   programId,
 }) => {
   const t = useTranslation();
-  const [allocationAlerts, setAllocationAlerts] = useState<StockOutAlert[]>([]);
-  const [issueUnitQuantity, setIssueUnitQuantity] = useState(0);
   const { format } = useFormatNumber();
   const { rows: items } = usePrescription();
 
+  const [issueUnitQuantity, setIssueUnitQuantity] = useState(0);
+  const [prescribedQuantity, setPrescribedQuantity] = useState(0);
+  const [allocationAlerts, setAllocationAlerts] = useState<StockOutAlert[]>([]);
+
   const debouncedSetAllocationAlerts = useDebounceCallback(
     warning => setAllocationAlerts(warning),
     []
   );
 
-  const allocate = (numPacks: number, packSize: number) => {
+  const allocate = (
+    numPacks: number,
+    packSize: number,
+    prescribedQuantity: number
+  ) => {
     const newAllocateQuantities = onChangeQuantity(
       numPacks,
       packSize === -1 || packSize === 1 ? null : packSize,
-      true
+      true,
+      prescribedQuantity
     );
     const placeholderLine = newAllocateQuantities?.find(isA.placeholderLine);
     const allocatedQuantity =
@@ -147,15 +155,18 @@ export const PrescriptionLineEditForm: React.FC<
   // See https://github.com/msupply-foundation/open-msupply/issues/2727
   // and https://github.com/msupply-foundation/open-msupply/issues/3532
   const debouncedAllocate = useDebouncedValueCallback(
-    (numPacks, packSize) => {
-      allocate(numPacks, packSize);
+    (numPacks, packSize, prescribedQuantity) => {
+      allocate(numPacks, packSize, prescribedQuantity);
     },
     [],
     500,
     [draftPrescriptionLines] // this is needed to prevent a captured enclosure of onChangeQuantity
   );
 
-  const handleIssueQuantityChange = (inputUnitQuantity?: number) => {
+  const handleIssueQuantityChange = (
+    inputUnitQuantity?: number,
+    quantityType: 'issue' | 'prescribed' = 'issue'
+  ) => {
     // this method is also called onBlur... check that there actually has been a
     // change in quantity (to prevent triggering auto allocation if only focus
     // has moved)
@@ -170,13 +181,34 @@ export const PrescriptionLineEditForm: React.FC<
         : 1;
 
     const numPacks = quantity / packSize;
-    debouncedAllocate(numPacks, Number(packSize));
+    debouncedAllocate(
+      numPacks,
+      Number(packSize),
+      quantityType === 'prescribed' ? inputUnitQuantity : prescribedQuantity
+    );
+  };
+
+  const handlePrescribedQuantityChange = (inputPrescribedQuantity?: number) => {
+    if (inputPrescribedQuantity == null) return;
+    setPrescribedQuantity(inputPrescribedQuantity);
+    handleIssueQuantityChange(inputPrescribedQuantity, 'prescribed');
   };
 
   const prescriptionLineWithNote = draftPrescriptionLines.find(l => !!l.note);
   const note = prescriptionLineWithNote?.note ?? '';
 
   useEffect(() => {
+    const selectedItem = items.find(
+      prescriptionItem => prescriptionItem.id === item?.id
+    );
+    const newPrescribedQuantity: number =
+      selectedItem?.lines?.find(
+        ({ prescribedQuantity }) =>
+          prescribedQuantity != null && prescribedQuantity > 0
+      )?.prescribedQuantity ?? 0;
+
+    setPrescribedQuantity(newPrescribedQuantity);
+
     const newIssueQuantity = Math.round(
       allocatedUnits / Math.abs(Number(packSizeController.selected?.value || 1))
     );
@@ -242,26 +274,34 @@ export const PrescriptionLineEditForm: React.FC<
               alignItems="center"
               display="flex"
               flexDirection="row"
-              justifyContent="flex-start"
-              gap={1}
+              gap={5}
             >
-              <Grid>
-                <InputLabel style={{ fontSize: 12 }}>
-                  {t('label.issue')}
+              <Grid display="flex" alignItems="center" gap={1}>
+                <InputLabel sx={{ fontSize: 12 }}>
+                  {t('label.prescribed-quantity')}
                 </InputLabel>
-              </Grid>
-              <Grid>
                 <NumericTextInput
                   autoFocus
+                  disabled={disabled}
+                  value={prescribedQuantity}
+                  onChange={handlePrescribedQuantityChange}
+                  min={0}
+                  decimalLimit={2}
+                  onBlur={() => {}}
+                />
+              </Grid>
+              <Grid display="flex" alignItems="center" gap={1}>
+                <InputLabel sx={{ fontSize: 12 }}>
+                  {t('label.issue')}
+                </InputLabel>
+                <NumericTextInput
                   disabled={disabled}
                   value={issueUnitQuantity}
                   onChange={handleIssueQuantityChange}
                   min={0}
                   decimalLimit={2}
                 />
-              </Grid>
-              <Grid>
-                <InputLabel style={{ fontSize: 12 }}>
+                <InputLabel sx={{ fontSize: 12 }}>
                   {t('label.unit-plural', {
                     count: issueUnitQuantity,
                     unit: item?.unitName,
@@ -296,7 +336,7 @@ export const PrescriptionLineEditForm: React.FC<
               updateNotes(e.target.value);
             }}
             fullWidth
-            style={{ flex: 1 }}
+            sx={{ flex: 1 }}
           />
         </AccordionPanelSection>
       )}

client/packages/invoices/src/Prescriptions/api/hooks/usePrescriptionLines.ts

@@ -90,11 +90,12 @@ const useSaveLines = (id: string, invoiceNum: number) => {
         ),
       updatePrescriptionLines: draftPrescriptionLines
         .filter(
-          ({ type, isCreated, isUpdated, numberOfPacks }) =>
+          ({ type, isCreated, isUpdated, numberOfPacks, prescribedQuantity }) =>
             !isCreated &&
             isUpdated &&
             type === InvoiceLineNodeType.StockOut &&
-            numberOfPacks > 0
+            numberOfPacks > 0 &&
+            (prescribedQuantity ?? 0) >= 0
         )
         .map(
           line =>

client/packages/invoices/src/Prescriptions/api/hooks/utils.ts

@@ -32,10 +32,11 @@ export const createInputObject = (
   line: DraftStockOutLine,
   type: 'insert' | 'update' | 'delete'
 ) => {
-  const { id, numberOfPacks, stockLine, invoiceId, note } = line;
+  const { id, numberOfPacks, prescribedQuantity, stockLine, invoiceId, note } =
+    line;
 
   const stockLineId = stockLine?.id ?? '';
-  const output = { id, numberOfPacks, stockLineId, note };
+  const output = { id, numberOfPacks, stockLineId, note, prescribedQuantity };
 
   switch (type) {
     case 'delete':