holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Et2Date: Stop required validation showing on initial load even with a value

Browse Source
This commit is contained in:
nathan 2023-01-17 10:52:02 -07:00
parent a5929388fc
commit 38b507dcd1
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/js/etemplate/Et2Date/Et2Date.ts
View File

@ -246,7 +246,9 @@ export function formatDate(date : Date, options = {dateFormat: ""}) : string
let replace_map = { let replace_map = {
d: (date.getUTCDate() < 10 ? "0" : "") + date.getUTCDate(), d: (date.getUTCDate() < 10 ? "0" : "") + date.getUTCDate(),
m: (date.getUTCMonth() < 9 ? "0" : "") + (date.getUTCMonth() + 1), m: (date.getUTCMonth() < 9 ? "0" : "") + (date.getUTCMonth() + 1),
Y: "" + date.getUTCFullYear() Y: "" + date.getUTCFullYear(),
H: ("0" + date.getUTCHours()).slice(-2),
i: ("0" + date.getUTCMinutes()).slice(-2)
} }
if(dateformat.indexOf("M") != -1) if(dateformat.indexOf("M") != -1)
{ {
@ -460,6 +462,10 @@ export class Et2Date extends Et2InputWidget(FormControlMixin(LitFlatpickr))
{ {
this.findInputField().setAttribute("data-input", ""); this.findInputField().setAttribute("data-input", "");
} }
if(this.defaultDate)
{
this._inputNode.value = flatpickr.formatDate(<Date>this.defaultDate, this.getOptions().dateFormat);
}
} }
this.initializeComponent(); this.initializeComponent();
@ -618,12 +624,18 @@ export class Et2Date extends Et2InputWidget(FormControlMixin(LitFlatpickr))
{ {
this.setDate(formatDate); this.setDate(formatDate);
} }
this.requestUpdate("value", this._oldValue);
} }
get value() get value()
{ {
if(!this._inputElement) if(!this._inputElement)
{ {
if(this.defaultDate)
{
return flatpickr.formatDate(<Date>this.defaultDate, this.getOptions().dateFormat);
}
return this._inputNode?.value || ''; return this._inputNode?.value || '';
} }
let value = this._inputElement.value; let value = this._inputElement.value;