extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-02 03:19:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix duration would not store days or hours, only minutes

Browse Source
This commit is contained in:
nathan 2023-09-28 09:39:53 -06:00
parent 1d2a2afc76
commit d5f56b8bae
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
api/js/etemplate/Et2Date/Et2DateDuration.ts
View File

@ -276,6 +276,16 @@ export class Et2DateDuration extends Et2InputWidget(FormControlMixin(LitElement)
this.formatter = formatDuration; this.formatter = formatDuration;
} }
async getUpdateComplete()
{
const result = await super.getUpdateComplete();
// Format select does not start with value, needs an update
this._formatNode?.requestUpdate("value");
return result;
}
transformAttributes(attrs) transformAttributes(attrs)
{ {
// Clean formats, but avoid things that need to be expanded like $cont[displayFormat] // Clean formats, but avoid things that need to be expanded like $cont[displayFormat]
@ -610,11 +620,15 @@ export class Et2DateDuration extends Et2InputWidget(FormControlMixin(LitElement)
s: this.shortLabels ? this.egw().lang("s") : this.egw().lang("Seconds") s: this.shortLabels ? this.egw().lang("s") : this.egw().lang("Seconds")
}; };
// It would be nice to use an et2-select here, but something goes weird with the styling // It would be nice to use an et2-select here, but something goes weird with the styling
const current = this._display.unit || this.displayFormat[0];
return html` return html`
<sl-select value="${this._display.unit || this.displayFormat[0]}"> <sl-select value="${current}">
${[...this.displayFormat].map((format : string) => ${[...this.displayFormat].map((format : string) =>
html` html`
<sl-option value=${format}> <sl-option
value=${format}
.selected=${(format == current)}
>
${this.time_formats[format]} ${this.time_formats[format]}
</sl-option>` </sl-option>`
)} )}
@ -636,7 +650,7 @@ export class Et2DateDuration extends Et2InputWidget(FormControlMixin(LitElement)
*/ */
get _formatNode() : HTMLSelectElement get _formatNode() : HTMLSelectElement
{ {
return this.shadowRoot ? this.shadowRoot.querySelector("et2-select") : null; return this.shadowRoot ? this.shadowRoot.querySelector("sl-select") : null;
} }
} }