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

Fix up recur days

Browse Source
This commit is contained in:
nathan 2023-03-28 13:48:26 -06:00
parent 70db89b2f6
commit b67abdafd1
4 changed files with 47 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
api/js/etemplate/Et2Select/Et2Select.ts
View File

@ -11,7 +11,7 @@
import {css, html, PropertyValues, TemplateResult} from "@lion/core";
import {Et2StaticSelectMixin, StaticOptions as so} from "./StaticOptions";
import {Et2widgetWithSelectMixin} from "./Et2WidgetWithSelectMixin";
import {SelectOption} from "./FindSelectOptions";
import {cleanSelectOptions, SelectOption} from "./FindSelectOptions";
import {SlMenuItem, SlSelect} from "@shoelace-style/shoelace";
import shoelace from "../Styles/shoelace";
import {Et2WithSearchMixin} from "./SearchMixin";
@ -898,11 +898,48 @@ customElements.define("et2-select-day", Et2SelectDay);
export class Et2SelectDayOfWeek extends Et2StaticSelectMixin(Et2Select)
{
constructor()
connectedCallback()
{
super();
super.connectedCallback();
this.static_options = so.dow(this, {other: this.other || []});
// Wait for connected instead of constructor because attributes make a difference in
// which options are offered
this.fetchComplete = so.dow(this, {other: this.other || []}).then(options =>
{
this.set_static_options(cleanSelectOptions(options));
});
}
set value(new_value)
{
let expanded_value = typeof new_value == "object" ? new_value : [];
if(new_value && (typeof new_value == "string" || typeof new_value == "number"))
{
let int_value = parseInt(new_value);
this.updateComplete.then(() =>
{
this.fetchComplete.then(() =>
{
let options = this.select_options;
for(let index in options)
{
let right = parseInt(options[index].value);
if(!!(int_value & right))
{
expanded_value.push("" + right);
}
}
super.value = expanded_value;
})
});
return;
}
super.value = expanded_value;
}
get value()
{
return super.value;
}
}

6
api/js/etemplate/Et2Select/StaticOptions.ts
View File

@ -343,10 +343,10 @@ export const StaticOptions = new class StaticOptionsType
return this.cached_server_side(widget, 'select-state', options);
}
dow(widget : Et2SelectWidgets, attrs) : SelectOption[] | Promise<SelectOption[]>
dow(widget : Et2SelectWidgets, attrs) : Promise<SelectOption[]>
{
var options = ',' + (attrs.other || []).join(',');
return this.cached_server_side(widget, 'select-dow', options);
var options = /*(widget.rows || "") +*/ ',' + (attrs.other || []).join(',');
return <Promise<SelectOption[]>>this.cached_server_side(widget, 'select-dow', options, true);
}
lang(widget : Et2SelectWidgets, attrs) : SelectOption[] | Promise<SelectOption[]>

4
api/src/Etemplate/Widget/Select.php
View File

@ -44,9 +44,7 @@ class Select extends Etemplate\Widget
'select-bool',
'select-cat',
'select-country',
// DOW needs some server-side pre-processing to unpack the options,
// so can't be skipped.
//'select-dow',
'select-dow',
'select-number',
'select-priority',
'select-percent',

3
calendar/templates/default/edit.xet
View File

@ -120,7 +120,8 @@
</row>
<row valign="top">
<et2-description for="recur_data" value="Repeat days"></et2-description>
<et2-select-dow statustext="Days of the week for a weekly repeated event" id="recur_data" rows="6" multiple="1" placeholder="1"></et2-select-dow>
<et2-select-dow statustext="Days of the week for a weekly repeated event" id="recur_data" rows="6"
multiple="true" placeholder=""></et2-select-dow>
<et2-vbox>
<et2-description value="Exceptions"></et2-description>
<et2-button statustext="Create an exception for the given date" label="@exception_label" id="button[exception]" noLang="1"></et2-button>