Merge pull request #73 from openimis/develop

MERGING develop into release/23.10
openimis · Dec 6, 2023 · 7845818 · 7845818
2 parents e6d84fa + 868745a
commit 7845818
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/src/components/PolicyFilter.js b/src/components/PolicyFilter.js
@@ -132,6 +132,31 @@ class PolicyFilter extends Component {
             </Grid>
           }
         />
+        <ControlledField
+          module="policy"
+          id="PolicyFilter.ConfirmationType"
+          field={
+            <Grid item xs={3} className={classes.item}>
+              <PublishedComponent
+                pubRef="insuree.ConfirmationTypePicker"
+                withNull={true}
+                nullLabel={formatMessage(intl, "insuree", "Family.ConfirmationType.null")}
+                value={this._filterValue("confirmationType")}
+                onChange={(k) => {
+                  let filters = [
+                    {
+                      id: "confirmationType",
+                      value: k,
+                      filter: !k ? null : `confirmationType: "${k.code}"`,
+                    },
+                  ];
+                  this.props.onChangeFilters(filters);
+                }
+                }
+              />
+            </Grid>
+          }
+        />
         <ControlledField
           module="policy"
           id="PolicyFilter.officer"

diff --git a/src/components/PolicyMasterPanel.js b/src/components/PolicyMasterPanel.js
@@ -318,6 +318,7 @@ class PolicyMasterPanel extends FormPanel {
                       ? decodeId(edited.family?.location?.parent?.parent?.id)
                       : 0
                   }
+                  enrollmentDate={edited?.enrollDate ?? null}
                 />
               </Grid>
               <Grid item xs={3} className={classes.item}>

diff --git a/src/index.js b/src/index.js
@@ -53,7 +53,7 @@ const DEFAULT_CONFIG = {
   "refs": [
     { key: "policy.PolicyOfficerPicker", ref: PolicyOfficerPicker },
     { key: "policy.PolicyOfficerPicker.projection", ref: ["id", "uuid", "code", "lastName", "otherNames"] },
-    { key: "policy.PolicyPicker.projection", ref: ["id", "uuid", "startDate", "product{name, code}", "expiryDate", "value"] },
+    { key: "policy.PolicyPicker.projection", ref: ["id", "uuid", "startDate", "product{name, code}", "expiryDate", "value", "sumPremiums"] },
     { key: "policy.PolicyOfficerPicker.sort", ref: 'officer__code' },
     { key: "policy.PolicyStatusPicker", ref: PolicyStatusPicker },
     { key: "policy.PolicyStatusPicker.projection", ref: null },