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

[add] page:event_edit [mod] page:events

Browse source
This commit is contained in:
Fenris Wolf 2024-09-30 12:06:41 +02:00
parent 2e4d06ee60
commit 8b33fa8e25
12 changed files with 326 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -38,6 +38,9 @@
"page.calendar_add.title": "Kalendar anlegen",
"page.calendar_add.actions.do": "anlegen",
"page.event_add.title": "Termin anlegen",
"page.event_add.actions.do": "anlegen"
"page.event_add.actions.do": "anlegen",
"page.event_edit.title": "Termin ändern",
"page.event_edit.actions.change": "ändern",
"page.event_edit.actions.remove": "löschen"
}
}

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

@ -38,6 +38,9 @@
"page.calendar_add.title": "Add calendar",
"page.calendar_add.actions.do": "anlegen",
"page.event_add.title": "Add event",
"page.event_add.actions.do": "anlegen"
"page.event_add.actions.do": "add",
"page.event_edit.title": "Change event",
"page.event_edit.actions.change": "change",
"page.event_edit.actions.remove": "delete"
}
}

49
source/logic/backend.ts
View file

@ -281,6 +281,27 @@ namespace _zeitbild.frontend_web.backend
}
/**
*/
export async function calendar_event_get(
calendar_id : _zeitbild.frontend_web.type.calendar_id,
event_id : _zeitbild.frontend_web.type.local_resource_event_id
) : Promise<_zeitbild.frontend_web.type.event_object>
{
return call(
lib_plankton.http.enum_method.get,
lib_plankton.string.coin(
"/calendar/{{calendar_id}}/event/{{event_id}}",
{
"calendar_id": calendar_id.toFixed(0),
"event_id": event_id.toFixed(0),
}
),
null
);
}
/**
*/
export async function calendar_event_add(
@ -302,11 +323,32 @@ namespace _zeitbild.frontend_web.backend
/**
* @todo event id type
*/
export async function calendar_event_change(
calendar_id : _zeitbild.frontend_web.type.calendar_id,
event_id : _zeitbild.frontend_web.type.local_resource_event_id,
event_object : _zeitbild.frontend_web.type.event_object
) : Promise<void>
{
return call(
lib_plankton.http.enum_method.put,
lib_plankton.string.coin(
"/calendar/{{calendar_id}}/event/{{event_id}}",
{
"calendar_id": calendar_id.toFixed(0),
"event_id": event_id.toFixed(0),
}
),
event_object
);
}
/**
*/
export async function calendar_event_remove(
calendar_id : _zeitbild.frontend_web.type.calendar_id,
event_id : int
event_id : _zeitbild.frontend_web.type.local_resource_event_id
) : Promise<void>
{
return call(
@ -337,7 +379,8 @@ namespace _zeitbild.frontend_web.backend
{
calendar_id : _zeitbild.frontend_web.type.calendar_id;
calendar_name : string;
event : _zeitbild.frontend_web.type.event_object;
event_id : (null | _zeitbild.frontend_web.type.local_resource_event_id);
event_object : _zeitbild.frontend_web.type.event_object;
}
>
>

13
source/logic/main.ts
View file

@ -10,11 +10,18 @@ namespace _zeitbild.frontend_web
) : Promise<void>
{
// conf
await _zeitbild.frontend_web.conf.init("conf.json");
await _zeitbild.frontend_web.conf.init(
"conf.json"
);
// init
await _zeitbild.frontend_web.backend.init();
lib_plankton.log.conf_push(
[
lib_plankton.log.channel_make({"kind": "console", "data": {"threshold": "info"}}),
]
);
await _zeitbild.frontend_web.backend.init(
);
await lib_plankton.translate.initialize(
{
"verbosity": 1,

5
source/logic/types.ts
View file

@ -54,6 +54,11 @@ namespace _zeitbild.frontend_web.type
};
/**
*/
export type local_resource_event_id = int;
/**
*/
export type resource_id = int;

55
source/logic/view.ts
View file

@ -165,7 +165,8 @@ namespace _zeitbild.frontend_web.view
entries : Array<
{
calendar_id : _zeitbild.frontend_web.type.calendar_id;
event : _zeitbild.frontend_web.type.event_object;
event_id : (null | _zeitbild.frontend_web.type.local_resource_event_id);
event_object : _zeitbild.frontend_web.type.event_object;
}
>;
today : boolean;
@ -203,7 +204,8 @@ namespace _zeitbild.frontend_web.view
{
calendar_id : _zeitbild.frontend_web.type.calendar_id;
calendar_name : string;
event : _zeitbild.frontend_web.type.event_object;
event_id : (null | _zeitbild.frontend_web.type.local_resource_event_id);
event_object : _zeitbild.frontend_web.type.event_object;
}
> = await _zeitbild.frontend_web.backend.events(
from_pit,
@ -228,7 +230,8 @@ namespace _zeitbild.frontend_web.view
entries : Array<
{
calendar_id : _zeitbild.frontend_web.type.calendar_id;
event : _zeitbild.frontend_web.type.event_object;
event_id : (null | _zeitbild.frontend_web.type.local_resource_event_id);
event_object : _zeitbild.frontend_web.type.event_object;
}
>;
today : boolean;
@ -265,7 +268,8 @@ namespace _zeitbild.frontend_web.view
entries : Array<
{
calendar_id : _zeitbild.frontend_web.type.calendar_id;
event : _zeitbild.frontend_web.type.event_object;
event_id : (null | _zeitbild.frontend_web.type.local_resource_event_id);
event_object : _zeitbild.frontend_web.type.event_object;
}
>;
today : boolean;
@ -323,7 +327,7 @@ namespace _zeitbild.frontend_web.view
.forEach(
(entry) => {
const distance_seconds : int = (
lib_plankton.pit.from_datetime(entry.event.begin)
lib_plankton.pit.from_datetime(entry.event_object.begin)
-
from_pit
);
@ -384,6 +388,14 @@ namespace _zeitbild.frontend_web.view
week : int;
};
timezone_shift ?: int;
action_select ?: (
(
calendar_id : _zeitbild.frontend_web.type.calendar_id,
event_id : _zeitbild.frontend_web.type.local_resource_event_id
)
=>
void
)
} = {}
) : Promise<string>
{
@ -427,7 +439,8 @@ namespace _zeitbild.frontend_web.view
entries : Array<
{
calendar_id : _zeitbild.frontend_web.type.calendar_id;
event : _zeitbild.frontend_web.type.event_object;
event_id : (null | _zeitbild.frontend_web.type.local_resource_event_id);
event_object : _zeitbild.frontend_web.type.event_object;
}
>;
today : boolean;
@ -556,9 +569,22 @@ namespace _zeitbild.frontend_web.view
sources.get(
entry.calendar_id
).name,
entry.event
entry.event_object
),
"name": entry.event_object.name,
"rel": lib_plankton.string.coin(
"{{calendar_id}}/{{event_id}}",
{
"calendar_id": entry.calendar_id.toFixed(0),
"event_id": (
(entry.event_id === null)
?
"-"
:
entry.event_id.toFixed(0)
),
}
),
"name": entry.event.name,
}
)
)
@ -592,7 +618,8 @@ namespace _zeitbild.frontend_web.view
Array<
{
calendar_id : _zeitbild.frontend_web.type.calendar_id;
event : _zeitbild.frontend_web.type.event_object;
event_id : (null | _zeitbild.frontend_web.type.local_resource_event_id);
event_object : _zeitbild.frontend_web.type.event_object;
}
>
>
@ -620,7 +647,8 @@ namespace _zeitbild.frontend_web.view
const entries : Array<
{
calendar_id : _zeitbild.frontend_web.type.calendar_id;
event : _zeitbild.frontend_web.type.event_object;
event_id : (null | _zeitbild.frontend_web.type.local_resource_event_id);
event_object : _zeitbild.frontend_web.type.event_object;
}
> = await _zeitbild.frontend_web.backend.events(
(options.from as lib_plankton.pit.type_pit),
@ -632,9 +660,9 @@ namespace _zeitbild.frontend_web.view
// TODO: optimize
entries.sort(
(entry_1, entry_2) => (
lib_plankton.pit.from_datetime(entry_1.event.begin)
lib_plankton.pit.from_datetime(entry_1.event_object.begin)
-
lib_plankton.pit.from_datetime(entry_2.event.begin)
lib_plankton.pit.from_datetime(entry_2.event_object.begin)
)
);
@ -656,7 +684,8 @@ namespace _zeitbild.frontend_web.view
const stuff : Array<
{
calendar_id : _zeitbild.frontend_web.type.calendar_id;
event : _zeitbild.frontend_web.type.event_object;
event_id : (null | _zeitbild.frontend_web.type.local_resource_event_id);
event_object : _zeitbild.frontend_web.type.event_object;
}
> = await calendar_view_list_data(
calendar_ids,

179
source/pages/event_edit/logic.ts Normal file
View file

@ -0,0 +1,179 @@
namespace _zeitbild.frontend_web.pages
{
/**
*/
lib_plankton.zoo_page.register(
"event_edit",
async (parameters, target_element) => {
const calendar_id : int = parseInt(parameters["calendar_id"]);
const event_id : int = parseInt(parameters["event_id"]);
target_element.innerHTML = await _zeitbild.frontend_web.helpers.template_coin(
"event_edit",
{
"label": lib_plankton.translate.get("page.event_edit.title")
}
);
const form : lib_plankton.zoo_form.class_form<
_zeitbild.frontend_web.type.event_object,
{
name : string;
begin : lib_plankton.pit.type_datetime;
end : (null | lib_plankton.pit.type_datetime);
location : (null | string);
description : (null | string);
}
> = new lib_plankton.zoo_form.class_form<
_zeitbild.frontend_web.type.event_object,
{
name : string;
begin : lib_plankton.pit.type_datetime;
end : (null | lib_plankton.pit.type_datetime);
location : (null | string);
description : (null | string);
}
>(
(value) => ({
"name": value.name,
"begin": value.begin,
"end": value.end,
"location": value.location,
"description": value.description,
}),
(representation) => ({
"name": representation.name,
"begin": representation.begin,
"end": representation.end,
"location": representation.location,
"description": representation.description,
}),
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("event.name")
},
{
"name": "begin",
"input": new lib_plankton.zoo_input.class_input_datetime(
{
"label_timezone_shift": lib_plankton.translate.get("common.timezone_shift"),
"label_date": lib_plankton.translate.get("common.date"),
"label_time": lib_plankton.translate.get("common.time"),
}
),
"label": lib_plankton.translate.get("event.begin")
},
{
"name": "end",
"input": new lib_plankton.zoo_input.class_input_soft<lib_plankton.pit.type_datetime>(
new lib_plankton.zoo_input.class_input_datetime(
{
"label_timezone_shift": lib_plankton.translate.get("common.timezone_shift"),
"label_date": lib_plankton.translate.get("common.date"),
"label_time": lib_plankton.translate.get("common.time"),
}
)
),
"label": lib_plankton.translate.get("event.end")
},
{
"name": "location",
"input": new lib_plankton.zoo_input.class_input_soft<string>(
new lib_plankton.zoo_input.class_input_text(
)
),
"label": lib_plankton.translate.get("event.location")
},
{
"name": "description",
"input": new lib_plankton.zoo_input.class_input_soft<string>(
new lib_plankton.zoo_input.class_input_text(
)
),
"label": lib_plankton.translate.get("event.description")
},
]
),
[
{
"label": lib_plankton.translate.get("page.event_edit.actions.change"),
"target": "submit",
"procedure": async (get_value, get_representation) => {
const value : any = await get_value();
try {
await _zeitbild.frontend_web.backend.calendar_event_change(
calendar_id,
event_id,
value
);
lib_plankton.zoo_page.set(
{
"name": "events",
"parameters": {}
}
);
}
catch (error) {
lib_plankton.log.warning("page_event_edit_error", {"error": String(error)});
// do nothing
/*
lib_plankton.zoo_page.set(
{
"name": "event_add",
"parameters": {
}
}
);
*/
}
}
},
{
"label": lib_plankton.translate.get("page.event_edit.actions.remove"),
"target": "submit",
"procedure": async (get_value, get_representation) => {
try {
await _zeitbild.frontend_web.backend.calendar_event_remove(
calendar_id,
event_id
);
lib_plankton.zoo_page.set(
{
"name": "events",
"parameters": {}
}
);
}
catch (error) {
lib_plankton.log.warning("page_event_edit_error", {"error": String(error)});
// do nothing
/*
lib_plankton.zoo_page.set(
{
"name": "event_add",
"parameters": {
}
}
);
*/
}
}
},
]
);
await form.setup(document.querySelector("#event_edit_form"));
const event_object : _zeitbild.frontend_web.type.event_object = await _zeitbild.frontend_web.backend.calendar_event_get(
calendar_id,
event_id
);
await form.input_write(
event_object
);
return Promise.resolve<void>(undefined);
}
);
}

