Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MERGING release/24.04 into main #69

Merged
merged 5 commits into from
Jun 26, 2024
Merged

MERGING release/24.04 into main #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
13fdd51
OP-1725: remove null/empty option from dropdowns
olewandowski1 Jan 8, 2024
24c4cf1
Merge pull request #67 from openimis/feature/OP-1725
jdolkowski Jan 15, 2024
ca66584
OP-1806: fix calendar picker to allow selecting future dates
olewandowski1 Feb 8, 2024
03fdd7c
OP-1806: fix docs
olewandowski1 Feb 8, 2024
0e69145
Merge pull request #68 from openimis/feature/OP-1806
delcroip Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/components/ContractHeadPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,7 @@ class ContractHeadPanel extends FormPanel {
<PublishedComponent
pubRef="policyHolder.PolicyHolderPicker"
module="contract"
withNull
nullLabel={formatMessage(intl, "contract", "emptyLabel")}
withNull={false}
value={!!edited && !!edited.policyHolder && edited.policyHolder}
onChange={(v) => this.updateAttribute("policyHolder", v)}
readOnly={
Expand Down Expand Up @@ -281,10 +280,13 @@ class ContractHeadPanel extends FormPanel {
module="contract"
label="dateValidFrom"
required
maxDate={!!edited && !!edited.dateValidTo && edited.dateValidTo}
value={!!edited && !!edited.dateValidFrom && edited.dateValidFrom}
onChange={(v) => this.updateAttribute("dateValidFrom", v)}
readOnly={readOnlyFields.includes("dateValidFrom") || isAmendment}
// NOTE: maxDate cannot be passed if dateValidTo does not exist.
// Passing any other falsy value will block months manipulation.
// eslint-disable-next-line react/jsx-props-no-spreading
{...(edited.dateValidTo ? { maxDate: edited.dateValidTo } : null)}
/>
</Grid>
<Grid item xs={2} className={classes.item}>
Expand All @@ -293,12 +295,13 @@ class ContractHeadPanel extends FormPanel {
module="contract"
label="dateValidTo"
required
minDate={
!!edited && !!edited.dateValidFrom && edited.dateValidFrom
}
value={!!edited && !!edited.dateValidTo && edited.dateValidTo}
onChange={(v) => this.updateAttribute("dateValidTo", v)}
readOnly={readOnlyFields.includes("dateValidTo")}
// NOTE: minDate cannot be passed if dateValidFrom does not exist.
// Passing any other falsy value will block months manipulation.
// eslint-disable-next-line react/jsx-props-no-spreading
{...(edited.dateValidFrom ? { minDate: edited.dateValidFrom } : null)}
/>
</Grid>
</Grid>
Expand Down
4 changes: 2 additions & 2 deletions src/dialogs/CreateContractDetailsDialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ class CreateContractDetailsDialog extends Component {
<PublishedComponent
pubRef="policyHolder.PolicyHolderInsureePicker"
required
withNull
withNull={false}
policyHolderId={contract?.policyHolder?.id}
value={!!contractDetails.insuree && contractDetails.insuree}
onChange={v => this.updateAttribute('insuree', v)}
Expand All @@ -148,7 +148,7 @@ class CreateContractDetailsDialog extends Component {
<Grid item className={classes.item}>
<PublishedComponent
pubRef="policyHolder.PolicyHolderContributionPlanBundlePicker"
withNull
withNull={false}
nullLabel={formatMessage(intl, "contract", "emptyLabel")}
policyHolderId={contract?.policyHolder?.id}
value={!!contractDetails.contributionPlanBundle && contractDetails.contributionPlanBundle}
Expand Down
4 changes: 2 additions & 2 deletions src/dialogs/UpdateContractDetailsDialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ class CreateContractDetailsDialog extends Component {
<PublishedComponent
pubRef="policyHolder.PolicyHolderInsureePicker"
required
withNull
withNull={false}
policyHolderId={contract?.policyHolder?.id}
value={!!contractDetails.insuree && contractDetails.insuree}
readOnly
Expand All @@ -158,7 +158,7 @@ class CreateContractDetailsDialog extends Component {
<Grid item className={classes.item}>
<PublishedComponent
pubRef="policyHolder.PolicyHolderContributionPlanBundlePicker"
withNull
withNull={false}
nullLabel={formatMessage(intl, "contract", "emptyLabel")}
policyHolderId={contract?.policyHolder?.id}
value={!!contractDetails.contributionPlanBundle && contractDetails.contributionPlanBundle}
Expand Down
Loading