@openmrs/esm-stock-management-app 1.0.1-pre.417 → 1.0.1-pre.418

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

@@ -32,9 +32,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1033781,
+      "size": 1037961,
       "sizes": {
-        "javascript": 1033571,
+        "javascript": 1037751,
         "consume-shared": 210
       },
       "names": [],
@@ -48,7 +48,7 @@
       "auxiliaryFiles": [
         "39.js.map"
       ],
-      "hash": "eeb1734d0a851954",
+      "hash": "961566f1d8c2c3a7",
       "childrenByOrder": {}
     },
     {
@@ -110,10 +110,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 4724961,
+      "size": 4729141,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 4703013,
+        "javascript": 4707193,
         "share-init": 252,
         "runtime": 21444
       },
@@ -130,7 +130,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "46366f56eb7924f5",
+      "hash": "a943f526f7763672",
       "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-management-dashboard","slot":"stock-management-dashboard-slot","component":"stockManagementDashboard"},{"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":"stockManagement","route":"stock-management"}],"version":"1.0.1-pre.417"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.24.0"},"extensions":[{"name":"stock-management-dashboard","slot":"stock-management-dashboard-slot","component":"stockManagementDashboard"},{"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":"stockManagement","route":"stock-management"}],"version":"1.0.1-pre.418"}

package/package.json

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

package/src/stock-reports/generate-report/create-stock-report.component.tsx

