Merge pull request #18 from makombe/stock-expiry-date

(feat) O3-4548: Show expiry date on stock operation (openmrs#261)

Author: makombe

src/stock-operations/add-stock-operation/stock-items-addition-row.component.tsx

@@ -242,6 +242,30 @@ const StockItemsAdditionRow: React.FC<StockItemsAdditionRowProps> = ({
                         />
                       </DatePicker>
                     )}
+                  {requiresBatchUuid && !requiresActualBatchInformation && canEdit && (
+                    <DatePicker
+                      id={`expiration-${row.uuid}`}
+                      datePickerType="single"
+                      minDate={formatForDatePicker(today())}
+                      readOnly={true}
+                      locale="en"
+                      dateFormat={DATE_PICKER_CONTROL_FORMAT}
+                      onChange={([newDate]) => {
+                        setValue(`stockItems.${index}.expiration`, newDate);
+                      }}
+                    >
+                      <DatePickerInput
+                        size="sm"
+                        autoComplete="off"
+                        id={`expiration-input-${row.uuid}`}
+                        name="operationDate"
+                        placeholder={DATE_PICKER_FORMAT}
+                        value={formatForDatePicker(stockItemExpiry)}
+                        defaultValue={formatForDatePicker(stockItemExpiry)}
+                        invalid={!!errors?.stockItems?.[index]?.expiration}
+                      />
+                    </DatePicker>
+                  )}
                   {((!(canUpdateBatchInformation && row?.permission?.canUpdateBatchInformation) && !canEdit) ||
                     requiresBatchUuid) &&
                     formatForDatePicker(row.expiration)}

src/stock-operations/batch-no-selector/batch-no-selector.component.tsx

@@ -5,6 +5,7 @@ import { useStockItemBatchNos } from './batch-no-selector.resource';
 import { StockBatchDTO } from '../../core/api/types/stockItem/StockBatchDTO';
 import { useStockItemBatchInformationHook } from '../../stock-items/add-stock-item/batch-information/batch-information.resource';
 import { useTranslation } from 'react-i18next';
+import { formatForDatePicker } from '../../constants';
 
 interface BatchNoSelectorProps<T> {
   placeholder?: string;
@@ -88,7 +89,11 @@ const BatchNoSelector = <T,>(props: BatchNoSelectorProps<T>) => {
               onChange(data.selectedItem?.uuid);
             }}
             initialSelectedItem={initialSelectedItem}
-            itemToString={(s: StockBatchDTO) => (s?.batchNo ? `${s?.batchNo} | Qty: ${s?.quantity ?? 'Unknown'}` : '')}
+            itemToString={(s: StockBatchDTO) =>
+              s?.batchNo
+                ? `${s?.batchNo} | Qty: ${s?.quantity ?? 'Unknown'} | Expiry: ${formatForDatePicker(s.expiration)}`
+                : ''
+            }
             placeholder={props.placeholder}
             invalid={props.invalid}
             invalidText={props.invalidText}