[mod] date formatting [mod] caldav resource integration

lib/plankton/plankton.d.ts

@@ -1,11 +1,11 @@
 /**
  * @author fenris
  */
-type int = number;
+declare type int = number;
 /**
  * @author fenris
  */
-type float = number;
+declare type float = number;
 declare class Buffer {
     constructor(x: string, modifier?: string);
     toString(modifier?: string): string;
@@ -19,7 +19,7 @@ declare namespace lib_plankton.base {
 /**
  * @author fenris
  */
-type type_pseudopointer<type_value> = {
+declare type type_pseudopointer<type_value> = {
     value: type_value;
 };
 /**
@@ -868,33 +868,11 @@ declare namespace lib_plankton.call {
         fallback?: (null | ((coproduct?: type_coproduct) => type_output));
     }): type_output;
     /**
-     * for rate_limit_check
-     *
-     * @author fenris
      */
-    type type_mana_snapshot = {
+    function try_catch_wrap<type_value>(get_value: (() => type_value)): {
-        timestamp: float;
+        value: (null | type_value);
-        value: float;
+        error: (null | any);
     };
-    /**
-     * rate limiting algorithm, based on the idea of mana (magic power) in video games:
-     * - an actor has a fixed mana capacity, i.e. the maximum amount of available power
-     * - an actor has a fixed rate of mana regeneration, i.e. how fast the power is filled up (linear growth)
-     * - an action has a defined mana heft, i.e. how much power is required and deducted in order to execute it
-     * - mana states are represented by snapshots, i.e. the amount of power at a certain point in time
-     *
-     * @author fenris
-     */
-    function rate_limit_check(setup: {
-        capacity: float;
-        regeneration_rate: float;
-        get_snapshot: (() => Promise<(null | type_mana_snapshot)>);
-        set_snapshot: ((snapshot: type_mana_snapshot) => Promise<void>);
-        update_snapshot: ((timestamp: float, value_increment: float) => Promise<void>);
-    }, heft: float): Promise<{
-        granted: boolean;
-        seconds: (null | float);
-    }>;
 }
 declare namespace lib_plankton.file {
     /**
@@ -1825,7 +1803,7 @@ declare namespace lib_plankton.storage.memory {
         clear(): Promise<void>;
         write(key: any, value: any): Promise<boolean>;
         delete(key: any): Promise<void>;
-        read(key: any): Promise<Awaited<type_item>>;
+        read(key: any): Promise<type_item>;
         search(term: any): Promise<{
             key: string;
             preview: string;
@@ -2995,6 +2973,10 @@ declare namespace lib_plankton.pit {
     type type_pit = int;
 }
 declare namespace lib_plankton.pit {
+    /**
+     * @todo complete
+     */
+    function timezone_name_to_timezone_shift(timezone_name: string): int;
     /**
      */
     function date_object_get_week_of_year(date: Date): int;
@@ -3008,9 +2990,9 @@ declare namespace lib_plankton.pit {
      */
     function to_date_object(pit: type_pit): Date;
     /**
-     * @todo timezone
+     * @todo test
      */
-    function to_datetime(pit: type_pit, options?: {
+    function to_datetime(pit: type_pit, { timezone_shift, }?: {
         timezone_shift?: int;
     }): type_datetime;
     /**
@@ -3048,6 +3030,60 @@ declare namespace lib_plankton.pit {
     function to_ywd(pit: type_pit, options?: {
         timezone_shift?: int;
     }): type_ywd;
+    /**
+     * computes the point in time for switching to central european summer time
+     *
+     * @todo write tests
+     */
+    function cest_switch_on(year: int): type_pit;
+    /**
+     * computes the point in time for switching away from central european summer time
+     *
+     * @todo write tests
+     */
+    function cest_switch_off(year: int): type_pit;
+    /**
+     */
+    function timezone_shift_ce(pit: type_pit): int;
+    /**
+     * [convenience]
+     */
+    function to_datetime_ce(pit: type_pit): type_datetime;
+    /**
+     */
+    function datetime_translate(datetime: type_datetime, timezone_shift: int): type_datetime;
+    /**
+     * [convenience]
+     */
+    function datetime_translate_ce(datetime: type_datetime): type_datetime;
+    /**
+     */
+    function timezone_shift_format(timezone_shift: int): string;
+    /**
+     */
+    function date_format(date: type_date): string;
+    /**
+     */
+    function time_format(time: type_time, { show_seconds, }?: {
+        show_seconds?: boolean;
+    }): string;
+    /**
+     * @todo show timezone
+     */
+    function datetime_format(datetime: (null | type_datetime), { timezone_indicator, show_timezone, adjust_to_ce, omit_date, }?: {
+        timezone_indicator?: string;
+        show_timezone?: boolean;
+        adjust_to_ce?: boolean;
+        omit_date?: boolean;
+    }): string;
+    /**
+     */
+    function timespan_format(from: type_datetime, to: (null | type_datetime), { timezone_indicator, show_timezone, adjust_to_ce, omit_date, }?: {
+        timezone_indicator?: string;
+        show_timezone?: boolean;
+        adjust_to_ce?: boolean;
+        omit_date?: boolean;
+    }): string;
 }
 declare namespace lib_plankton.www_form {
     /**
@@ -3566,6 +3602,55 @@ declare namespace lib_plankton.zoo_input {
         write(value: string): Promise<void>;
     }
 }
+declare namespace lib_plankton.zoo_input {
+    /**
+     */
+    type type_translations = {
+        add?: string;
+        remove?: string;
+    };
+    /**
+     * @author fenris
+     */
+    export class class_input_list<type_element> implements interface_input<Array<type_element>> {
+        /**
+         */
+        private element_input_factory;
+        /**
+         */
+        private elements_container_dom;
+        /**
+         */
+        private elements;
+        /**
+         */
+        private translations;
+        /**
+         */
+        constructor(element_input_factory: (() => interface_input<type_element>), options?: {
+            translations?: type_translations;
+        });
+        /**
+         */
+        private clear;
+        /**
+         */
+        private add;
+        /**
+         * [implementation]
+         */
+        setup(parent: HTMLElement): Promise<void>;
+        /**
+         * [implementation]
+         */
+        read(): Promise<Array<type_element>>;
+        /**
+         * [implementation]
+         */
+        write(value: Array<type_element>): Promise<void>;
+    }
+    export {};
+}
 declare namespace lib_plankton.zoo_input {
     /**
      * @author fenris
@@ -3644,31 +3729,6 @@ declare namespace lib_plankton.zoo_input {
         write(value: (null | lib_plankton.pit.type_time)): Promise<void>;
     }
 }
-declare namespace lib_plankton.zoo_input {
-    /**
-     */
-    class class_input_datetime implements interface_input<lib_plankton.pit.type_datetime> {
-        /**
-         */
-        private core;
-        /**
-         */
-        constructor(options?: {
-            label_timezone_shift?: string;
-            label_date?: string;
-            label_time?: string;
-        });
-        /**
-         */
-        setup(parent: HTMLElement): Promise<void>;
-        /**
-         */
-        read(): Promise<lib_plankton.pit.type_datetime>;
-        /**
-         */
-        write(value: lib_plankton.pit.type_datetime): Promise<void>;
-    }
-}
 declare namespace lib_plankton.zoo_input {
     /**
      * @author fenris
@@ -3699,55 +3759,6 @@ declare namespace lib_plankton.zoo_input {
         write(value: type_record): Promise<void>;
     }
 }
-declare namespace lib_plankton.zoo_input {
-    /**
-     */
-    type type_translations = {
-        add?: string;
-        remove?: string;
-    };
-    /**
-     * @author fenris
-     */
-    export class class_input_list<type_element> implements interface_input<Array<type_element>> {
-        /**
-         */
-        private element_input_factory;
-        /**
-         */
-        private elements_container_dom;
-        /**
-         */
-        private elements;
-        /**
-         */
-        private translations;
-        /**
-         */
-        constructor(element_input_factory: (() => interface_input<type_element>), options?: {
-            translations?: type_translations;
-        });
-        /**
-         */
-        private clear;
-        /**
-         */
-        private add;
-        /**
-         * [implementation]
-         */
-        setup(parent: HTMLElement): Promise<void>;
-        /**
-         * [implementation]
-         */
-        read(): Promise<Array<type_element>>;
-        /**
-         * [implementation]
-         */
-        write(value: Array<type_element>): Promise<void>;
-    }
-    export {};
-}
 declare namespace lib_plankton.zoo_input {
     /**
      */
@@ -3775,6 +3786,56 @@ declare namespace lib_plankton.zoo_input {
         write(map: lib_plankton.map.type_map<type_key, type_value>): Promise<void>;
     }
 }
+declare namespace lib_plankton.zoo_input {
+    /**
+     */
+    class class_input_datetime implements interface_input<lib_plankton.pit.type_datetime> {
+        /**
+         */
+        private core;
+        /**
+         */
+        constructor(options?: {
+            label_timezone_shift?: string;
+            label_date?: string;
+            label_time?: string;
+        });
+        /**
+         */
+        setup(parent: HTMLElement): Promise<void>;
+        /**
+         */
+        read(): Promise<lib_plankton.pit.type_datetime>;
+        /**
+         */
+        write(value: lib_plankton.pit.type_datetime): Promise<void>;
+    }
+}
+declare namespace lib_plankton.zoo_input {
+    /**
+     * for central europe with daylight saving time feature
+     */
+    class class_input_datetime_central_europe implements interface_input<lib_plankton.pit.type_datetime> {
+        /**
+         */
+        private core;
+        /**
+         */
+        constructor(options?: {
+            label_date?: string;
+            label_time?: string;
+        });
+        /**
+         */
+        setup(parent: HTMLElement): Promise<void>;
+        /**
+         */
+        read(): Promise<lib_plankton.pit.type_datetime>;
+        /**
+         */
+        write(value: lib_plankton.pit.type_datetime): Promise<void>;
+    }
+}
 declare namespace lib_plankton.zoo_form {
     /**
      */

source/data/localization/deu.loc.json

@@ -4,6 +4,7 @@
 	},
 	"tree": {
 		"common.timezone_shift": "Zeitzonen-Verschiebung",
+		"common.timezone_indicator": "ZZ:",
 		"common.date": "Datum",
 		"common.time": "Uhrzeit",
 		"common.weekday.monday": "Mo",
@@ -14,12 +15,16 @@
 		"common.weekday.saturday": "Sa",
 		"common.weekday.sunday": "So",
 		"common.open": "öffnen",
+		"common.edit": "bearbeiten",
+		"common.show": "zeigen",
+		"common.hide": "ausblenden",
 		"access_level.none": "nichts",
 		"access_level.view": "nur lesen",
 		"access_level.edit": "lesen und bearbeiten",
 		"access_level.admin": "voll",
 		"event.event": "Termin",
 		"event.name": "Name",
+		"event.when": "Zeit",
 		"event.begin": "Anfang",
 		"event.end": "Ende",
 		"event.location": "Ort",

source/data/localization/eng.loc.json

@@ -4,6 +4,7 @@
 	},
 	"tree": {
 		"common.timezone_shift": "Timezone shift",
+		"common.timezone_indicator": "TZ:",
 		"common.date": "date",
 		"common.time": "time",
 		"common.weekday.monday": "Mon",
@@ -14,12 +15,16 @@
 		"common.weekday.saturday": "Sat",
 		"common.weekday.sunday": "Sun",
 		"common.open": "open",
+		"common.edit": "edit",
+		"common.show": "show",
+		"common.hide": "hide",
 		"access_level.none": "none",
 		"access_level.view": "read only",
 		"access_level.edit": "read and write",
 		"access_level.admin": "full",
 		"event.event": "event",
 		"event.name": "name",
+		"event.when": "time",
 		"event.begin": "begin",
 		"event.end": "end",
 		"event.location": "location",

source/logic/conf.ts

@@ -52,6 +52,11 @@ namespace _zeitbild.frontend_web.conf
 						"type": "string",
 						"default": "http://localhost:8888/#oidc_finish,session_key={{session_key}}"
 					},
+					"use_central_europe_specific_datetime_inputs": {
+						"nullable": true,
+						"type": "boolean",
+						"default": false
+					},
 				},
 				"required": [
 				],

source/logic/helpers.ts

@@ -75,106 +75,6 @@ namespace _zeitbild.frontend_web.helpers
 	}
 	
 	
-	/**
-	 * @todo timezone
-	 */
-	export function date_format(
-		date : lib_plankton.pit.type_date
-	) : string
-	{
-		return lib_plankton.string.coin(
-			"{{year}}-{{month}}-{{day}}",
-			{
-				"year": date.year.toFixed(0).padStart(4, "0"),
-				"month": date.month.toFixed(0).padStart(2, "0"),
-				"day": date.day.toFixed(0).padStart(2, "0"),
-			}
-		);
-	}
-	
-	
-	/**
-	 * @todo timezone
-	 */
-	export function time_format(
-		time : lib_plankton.pit.type_time
-	) : string
-	{
-		return lib_plankton.string.coin(
-			"{{hour}}:{{minute}}",
-			{
-				"hour": time.hour.toFixed(0).padStart(2, "0"),
-				"minute": time.minute.toFixed(0).padStart(2, "0"),
-				"second": time.second.toFixed(0).padStart(2, "0"),
-			}
-		);
-	}
-	
-	
-	/**
-	 * @todo timezone
-	 */
-	export function datetime_format(
-		datetime : (null | lib_plankton.pit.type_datetime)
-	) : string
-	{
-		if (datetime === null) {
-			return "-";
-		}
-		else {
-			return lib_plankton.string.coin(
-				"{{date}}{{macro_time}}",
-				{
-					"date": date_format(datetime.date),
-					"macro_time": (
-						(datetime.time === null)
-						?
-						""
-						:
-						lib_plankton.string.coin(
-							",{{time}}",
-							{
-								"time": time_format(datetime.time),
-							}
-						)
-					),
-				}
-			);
-		}
-	}
-	
-	
-	/**
-	 */
-	export function timespan_format(
-		from : lib_plankton.pit.type_datetime,
-		to : (null | lib_plankton.pit.type_datetime)
-	) : string
-	{
-		let result : string = "";
-		result += datetime_format(from);
-		if (to === null) {
-			// do nothing
-		}
-		else {
-			result += " - ";
-			if (
-				(from.date.year === to.date.year)
-				&&
-				(from.date.month === to.date.month)
-				&&
-				(from.date.day === to.date.day)
-			) {
-				// only time
-				result += time_format(to.time);
-			}
-			else {
-				result += datetime_format(to);
-			}
-		}
-		return result;
-	}
-	
 	/**
 	 */
 	export function input_access_level(
@@ -257,4 +157,30 @@ namespace _zeitbild.frontend_web.helpers
 		);
 	}
 	
+	
+	/**
+	 */
+	export function datetime_input(
+	) : lib_plankton.zoo_input.interface_input<lib_plankton.pit.type_datetime>
+	{
+		return (
+			_zeitbild.frontend_web.conf.get().misc.use_central_europe_specific_datetime_inputs
+			?
+			new lib_plankton.zoo_input.class_input_datetime_central_europe(
+				{
+					"label_date": lib_plankton.translate.get("common.date"),
+					"label_time": lib_plankton.translate.get("common.time"),
+				}
+			)
+			:
+			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"),
+				}
+			)
+		);
+	}
+	
 }