0
source/pages/event_edit/structure.html.tpl Normal file
View file

30
source/pages/events/logic.ts
View file

@ -6,7 +6,7 @@ namespace _zeitbild.frontend_web.pages
lib_plankton.zoo_page.register(
"events",
async (parameters, target_element) => {
const content = await _zeitbild.frontend_web.view.calendar_view_table_html(
const content : string = await _zeitbild.frontend_web.view.calendar_view_table_html(
{
"calendar_ids": null,
// TODO
@ -23,6 +23,34 @@ namespace _zeitbild.frontend_web.pages
}
);
target_element.innerHTML = content;
target_element.querySelectorAll(".calendar-event_entry").forEach(
(element) => {
element.addEventListener(
"click",
() => {
const rel : string = element.getAttribute("rel");
const parts : Array<string> = rel.split("/");
const calendar_id : _zeitbild.frontend_web.type.calendar_id = parseInt(parts[0]);
const event_id : (null | _zeitbild.frontend_web.type.local_resource_event_id) = (
(parts[1] === "-")
?
null
:
parseInt(parts[1])
);
lib_plankton.zoo_page.set(
{
"name": "event_edit",
"parameters": {
"calendar_id": calendar_id,
"event_id": event_id,
}
}
);
}
);
}
);
return Promise.resolve<void>(undefined);
},
);

5
source/templates/event_edit.html.tpl Normal file
View file

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

2
source/templates/tableview-cell-entry.html.tpl
View file

@ -1,3 +1,3 @@
<li class="calendar-event_entry" style="background-color: {{color}};" title="{{title}}">
<li class="calendar-event_entry" style="background-color: {{color}};" title="{{title}}" rel="{{rel}}">
{{name}}
</li>

1
tools/makefile
View file

@ -57,6 +57,7 @@ ${dir_temp}/logic-unlinked.js: \
${dir_source}/pages/oidc_finish/logic.ts \
${dir_source}/pages/calendar_add/logic.ts \
${dir_source}/pages/event_add/logic.ts \
${dir_source}/pages/event_edit/logic.ts \
${dir_source}/pages/events/logic.ts \
${dir_source}/logic/main.ts
@ ${cmd_log} "logic | compile …"