Skip to content

[IMP] hr_holidays: Accrual UX - Day in month range #5240

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

Open
sdemeesterde wants to merge 1 commit into
base: master-hr-onboarding-samde
Choose a base branch
from
Open

[IMP] hr_holidays: Accrual UX - Day in month range #5240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 52 additions & 0 deletions ...onents/dynamic_selection_day_with_month_filter/dynamic_selection_day_with_month_filter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import { _t } from "@web/core/l10n/translation";
import { registry } from "@web/core/registry";
import { SelectionField, selectionField } from "@web/views/fields/selection/selection_field";


// Automatic fallback mapping if XML options are omitted
const DEFAULT_MONTH_MAPPING = {
first_day: "first_month",
first_month_day: "first_month",
second_month_day: "second_month",
yearly_day: "yearly_month",
carryover_day: "carryover_month",
};
Comment on lines +7 to +13

@sdemeesterde sdemeesterde Aug 11, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I somehow got into trouble with the "options" parameter which is apparently not so reliable. As a result, I use this fallback mapping.

But this makes me wonder:

  • Is this good practice ?
  • How defensive should we write javascript ? For example I could have added additionnal checks for the monthValue variable (accepts more month formats)


export class HrHolidaysDaySelectionWithMonthFilter extends SelectionField {
static props = {
...SelectionField.props,
monthField: { type: String, optional: true},
};

get options() {
const { record, name } = this.props;
const allOptions = super.options;

const monthFieldName = this.props.monthField || DEFAULT_MONTH_MAPPING[name];
const monthValue = monthFieldName ? record.data[monthFieldName]: null;

if (!monthValue) {
return allOptions;
}
const month = parseInt(monthValue, 10);

// 2020 is a leap year, so luxon.DateTime.local(2020, 2) will return 29
const maxDays = luxon.DateTime.local(2020, month).daysInMonth;
return allOptions.filter(([value]) => parseInt(value, 10) <= maxDays);
}
}

export const hrHolidaysDaySelectionWithMonthFilter = {
...selectionField,
component: HrHolidaysDaySelectionWithMonthFilter,
displayName: _t("Selection With Month Filter"),
extractProps: (fieldInfo, dynamicInfo) => {
const props = selectionField.extractProps(fieldInfo, dynamicInfo);
props.monthField = fieldInfo.options.month_field;
return props;
},
};

registry
.category("fields")
.add("dynamic_selection_day_with_month_filter", hrHolidaysDaySelectionWithMonthFilter);
13 changes: 9 additions & 4 deletions addons/hr_holidays/views/hr_leave_accrual_views.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,20 @@
</span>
<span name="biyearly" invisible="frequency != 'biyearly'">
on the
<field nolabel="1" name="first_month_day" class="o_hr_narrow_field-3" placeholder="select a day" required="frequency == 'biyearly'"/>
<field nolabel="1" name="first_month_day" class="o_hr_narrow_field-3" placeholder="select a day" required="frequency == 'biyearly'"
widget="dynamic_selection_day_with_month_filter" options="{'month_field': 'first_month'}"/>
of
<field name="first_month" class="o_hr_narrow_field-5" placeholder="select a month" required="frequency == 'biyearly'"/>
and the
<field nolabel="1" name="second_month_day" class="o_hr_narrow_field-3" placeholder="select a day" required="frequency == 'biyearly'"/>
<field nolabel="1" name="second_month_day" class="o_hr_narrow_field-3" placeholder="select a day" required="frequency == 'biyearly'"
widget="dynamic_selection_day_with_month_filter" options="{'month_field': 'second_month'}"/>
of
<field nolabel="1" name="second_month" class="o_hr_narrow_field-5" placeholder="select a month" required="frequency == 'biyearly'"/>
</span>
<span name="yearly" invisible="frequency != 'yearly'">
on the
<field nolabel="1" name="yearly_day" class="o_hr_narrow_field-3" required="frequency == 'yearly'" placeholder="select a day"/>
<field nolabel="1" name="yearly_day" class="o_hr_narrow_field-3" required="frequency == 'yearly'" placeholder="select a day"
widget="dynamic_selection_day_with_month_filter" options="{'month_field': 'yearly_month'}"/>
of
<field nolabel="1" name="yearly_month" class="o_hr_narrow_field-5" required="frequency == 'yearly'" placeholder="select a month"/>
</span>
Expand Down Expand Up @@ -205,7 +208,9 @@
<span id="carryover_custom_date">
: the
<field name="carryover_day" placeholder="select a day"
required="carryover_date == 'other'"/>
class="o_hr_narrow_field-3 d-inline-block"
required="carryover_date == 'other'"
widget="dynamic_selection_day_with_month_filter" options="{'month_field': 'carryover_month'}"/>
of
<field name="carryover_month" placeholder="select a month"
required="carryover_date == 'other'"/>
Expand Down