MT#63428 align day and month values with admin-ui

Previously, the arrays for weekdays and months didn’t match
the values used in admin-ui (Sunday=1, Saturday=7, January=1,
December=12). This commit updates the calculation function
to match admin-ui conventions, ensuring consistency since
the data originates from the admin panel and is read-only here.

Change-Id: I121c18ffb901beaece19124865b88259ffcb2d3f
master
Debora Crescenzo 2 months ago
parent bd086f4ca1
commit 2afefb8048

@ -33,6 +33,9 @@ export function getDayNameByNumber (dayNumber, isShortName = false) {
return isShortName ? daysShortNamesMap[dayNumber] : daysNamesMap[dayNumber] return isShortName ? daysShortNamesMap[dayNumber] : daysNamesMap[dayNumber]
} }
// This logic is aligned with admin-ui where
// * January has value 1
// * December has value 12
export function getMonthNameByNumber (monthNumber) { export function getMonthNameByNumber (monthNumber) {
const monthsNamesMap = [ const monthsNamesMap = [
i18n.global.t('January'), i18n.global.t('January'),
@ -49,7 +52,24 @@ export function getMonthNameByNumber (monthNumber) {
i18n.global.t('December') i18n.global.t('December')
] ]
return monthsNamesMap[monthNumber] return monthsNamesMap[monthNumber - 1]
}
// This logic is aligned with admin-ui where
// * Sunday has value 1
// * Saturday has value 7
function getWeekDayByNumber (dayNumber) {
const daysNamesMap = [
i18n.global.t('Sunday'),
i18n.global.t('Monday'),
i18n.global.t('Tuesday'),
i18n.global.t('Wednesday'),
i18n.global.t('Thursday'),
i18n.global.t('Friday'),
i18n.global.t('Saturday')
]
return daysNamesMap[dayNumber - 1]
} }
export function timeSetDateExact (times) { export function timeSetDateExact (times) {
@ -139,7 +159,7 @@ function formatTimeSetValues (timeSetMap, type) {
return { return {
year: timeSetMap.year[type] || defaultYear, year: timeSetMap.year[type] || defaultYear,
month: getMonthNameByNumber(timeSetMap.month[type]) || defaultMonth, month: getMonthNameByNumber(timeSetMap.month[type]) || defaultMonth,
wDay: getDayNameByNumber(timeSetMap.wday[type]) ? `${getDayNameByNumber(timeSetMap.wday[type])},` : '', wDay: getWeekDayByNumber(timeSetMap.wday[type]) || '',
mDay: timeSetMap.mday[type] || defaultDay, mDay: timeSetMap.mday[type] || defaultDay,
hour: formatTime(timeSetMap.hour[type]) || defaultTime, hour: formatTime(timeSetMap.hour[type]) || defaultTime,
minutes: formatTime(timeSetMap.minute[type]) || defaultTime minutes: formatTime(timeSetMap.minute[type]) || defaultTime

Loading…
Cancel
Save