zeitbild/frontend-dali
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Pages durch Widgets ablösen #2

Merged
fenris merged 9 commits from task-408 into main 2025-10-14 23:37:02 +02:00
Conversation 0 Commits 9 Files changed 34 +71 -339
10 changed files with 71 additions and 339 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit c6f3d9fd57 - Show all commits

1
source/data/localization/deu.loc.json
View file

@ -50,6 +50,7 @@
"widget.weekview.controls.week": "Woche", "widget.weekview.controls.week": "Woche",
"widget.weekview.controls.count": "Anzahl", "widget.weekview.controls.count": "Anzahl",
"widget.weekview.controls.apply": "Laden", "widget.weekview.controls.apply": "Laden",
"widget.calendar_edit.actions.add": "anlegen",
"widget.calendar_edit.actions.change": "ändern", "widget.calendar_edit.actions.change": "ändern",
"widget.calendar_edit.actions.remove": "löschen", "widget.calendar_edit.actions.remove": "löschen",
"widget.event_edit.actions.add": "anlegen", "widget.event_edit.actions.add": "anlegen",

1
source/data/localization/eng.loc.json
View file

@ -50,6 +50,7 @@
"widget.weekview.controls.week": "Week", "widget.weekview.controls.week": "Week",
"widget.weekview.controls.count": "Count", "widget.weekview.controls.count": "Count",
"widget.weekview.controls.apply": "Load", "widget.weekview.controls.apply": "Load",
"widget.calendar_edit.actions.add": "add",
"widget.calendar_edit.actions.change": "change", "widget.calendar_edit.actions.change": "change",
"widget.calendar_edit.actions.remove": "delete", "widget.calendar_edit.actions.remove": "delete",
"widget.event_edit.actions.add": "add", "widget.event_edit.actions.add": "add",

12
source/main.ts
View file