@@ -355,7 +355,7 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
       if (displayDate) {
         parameters += getReportParameter(
           ReportParameter.Date,
-          JSON.stringify(report.date).replaceAll('"', ""),
+          report.date ? JSON.stringify(report.date).replaceAll('"', "") : "",
           formatDisplayDate(report.date) ?? "",
           t("stockmanagement.report.edit.date"),
           newLine
@@ -364,7 +364,9 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
       if (displayStartDate) {
         parameters += getReportParameter(
           ReportParameter.StartDate,
-          JSON.stringify(report.startDate).replaceAll('"', ""),
+          report.startDate
+            ? JSON.stringify(report.startDate).replaceAll('"', "")
+            : "",
           formatDisplayDate(report.startDate) ?? "",
           t(getReportStartDateLabel(report.reportSystemName)),
           newLine
@@ -373,7 +375,9 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
       if (displayEndDate) {
         parameters += getReportParameter(
           ReportParameter.EndDate,
-          JSON.stringify(report.endDate).replaceAll('"', ""),
+          report.endDate
+            ? JSON.stringify(report.endDate).replaceAll('"', "")
+            : "",
           formatDisplayDate(report.endDate) ?? "",
           t(getReportEndDateLabel(report.reportSystemName)),
           newLine
@@ -529,6 +533,30 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
             )}
           />
         )}
+        {displayInventoryGroupBy && (
+          <Select
+            id="inventoryGroupBy"
+            defaultValue={model?.inventoryGroupBy}
+            invalid={errors?.inventoryGroupBy?.message}
+            invalidText={errors?.inventoryGroupBy?.message}
+            labelText={t("inventoryBy", "Inventory by")}
+            onChange={(e) => setValue("inventoryGroupBy", e.target.value)}
+          >
+            <SelectItem value="" text={t("SelectOption", "Select an option")} />
+            <SelectItem
+              value="StockItemOnly"
+              text={t("stockItem", "Stock Item")}
+            />
+            <SelectItem
+              value="LocationStockItem"
+              text={t("lcationstockitem", "Location  and Stock Item")}
+            />
+            <SelectItem
+              value="LocationStockItemBatchNo"
+              text={t("locationBatchno", "Location and Batch")}
+            />
+          </Select>
+        )}
         {displayLocation && (
           <Select
             name="location"
@@ -537,6 +565,8 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
             id="location"
             onChange={(e) => setValue("location", e.target.value)}
             defaultValue=""
+            invalid={errors?.location?.message}
+            invalidText={errors?.location?.message}
           >
             <SelectItem
               disabled
@@ -674,6 +704,32 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
             />
           </div>
         )}
+        {displayDate && (
+          <Controller
+            control={control}
+            name="date"
+            render={({ field: { onChange, value } }) => (
+              <DatePicker
+                datePickerType="single"
+                maxDate={formatForDatePicker(today())}
+                locale="en"
+                dateFormat={DATE_PICKER_CONTROL_FORMAT}
+                onChange={onChange}
+                value={value}
+              >
+                <DatePickerInput
+                  id="date"
+                  name="date"
+                  placeholder={DATE_PICKER_FORMAT}
+                  labelText={t("date", "Date")}
+                  defaultValue=""
+                  invalid={errors?.date?.message}
+                  invalidText={errors?.date?.message}
+                />
+              </DatePicker>
+            )}
+          />
+        )}
       </div>
       <div className={styles.reportButton}>
         <Button kind="secondary" onClick={closeOverlay}>

package/src/stock-reports/report-validation-schema.ts

@@ -1,40 +1,77 @@
 import { z } from "zod";
 
-export const reportSchema = z.object({
-  startDate: z.coerce.date().refine((date) => date !== undefined, {
-    message: "Start Date is required",
-  }),
-  endDate: z.coerce.date().refine((date) => date !== undefined, {
-    message: "End Date is required",
-  }),
-  location: z.string({ required_error: "Location Required" }).min(1, {
-    message: "Location Required",
-  }),
-  reportName: z.string({ required_error: "Report Name Required" }).min(1, {
-    message: "Report Name Required",
-  }),
-  stockReportItemCategory: z.string().optional(),
-  mostLeastMoving: z.string().optional(),
-  mostLeastMovingName: z.string().optional(),
-  stockItemUuid: z.string().optional(),
-  stockItemName: z.string().optional(),
-  patientUuid: z.string().optional(),
-  patientName: z.string().optional(),
-  locationUuid: z.string().optional(),
-  childLocations: z.boolean().optional(),
-  stockSourceUuid: z.string().optional(),
-  stockSource: z.string().optional(),
-  stockSourceDestinationUuid: z.string().optional(),
-  stockSourceDestination: z.string().optional(),
-  inventoryGroupBy: z.string().optional(),
-  inventoryGroupByName: z.string().optional(),
-  stockItemCategoryConceptUuid: z.string().optional(),
-  reportSystemName: z.string().optional(),
-  stockItemCategory: z.string().optional(),
-  maxReorderLevelRatio: z.number().optional(),
-  fullFillment: z.string().array().optional(),
-  limit: z.string().optional(),
-  date: z.date().optional(),
-});
+export const reportSchema = z
+  .object({
+    startDate: z.coerce.date().optional(),
+    endDate: z.coerce.date().optional(),
+    location: z.string({ required_error: "Location Required" }).min(1, {
+      message: "Location Required",
+    }),
+    reportName: z.string({ required_error: "Report Name Required" }).min(1, {
+      message: "Report Name Required",
+    }),
+    stockReportItemCategory: z.string().optional(),
+    mostLeastMoving: z.string().optional(),
+    mostLeastMovingName: z.string().optional(),
+    stockItemUuid: z.string().optional(),
+    stockItemName: z.string().optional(),
+    patientUuid: z.string().optional(),
+    patientName: z.string().optional(),
+    locationUuid: z.string().optional(),
+    childLocations: z.boolean().optional(),
+    stockSourceUuid: z.string().optional(),
+    stockSource: z.string().optional(),
+    stockSourceDestinationUuid: z.string().optional(),
+    stockSourceDestination: z.string().optional(),
+    inventoryGroupBy: z.string().optional(),
+    stockItemCategory: z.string().optional(),
+    inventoryGroupByName: z.string().optional(),
+    stockItemCategoryConceptUuid: z.string().optional(),
+    reportSystemName: z.string().optional(),
+    maxReorderLevelRatio: z.number().optional(),
+    fullFillment: z.string().array().optional(),
+    limit: z.string().optional(),
+    date: z.coerce.date().optional(),
+  })
+  .superRefine((data, ctx) => {
+    if (
+      data.reportName !== "Stock Status Report" &&
+      data.reportName !== "Stock-Out Report"
+    ) {
+      if (!data.startDate) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: "Start Date is required ",
+          path: ["startDate"],
+        });
+      }
+      if (!data.endDate) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: "End Date is required",
+          path: ["endDate"],
+        });
+      }
+    }
+    if (
+      data.reportName === "Stock Status Report" ||
+      data.reportName === "Stock-Out Report"
+    ) {
+      if (!data.date) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: "Date is required ",
+          path: ["date"],
+        });
+      }
+      if (!data.inventoryGroupBy) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: "Inventory by is required ",
+          path: ["inventoryGroupBy"],
+        });
+      }
+    }
+  });
 
 export type StockReportSchema = z.infer<typeof reportSchema>;