Skip to content

[45885] Start Timer Event configuration affected by the user's profile date format #465

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
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

[45885] Start Timer Event configuration affected by the user's profile date format #465

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f18848a
Add defatul format to datetime hh:mm
marcoAntonioNina Sep 9, 2025
401455c
Change condition to format
marcoAntonioNina Sep 9, 2025
7879400
Add return format
marcoAntonioNina Sep 9, 2025
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
12 changes: 11 additions & 1 deletion src/components/FormDatePicker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,17 @@ export default {
return this.dataFormat === "datetime";
},
format() {
return this.datepicker ? getUserDateTimeFormat() : getUserDateFormat();
if (this.datepicker) {
let format = getUserDateTimeFormat();
// Check if the format already includes time patterns (hh:mm A or HH:mm)
const hasTimePattern = /[Hh]{1,2}:[mM]{1,2}/.test(format);
if (!hasTimePattern) {
// If forceDateTime is true and no time pattern exists, ensure the format includes hh:mm A
format = `${format.replace(/[\sHh:msaAzZ]/g, '')} hh:mm A`;
}
return format;
}
return getUserDateFormat();
},
classList() {
return {
Expand Down