@ -82,23 +82,11 @@ namespace _dali
"label": lib_plankton.translate.get("page.overview.title"), "label": lib_plankton.translate.get("page.overview.title"),
"groups": ["logged_out", "logged_in"], "groups": ["logged_out", "logged_in"],
}, },
{
"location": {"name": "calendar_add", "parameters": {}},
"label": lib_plankton.translate.get("page.calendar_add.title"),
"groups": ["logged_in"],
},
{ {
"location": {"name": "caldav", "parameters": {}}, "location": {"name": "caldav", "parameters": {}},
"label": lib_plankton.translate.get("page.caldav.title"), "label": lib_plankton.translate.get("page.caldav.title"),
"groups": ["logged_in"], "groups": ["logged_in"],
}, },
/*
{
"location": {"name": "event_add", "parameters": {}},
"label": lib_plankton.translate.get("page.event_add.title"),
"groups": ["logged_in"],
}
*/
{ {
"location": {"name": "logout", "parameters": {}}, "location": {"name": "logout", "parameters": {}},
"label": lib_plankton.translate.get("page.logout.title"), "label": lib_plankton.translate.get("page.logout.title"),

228
source/pages/calendar_add/logic.ts
View file

@ -1,228 +0,0 @@
namespace _dali.pages
{
/**
*/
lib_plankton.zoo_page.register(
"calendar_add",
async (parameters, target_element) => {
target_element.innerHTML = "";
target_element.innerHTML = await _dali.helpers.template_coin(
"calendar_add",
"default",
{
"label": lib_plankton.translate.get("page.calendar_add.title")
}
);
const form : lib_plankton.zoo_form.class_form<
{
name : string;
access : {
public : boolean;
default_level : _dali.type.enum_access_level;
attributed : lib_plankton.map.type_map<
_dali.type.user_id,
_dali.type.enum_access_level
>;
};
resource_kind : string;
hue : (null | float);
},
{
name : string;
access : {
public : boolean;
default_level : _dali.type.enum_access_level;
attributed : lib_plankton.map.type_map<
_dali.type.user_id,
_dali.type.enum_access_level
>;
};
resource_kind : string;
hue : (null | float);
}
> = new lib_plankton.zoo_form.class_form<
{
name : string;
access : {
public : boolean;
default_level : _dali.type.enum_access_level;
attributed : lib_plankton.map.type_map<
_dali.type.user_id,
_dali.type.enum_access_level
>;
};
resource_kind : string;
hue : (null | float);
},
{
name : string;
access : {
public : boolean;
default_level : _dali.type.enum_access_level;
attributed : lib_plankton.map.type_map<
_dali.type.user_id,
_dali.type.enum_access_level
>;
};
resource_kind : string;
hue : (null | float);
}
>(
(value) => value,
(raw) => raw,
new lib_plankton.zoo_input.class_input_group<any>(
[
{
"name": "name",
"input": new lib_plankton.zoo_input.class_input_text(),
"label": lib_plankton.translate.get("calendar.name")
},
{
"name": "hue",
"input": new lib_plankton.zoo_input.class_input_hue(
),
"label": lib_plankton.translate.get("calendar.hue"),
},
{
"name": "access",
"input": new lib_plankton.zoo_input.class_input_group(
[
{
"name": "public",
"input": new lib_plankton.zoo_input.class_input_checkbox(),
"label": lib_plankton.translate.get("calendar.access.public"),
},
{
"name": "default_level",
"input": _dali.helpers.input_access_level(),
"label": lib_plankton.translate.get("calendar.access.default_level"),
},
{
"name": "attributed",
"input": await _dali.helpers.input_attributed_access(),
"label": lib_plankton.translate.get("calendar.access.attributed"),
},
]
),
"label": lib_plankton.translate.get("calendar.access.access"),
},
{
"name": "resource_kind",
"input": new lib_plankton.zoo_input.class_input_selection(
[
{
"value": "local",
"label": lib_plankton.translate.get("resource.kinds.local.title")
},
{
"value": "caldav",
"label": lib_plankton.translate.get("resource.kinds.caldav.title")
},
]
),
"label": lib_plankton.translate.get("resource.kind")
},
]
),
[
{
"label": lib_plankton.translate.get("page.calendar_add.actions.do"),
"procedure": async (get_value, get_representation) => {
const value : any = await get_value();
const calendar_object : _dali.type.calendar_object = {
"name": value.name,
"access": {
"public": value.access.public,
"default_level": value.access.default_level,
"attributed": value.access.attributed,
},
"resource": (() => {
switch (value.resource_kind) {
case "local":
{
return {
"kind": "local",
"data": {
"events": [],
}
};
break;
}
case "caldav":
{
return {
"kind": "caldav",
"data": {
"url": "", // TODO
"read_only": true, // TODO
}
};
break;
}
default:
{
throw (new Error("invalid resource kind: " + value.resource_kind));
break;
}
}
}) (),
"hue": value.hue,
};
try
{
await _dali.backend.calendar_add(
calendar_object
);
lib_plankton.zoo_page.set(
{
"name": "overview",
"parameters": {}
}
);
}
catch (error)
{
// do nothing
/*
lib_plankton.zoo_page.set(
{
"name": "event_add",
"parameters": {
}
}
);
*/
}
}
},
]
);
await form.setup(document.querySelector("#calendar_add_form"));
await form.input_write(
{
"name": "",
"access": {
"public": false,
"default_level": _dali.type.enum_access_level.view,
"attributed": lib_plankton.map.hashmap.implementation_map<
_dali.type.user_id,
_dali.type.enum_access_level
>(
lib_plankton.map.hashmap.make<
_dali.type.user_id,
_dali.type.enum_access_level
>(
user_id => user_id.toFixed(0),
)
),
},
"resource_kind": "local",
"hue": lib_plankton.random.generate_unit(),
}
);
return Promise.resolve<void>(undefined);
}
);
}

5
source/pages/calendar_add/templates/default.html.tpl
View file

@ -1,5 +0,0 @@
<div id="calendar_add">
<h2>{{label}}</h2>
<div id="calendar_add_form">
</div>
</div>

68
source/pages/calendar_edit/logic.ts
View file

@ -1,68 +0,0 @@
namespace _dali.pages
{
/**
*/
lib_plankton.zoo_page.register(
"calendar_edit",
async (parameters, target_element) => {
const read_only : boolean = ((parameters["read_only"] ?? "yes") === "yes");
const calendar_id : int = parseInt(parameters["calendar_id"]);
target_element.innerHTML = "";
target_element.innerHTML = await _dali.helpers.template_coin(
"calendar_edit",
"default",
{
"label": lib_plankton.translate.get("page.calendar_edit.title.regular")
}
);
const calendar_object : _dali.type.calendar_object = await _dali.backend.calendar_get(
calendar_id
);
const widget = new _dali.widgets.calendar_edit.class_widget_calendar_edit(
{
"read_only": read_only,
"action_change": (data) => {
_dali.backend.calendar_change(
calendar_id,
data
)
.then(
() => {
lib_plankton.zoo_page.set(
{
"name": "overview",
"parameters": {}
}
);
}
);
},
"action_remove": (data) => {
_dali.backend.calendar_remove(
calendar_id
)
.then(
() => {
lib_plankton.zoo_page.set(
{
"name": "overview",
"parameters": {}
}
);
}
);
},
"initial_value": {
"name": calendar_object.name,
"hue": calendar_object.hue,
"access": calendar_object.access,
},
}
);
await widget.load(document.querySelector("#calendar_edit_form"));
return Promise.resolve<void>(undefined);
}
);
}

5
source/pages/calendar_edit/templates/default.html.tpl
View file

@ -1,5 +0,0 @@
<div id="calendar_edit">
<h2>{{label}}</h2>
<div id="calendar_edit_form">
</div>
</div>

48
source/pages/overview/logic.ts
View file

@ -83,6 +83,51 @@ namespace _dali.pages.overview
widget_sources = new _dali.widgets.sources.class_widget_sources( widget_sources = new _dali.widgets.sources.class_widget_sources(
_dali.backend.calendar_list, _dali.backend.calendar_list,
{ {
"action_create": () => {
(async () => {
const widget = new _dali.widgets.calendar_edit.class_widget_calendar_edit(
{
"read_only": false,
"action_cancel": () => {
_dali.overlay.toggle({"mode": false});
},
"action_add": (data) => {
_dali.backend.calendar_add(
{
"name": data.name,
"hue": data.hue,
"access": data.access,
"resource": {
"kind": "local",
"data": {
"events": [],
}
}
}
)
.then(
() => {
update();
_dali.overlay.toggle({"mode": false});
}
)
.catch(
(reason) => {
lib_plankton.log.warning(
"dali.overview.calendar_add_error",
{"details": String(reason)}
);
}
);
},
"initial_value": null,
}
);
_dali.overlay.clear();
_dali.overlay.toggle({"mode": true});
await widget.load(_dali.overlay.get_content_element());
}) ();
},
"action_open": (entry) => { "action_open": (entry) => {
let read_only : boolean; let read_only : boolean;
switch (entry.access_level) switch (entry.access_level)
@ -154,9 +199,6 @@ namespace _dali.pages.overview
widget_weekview.toggle_visibility(entry.id); widget_weekview.toggle_visibility(entry.id);
widget_listview.toggle_visibility(entry.id); widget_listview.toggle_visibility(entry.id);
}, },
"action_create": () => {
console.warn("not implemented: calendar_add widget");
},
} }
); );
await widget_sources.load(target_element.querySelector("#overview-pane-left")); await widget_sources.load(target_element.querySelector("#overview-pane-left"));

24
source/widgets/calendar_edit/logic.ts
View file

@ -33,6 +33,11 @@ namespace _dali.widgets.calendar_edit
private action_cancel ?: (null | (() => void)); private action_cancel ?: (null | (() => void));
/**
*/
private action_add ?: (null | ((value : type_value) => void));
/** /**
*/ */
private action_change ?: (null | ((value : type_value) => void)); private action_change ?: (null | ((value : type_value) => void));
@ -54,6 +59,7 @@ namespace _dali.widgets.calendar_edit
{ {
"read_only": read_only = false, "read_only": read_only = false,
"action_cancel": action_cancel = null, "action_cancel": action_cancel = null,
"action_add": action_add = null,
"action_change": action_change = null, "action_change": action_change = null,
"action_remove": action_remove = null, "action_remove": action_remove = null,
"initial_value": initial_value = null, "initial_value": initial_value = null,
@ -62,6 +68,7 @@ namespace _dali.widgets.calendar_edit
{ {
read_only ?: boolean; read_only ?: boolean;
action_cancel ?: (null | (() => void)); action_cancel ?: (null | (() => void));
action_add ?: (null | ((value : type_value) => void))
action_change ?: (null | ((value : type_value) => void)); action_change ?: (null | ((value : type_value) => void));
action_remove ?: (null | ((value : type_value) => void)); action_remove ?: (null | ((value : type_value) => void));
initial_value ?: (null | type_value); initial_value ?: (null | type_value);
@ -73,6 +80,7 @@ namespace _dali.widgets.calendar_edit
{ {
this.read_only = read_only; this.read_only = read_only;
this.action_cancel = action_cancel; this.action_cancel = action_cancel;
this.action_add = action_add;
this.action_change = action_change; this.action_change = action_change;
this.action_remove = action_remove; this.action_remove = action_remove;
this.initial_value = initial_value; this.initial_value = initial_value;
@ -150,6 +158,22 @@ namespace _dali.widgets.calendar_edit
: :
[] []
) )
// add
.concat(
((! this.read_only) && (! (this.action_add === null)))
?
[
{
"label": lib_plankton.translate.get("widget.calendar_edit.actions.add"),
"procedure": async (get_value, get_representation) => {
const value : type_value = await get_value();
this.action_add(value);
}
},
]
:
[]
)
// change // change
.concat( .concat(
((! this.read_only) && (! (this.action_change === null))) ((! this.read_only) && (! (this.action_change === null)))

18
tools/makefile
View file

@ -39,8 +39,6 @@ templates: \
templates-widgets-calendar_edit \ templates-widgets-calendar_edit \
templates-widgets-event_edit \ templates-widgets-event_edit \
templates-pages-caldav \ templates-pages-caldav \
templates-pages-calendar_add \
templates-pages-calendar_edit \
templates-pages-overview \ templates-pages-overview \
templates-pages-login templates-pages-login
@ -93,20 +91,6 @@ templates-pages-caldav: \
@ ${cmd_mkdir} ${dir_build}/templates/caldav @ ${cmd_mkdir} ${dir_build}/templates/caldav
@ ${cmd_cp} -r -u -v ${dir_source}/pages/caldav/templates/* ${dir_build}/templates/caldav/ @ ${cmd_cp} -r -u -v ${dir_source}/pages/caldav/templates/* ${dir_build}/templates/caldav/
.PHONY: templates-pages-calendar_add
templates-pages-calendar_add: \
$(wildcard ${dir_source}/pages/calendar_add/templates/*)
@ ${cmd_log} "templates:calendar_add …"
@ ${cmd_mkdir} ${dir_build}/templates/calendar_add
@ ${cmd_cp} -r -u -v ${dir_source}/pages/calendar_add/templates/* ${dir_build}/templates/calendar_add/
.PHONY: templates-pages-calendar_edit
templates-pages-calendar_edit: \
$(wildcard ${dir_source}/pages/calendar_edit/templates/*)
@ ${cmd_log} "templates:calendar_edit …"
@ ${cmd_mkdir} ${dir_build}/templates/calendar_edit
@ ${cmd_cp} -r -u -v ${dir_source}/pages/calendar_edit/templates/* ${dir_build}/templates/calendar_edit/
.PHONY: templates-pages-overview .PHONY: templates-pages-overview
templates-pages-overview: \ templates-pages-overview: \
$(wildcard ${dir_source}/pages/overview/templates/*) $(wildcard ${dir_source}/pages/overview/templates/*)
@ -150,8 +134,6 @@ ${dir_temp}/logic-unlinked.js: \
${dir_source}/pages/logout/logic.ts \ ${dir_source}/pages/logout/logic.ts \
${dir_source}/pages/caldav/logic.ts \ ${dir_source}/pages/caldav/logic.ts \
${dir_source}/pages/oidc_finish/logic.ts \ ${dir_source}/pages/oidc_finish/logic.ts \
${dir_source}/pages/calendar_add/logic.ts \
${dir_source}/pages/calendar_edit/logic.ts \
${dir_source}/pages/overview/logic.ts \ ${dir_source}/pages/overview/logic.ts \
${dir_source}/main.ts ${dir_source}/main.ts
@ ${cmd_log} "logic | compile …" @ ${cmd_log} "logic | compile …"