Merge pull request #20 from Y-Note-SAS/release-csu

Release csu 03/26

Author: mngoe

src/components/ProductForm/MainPanelForm.js

@@ -172,6 +172,26 @@ const MainPanelForm = (props) => {
           required={true}
         />
       </Grid>
+      <Grid item xs={3} className={classes.item}>
+        <NumberInput
+          min={0}
+          module="product"
+          label="ageMin"
+          readOnly={readOnly}
+          value={edited?.ageMinimal?? ""}
+          onChange={(ageMinimal) => onEditedChanged({ ...edited, ageMinimal  })}
+        />
+      </Grid>
+      <Grid item xs={3} className={classes.item}>
+        <NumberInput
+          min={0}
+          module="product"
+          label="ageMax"
+          readOnly={readOnly}
+          value={edited?.ageMaximal ?? ""}
+          onChange={(ageMaximal) => onEditedChanged({ ...edited, ageMaximal })}
+        />
+      </Grid>
       <Grid item xs={12}>
         <SectionTitle label={formatMessage("validitySectionTitle")} />
       </Grid>

src/hooks.js

@@ -15,6 +15,8 @@ export const GRAPHQL_USE_PRODUCTS_PRODUCT_FRAGMENT = `
     validityFrom
     validityTo
     program {id code idProgram nameProgram validityDateFrom}
+    ageMinimal
+    ageMaximal
   }
 `;
 
@@ -73,6 +75,8 @@ export const GRAPHQL_USE_PRODUCT_PRODUCT_FRAGMENT = `
     threshold
     location {id uuid code name parent {id uuid name code}}
     program {id idProgram nameProgram validityDateFrom}
+    ageMinimal
+    ageMaximal
 
     validityFrom
     validityTo

src/pickers/ProductPicker.js

@@ -23,7 +23,8 @@ const ProductPicker = (props) => {
     filterSelectedOptions,
     locationId,
     enrollmentDate,
-    canFetch
+    canFetch,
+    invalidAgeError
   } = props;
   const modulesManager = useModulesManager();
   const [filters, setFilters] = useState({
@@ -74,6 +75,8 @@ const ProductPicker = (props) => {
             required={required}
             label={(withLabel && (label || nullLabel)) || formatMessage("Product")}
             placeholder={(withPlaceholder && placeholder) || formatMessage("ProductPicker.placeholder")}
+            error={!!invalidAgeError}
+            helperText={invalidAgeError}
           />
         </Tooltip>
       )}

src/translations/en.json

@@ -146,14 +146,6 @@
   "product.DeductiblesCeilingsTabForm.MaxTable.antenatal": "Antenatal",
   "product.DeductiblesCeilingsTabForm.MaxTable.visits": "Visits",
   "product.DeductiblesCeilingsTabForm.splitCeilings": "Split ceilings & deductibles",
-  "product.ProductSalesReport.dateFrom": "",
-  "product.ProductSalesReport.dateTo": "",
-  "product.ProductSalesReport.region": "",
-  "product.ProductSalesReport.district": "",
-  "product.ProductDerivedOperationalIndicators.month": "",
-  "product.ProductDerivedOperationalIndicators.year": "",
-  "product.ProductDerivedOperationalIndicators.product": "",
-  "product.ItemsOrServicesGrid.addServicesButton": "",
   "product.ProductPicker.placehoder": "Search Product…",
   "product.ProductPicker.null": "Any",
 
@@ -168,5 +160,7 @@
   "product.ProductSalesReport.district": "District",
   "product.ProductDerivedOperationalIndicators.month": "Month",
   "product.ProductDerivedOperationalIndicators.year": "Year",
-  "product.ProductDerivedOperationalIndicators.product": "Product"
+  "product.ProductDerivedOperationalIndicators.product": "Product",
+  "product.ageMin": "Minimal age",
+  "product.ageMax": "Maximal age"
 }

src/utils.js

@@ -91,6 +91,8 @@ export const toFormValues = (product, shouldDuplicate) => {
     gracePeriodEnrolment: product.gracePeriodEnrolment ?? 0,
     gracePeriodRenewal: product.gracePeriodRenewal ?? 0,
     ceilingInterpretation: product.ceilingInterpretation ?? "HEALTH_FACILITY_TYPE",
+    ageMaximal: product.ageMaximal ?? 0,
+    ageMinimal: product.ageMinimal ?? 0,
   };
 };
 
@@ -118,6 +120,8 @@ export const toInputValues = (values) => {
     services,
     ceilingType,
     maxInstallments,
+    ageMinimal,
+    ageMaximal,
     ...inputValues
   } = values;
 
@@ -160,6 +164,8 @@ export const toInputValues = (values) => {
     locationUuid: location?.uuid,
     conversionProductUuid: conversionProduct?.uuid,
     ceilingType: ceilingType,
+    ageMinimal: ageMinimal,
+    ageMaximal: ageMaximal,
   };
 
   return val;