source/pages/event_add/logic.ts

@@ -140,25 +140,13 @@ namespace _zeitbild.frontend_web.pages
 						},
 						{
 							"name": "begin",
-							"input": new lib_plankton.zoo_input.class_input_datetime(
+							"input": _zeitbild.frontend_web.helpers.datetime_input(),
-								{
-									"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(
+								_zeitbild.frontend_web.helpers.datetime_input()
-									{
-										"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")
 						},

source/pages/event_edit/logic.ts

@@ -70,25 +70,13 @@ namespace _zeitbild.frontend_web.pages
 						},
 						{
 							"name": "begin",
-							"input": new lib_plankton.zoo_input.class_input_datetime(
+							"input": _zeitbild.frontend_web.helpers.datetime_input(),
-								{
-									"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(
+								_zeitbild.frontend_web.helpers.datetime_input()
-									{
-										"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")
 						},

source/pages/overview/logic.ts

@@ -31,6 +31,8 @@ namespace _zeitbild.frontend_web.pages.overview
 				}
 			);
 			target_element.querySelector("#overview").classList.toggle("overview-compact", compact);
+			let widget_weekview : _zeitbild.frontend_web.widgets.weekview.class_widget_weekview;
+			let widget_listview : _zeitbild.frontend_web.widgets.listview.class_widget_listview;
 			// hint
 			{
 				if (! await _zeitbild.frontend_web.backend.is_logged_in()) {
@@ -53,7 +55,7 @@ namespace _zeitbild.frontend_web.pages.overview
 				const widget_sources = new _zeitbild.frontend_web.widgets.sources.class_widget_sources(
 					data,
 					{
-						"action_select": (entry) => {
+						"action_open": (entry) => {
 							switch (entry.access_level) {
 								case _zeitbild.frontend_web.type.enum_access_level.none: {
 									throw (new Error("this event should not be visible"));
@@ -86,6 +88,9 @@ namespace _zeitbild.frontend_web.pages.overview
 								}			
 							}
 						},
+						"action_toggle_visibility": (entry) => {
+							widget_weekview.toggle_visibility(entry.id);
+						},
 					}
 				);
 				await widget_sources.load(target_element.querySelector("#overview-pane-left"));
@@ -136,7 +141,7 @@ namespace _zeitbild.frontend_web.pages.overview
 				};
 				// listview
 				{
-					const widget = (
+					widget_listview = (
 						new _zeitbild.frontend_web.widgets.listview.class_widget_listview(
 							get_entries,
 							{
@@ -157,11 +162,11 @@ namespace _zeitbild.frontend_web.pages.overview
 							}
 						)
 					);
-					await widget.load(target_element.querySelector("#overview-pane-right-listview"));
+					await widget_listview.load(target_element.querySelector("#overview-pane-right-listview"));
 				}
 				// weekview
 				{
-					const widget = (
+					widget_weekview = (
 						new _zeitbild.frontend_web.widgets.weekview.class_widget_weekview(
 							get_entries,
 							{
@@ -182,7 +187,7 @@ namespace _zeitbild.frontend_web.pages.overview
 							}
 						)
 					);
-					await widget.load(target_element.querySelector("#overview-pane-right-weekview"));
+					await widget_weekview.load(target_element.querySelector("#overview-pane-right-weekview"));
 				}
 			}
 			return Promise.resolve<void>(undefined);

source/style/common.css

@@ -1,4 +0,0 @@
-.tableview-sources-entry:not(.tableview-sources-entry-active)
-{
-	filter: saturate(0);
-}

source/style/main.css

@@ -43,7 +43,7 @@ a:hover
 	transition: 1s ease color;
 }
 
-input,select
+input,select,textarea
 {
 	padding: 4px;
 }
@@ -55,7 +55,7 @@ button
 	cursor: pointer;
 }
 
-input,select,button
+input,select,textarea,button
 {
 	background-color: hsl(0, 0%, 0%);
 	color: hsl(0, 0%, 100%);

source/style/plankton.css

@@ -36,6 +36,11 @@
 
 .plankton_input_group_field textarea
 {
-	min-width: 250px;
+	min-width: 350px;
-	min-height: 75px;
+	min-height: 200px;
+}
+
+.plankton_input_soft_setter
+{
+	vertical-align: top;
 }

source/style/widget-sources.css

@@ -10,5 +10,43 @@
 {
 	margin: 8px;
 	padding: 4px;
+}
+
+.sources-entry-head
+{
 	cursor: pointer;
 }
+
+.sources-entry-body
+{
+	display: block;
+	transition: max-height ease 0.5s;
+}
+
+.sources-entry-body > ul
+{
+	list-style-type: none;
+	padding: 0;
+	margin-left: 8px;
+	margin-bottom: 8px;
+}
+
+.sources-entry-body > ul > li
+{
+	/*
+	display: block;
+	 */
+	margin-top: 8px;
+	cursor: pointer;
+}
+
+.sources-entry:not(.sources-entry-open) > .sources-entry-head {}
+.sources-entry:not(.sources-entry-open) > .sources-entry-body {max-height: 0; overflow: hidden;}
+
+.sources-entry.sources-entry-open > .sources-entry-head {}
+.sources-entry.sources-entry-open > .sources-entry-body {max-height: 240px; overflow: auto;}
+
+.sources-entry-hidden
+{
+	filter: saturate(0);
+}

source/style/widget-weekview.css

@@ -45,6 +45,11 @@
 	outline: 2px solid hsl(0, 0%, 100%);
 }
 
+.weekview-cell-hidden
+{
+	display: none;
+}
+
 .weekview-day
 {
 	font-size: 0.75em;

source/widgets/listview/logic.ts

@@ -144,7 +144,15 @@ namespace _zeitbild.frontend_web.widgets.listview
 											{
 												"name_value": entry.event_object.name,
 												"calendar_value": entry.calendar_name,
-												"when_value": _zeitbild.frontend_web.helpers.timespan_format(entry.event_object.begin, entry.event_object.end),
+												"when_value": lib_plankton.pit.timespan_format(
+													entry.event_object.begin,
+													entry.event_object.end,
+													{
+														"timezone_indicator": lib_plankton.translate.get("common.timezone_indicator"),
+														"adjust_to_ce": true,
+														"show_timezone": false,
+													}
+												),
 												"location_label": lib_plankton.translate.get("event.location"),
 												"location_extra_classes": (
 													(entry.event_object.location === null)

source/widgets/sources/logic.ts

@@ -27,7 +27,12 @@ namespace _zeitbild.frontend_web.widgets.sources
 		
 		/**
 		 */
-		private action_select : ((entry : type_entry) => void);
+		private action_open : ((entry : type_entry) => void);
+		
+		
+		/**
+		 */
+		private action_toggle_visibility : ((entry : type_entry) => void);
 		
 		
 		/**
@@ -35,13 +40,15 @@ namespace _zeitbild.frontend_web.widgets.sources
 		public constructor(
 			entries : Array<type_entry>,
 			options : {
-				action_select ?: ((entry : type_entry) => void);
+				action_open ?: ((entry : type_entry) => void);
+				action_toggle_visibility ?: ((entry : type_entry) => void);
 			} = {}
 		)
 		{
 			options = Object.assign(
 				{
-					"action_select": (calendar_id) => {},
+					"action_open": (calendar_id) => {},
+					"action_toggle_visibility": (calendar_id) => {},
 				},
 				options
 			);
@@ -55,7 +62,8 @@ namespace _zeitbild.frontend_web.widgets.sources
 					this.data[key] = entry;
 				}
 			);
-			this.action_select = options.action_select;
+			this.action_open = options.action_open;
+			this.action_toggle_visibility = options.action_toggle_visibility;
 		}
 		
 		
@@ -82,9 +90,17 @@ namespace _zeitbild.frontend_web.widgets.sources
 											"entry",
 											{
 												"name": entry.name,
+												"label_toggle": lib_plankton.string.coin(
+													"{{show}}/{{hide}}",
+													{
+														"show": lib_plankton.translate.get("common.show"),
+														"hide": lib_plankton.translate.get("common.hide"),
+													}
+												),
+												"label_edit": lib_plankton.translate.get("common.edit"),
 												// "access_level": entry.access_level, // TODO
 												// TODO centralize
-												"color": lib_plankton.color.output_hex(
+												"color_head": lib_plankton.color.output_hex(
 													lib_plankton.color.give_generic(
 														(entry.id - 1),
 														{
@@ -93,6 +109,15 @@ namespace _zeitbild.frontend_web.widgets.sources
 														}
 													),
 												),
+												"color_body": lib_plankton.color.output_hex(
+													lib_plankton.color.give_generic(
+														(entry.id - 1),
+														{
+															"saturation": 0.375,
+															"value": 0.25,
+														}
+													),
+												),
 												"rel": key,
 											}
 										);
@@ -104,14 +129,38 @@ namespace _zeitbild.frontend_web.widgets.sources
 					),
 				}
 			);
-			target_element.querySelectorAll(".sources-entry").forEach(
+			target_element.querySelectorAll(".sources-entry-head").forEach(
 				(element) => {
 					element.addEventListener(
 						"click",
 						(event) => {
-							const key : string = element.getAttribute("rel");
+							element.parentElement.classList.toggle("sources-entry-open");
+						}
+					);
+				}
+			);
+			target_element.querySelectorAll(".sources-entry-toggle").forEach(
+				(element) => {
+					element.addEventListener(
+						"click",
+						() => {
+							const key : string = element.parentElement.parentElement.parentElement.getAttribute("rel");
 							const entry : type_entry = this.data[key];
-							this.action_select(entry);
+							element.parentElement.parentElement.parentElement.classList.toggle("sources-entry-hidden");
+							element.parentElement.parentElement.parentElement.classList.toggle("sources-entry-open", false);
+							this.action_toggle_visibility(entry);
+						}
+					);
+				}
+			);
+			target_element.querySelectorAll(".sources-entry-edit").forEach(
+				(element) => {
+					element.addEventListener(
+						"click",
+						(event) => {
+							const key : string = element.parentElement.parentElement.parentElement.getAttribute("rel");
+							const entry : type_entry = this.data[key];
+							this.action_open(entry);
 						}
 					);
 				}

source/widgets/sources/templates/entry.html.tpl

@@ -1 +1,11 @@
-			<li class="sources-entry" style="background-color: {{color}}" rel="{{rel}}">{{name}}</li>
+			<li class="sources-entry" style="background-color: {{color_head}}" rel="{{rel}}">
+				<div class="sources-entry-head">
+					<span>{{name}}</span>
+				</div>
+				<div class="sources-entry-body" style="background-color: {{color_body}}">
+					<ul>
+						<li class="sources-entry-action sources-entry-toggle">{{label_toggle}}</li>
+						<li class="sources-entry-action sources-entry-edit">{{label_edit}}</li>
+					</ul>
+				</div>
+			</li>

source/widgets/weekview/logic.ts

@@ -127,65 +127,16 @@ namespace _zeitbild.frontend_web.widgets.weekview
 					lib_plankton.string.coin(
 						"{{label}}: {{value}}\n",
 						{
-							"label": lib_plankton.translate.get("event.begin"),
+							"label": lib_plankton.translate.get("event.when"),
-							"value": lib_plankton.string.coin(
+							"value": lib_plankton.pit.timespan_format(
-								"{{hour}}:{{minute}}",
+								event_object.begin,
+								event_object.end,
 								{
-									"hour": event_object.begin.time.hour.toFixed(0).padStart(2, "0"),
+									"timezone_indicator": lib_plankton.translate.get("common.timezone_indicator"),
-									"minute": event_object.begin.time.minute.toFixed(0).padStart(2, "0"),
+									"adjust_to_ce": true,
+									"show_timezone": true,
+									"omit_date": true,
 								}
-							), // TODO: outsource
-						}
-					)
-					:
-					""
-				)
-				+
-				(
-					(event_object.end !== null)
-					?
-					lib_plankton.string.coin(
-						"{{label}}: {{value}}\n",
-						{
-							"label": lib_plankton.translate.get("event.end"),
-							"value": (
-								[
-									(
-										(
-											(event_object.end.date.year !== event_object.begin.date.year)
-											||
-											(event_object.end.date.month !== event_object.begin.date.month)
-											||
-											(event_object.end.date.day !== event_object.begin.date.day)
-										)
-										?
-										lib_plankton.string.coin(
-											"{{year}}-{{month}}-{{day}}",
-											{
-												"year": event_object.end.date.year.toFixed(0).padStart(4, "0"),
-												"month": event_object.end.date.month.toFixed(0).padStart(2, "0"),
-												"day": event_object.end.date.day.toFixed(0).padStart(2, "0"),
-											}
-										)
-										:
-										null
-									),
-									(
-										(event_object.end.time !== null)
-										?
-										lib_plankton.string.coin(
-											"{{hour}}:{{minute}}",
-											{
-												"hour": event_object.end.time.hour.toFixed(0).padStart(2, "0"),
-												"minute": event_object.end.time.minute.toFixed(0).padStart(2, "0"),
-											}
-										)
-										:
-										null
-									),
-								]
-								.filter(x => (x !== null))
-								.join(",")
 							),
 						}
 					)
@@ -438,7 +389,24 @@ namespace _zeitbild.frontend_web.widgets.weekview
 					.forEach(
 						(entry) => {
 							const distance_seconds : int = (
-								lib_plankton.pit.from_datetime(entry.event_object.begin)
+								lib_plankton.pit.from_datetime(
+									/**
+									 * so that events without a start time will be put in the correct box
+									 */
+									{
+										"timezone_shift": entry.event_object.begin.timezone_shift,
+										"date": entry.event_object.begin.date,
+										"time": (
+											entry.event_object.begin.time
+											??
+											{
+												"hour": 12,
+												"minute": 0,
+												"second": 0
+											}
+										),
+									}
+								)
 								-
 								from_pit
 							);
@@ -620,13 +588,13 @@ namespace _zeitbild.frontend_web.widgets.weekview
 												{
 													"extra_classes": (
 														[""]
-														.concat(cell.today ? ["calendar-cell-today"] : [])
+														.concat(cell.today ? ["weekview-cell-today"] : [])
 														.join(" ")
 													),
 													"title": lib_plankton.call.convey(
 														cell.pit,
 														[
-															lib_plankton.pit.to_datetime,
+															lib_plankton.pit.to_datetime_ce,
 															(x : lib_plankton.pit.type_datetime) => lib_plankton.string.coin(
 																"{{year}}-{{month}}-{{day}}",
 																{
@@ -640,7 +608,7 @@ namespace _zeitbild.frontend_web.widgets.weekview
 													"day": lib_plankton.call.convey(
 														cell.pit,
 														[
-															lib_plankton.pit.to_datetime,
+															lib_plankton.pit.to_datetime_ce,
 															(x : lib_plankton.pit.type_datetime) => lib_plankton.string.coin(
 																"{{day}}",
 																{
@@ -654,7 +622,7 @@ namespace _zeitbild.frontend_web.widgets.weekview
 													"rel": lib_plankton.call.convey(
 														cell.pit,
 														[
-															lib_plankton.pit.to_datetime,
+															lib_plankton.pit.to_datetime_ce,
 															(x : lib_plankton.pit.type_datetime) => lib_plankton.string.coin(
 																"{{year}}-{{month}}-{{day}}",
 																{
@@ -792,7 +760,7 @@ namespace _zeitbild.frontend_web.widgets.weekview
 						// do nothing
 					}
 					else {
-						context.querySelectorAll(".calendar-cell-regular").forEach(
+						context.querySelectorAll(".weekview-cell-regular").forEach(
 							(element) => {
 								element.addEventListener(
 									"click",
@@ -822,7 +790,7 @@ namespace _zeitbild.frontend_web.widgets.weekview
 						// do nothing
 					}
 					else {
-						context.querySelectorAll(".calendar-event_entry").forEach(
+						context.querySelectorAll(".weekview-event_entry").forEach(
 							(element) => {
 								element.addEventListener(
 									"click",
@@ -861,6 +829,28 @@ namespace _zeitbild.frontend_web.widgets.weekview
 		}
 		
 		
+		/**
+		 */
+		public toggle_visibility(
+			calendar_id: _zeitbild.frontend_web.type.calendar_id
+		) : void
+		{
+			this.container.querySelectorAll(".weekview-event_entry").forEach(
+				(element) => {
+					const rel : string = element.getAttribute("rel");
+					const parts : Array<string> = rel.split("/");
+					const calendar_id_ : _zeitbild.frontend_web.type.calendar_id = parseInt(parts[0]);
+					if (! (calendar_id === calendar_id_)) {
+						// do nothing
+					}
+					else {
+						element.classList.toggle("weekview-cell-hidden");
+					}
+				}
+			);
+		}
+		
+		
 		/**
 		 * [implementation]
 		 */

todo.md

@@ -0,0 +1,2 @@
+- unterschiedliche Ansichten für Betrachten und Bearbeiten von Terminen und Kalendern
+- zu verwendende Zeitzone nicht fest auf mitteleuropäische setzen

tools/build

@@ -12,7 +12,7 @@ def main():
 		"-o",
 		"--output-directory",
 		type = str,
-		default = "/tmp/zeitbild-frontend-web",
+		default = "/tmp/dali",
 		metavar = "<output-directory>",
 		help = "output directory",
 	)

tools/deploy

@@ -28,7 +28,7 @@ def main():
 		"--build-directory",
 		type = str,
 		dest = "build_directory",
-		default = "build",
+		default = "/tmp/dali",
 		metavar = "<build-directory>",
 		help = "directory to where the build was put",
 	)