aboutsummaryrefslogtreecommitdiff
path: root/static
diff options
context:
space:
mode:
Diffstat (limited to 'static')
-rw-r--r--static/components/edit-rrule.ts12
-rw-r--r--static/components/popup-element.ts13
-rw-r--r--static/components/tab-group-element.ts11
-rw-r--r--static/components/vevent-block.ts4
-rw-r--r--static/components/vevent-description.ts4
-rw-r--r--static/components/vevent-edit.ts25
-rw-r--r--static/components/vevent.ts58
-rw-r--r--static/event-creator.ts2
-rw-r--r--static/script.ts28
-rw-r--r--static/server_connect.ts5
-rw-r--r--static/vevent.ts29
11 files changed, 145 insertions, 46 deletions
diff --git a/static/components/edit-rrule.ts b/static/components/edit-rrule.ts
index a361bdee..8575d9bc 100644
--- a/static/components/edit-rrule.ts
+++ b/static/components/edit-rrule.ts
@@ -11,8 +11,8 @@ import { RecurrenceRule } from '../vevent'
*/
class EditRRule extends ComponentVEvent {
- constructor(uid?: string) {
- super(uid);
+ constructor(uid?: string, instance?: string) {
+ super(uid, instance);
if (!this.template) {
throw 'vevent-edit-rrule template required';
@@ -25,7 +25,7 @@ class EditRRule extends ComponentVEvent {
for (let el of this.querySelectorAll('[name]')) {
el.addEventListener('input', () => {
// console.log(this);
- let data = vcal_objects.get(this.uid)!;
+ let data = this.getData()!;
let rrule = data.getProperty('rrule')
if (!rrule) {
console.warn('RRUle missing from object');
@@ -41,9 +41,9 @@ class EditRRule extends ComponentVEvent {
}
}
- connectedCallback() {
- this.redraw(vcal_objects.get(this.uid)!)
- }
+ // connectedCallback() {
+ // this.redraw(this.getData()!)
+ // }
redraw(data: VEvent) {
diff --git a/static/components/popup-element.ts b/static/components/popup-element.ts
index 3300f885..5dc627d0 100644
--- a/static/components/popup-element.ts
+++ b/static/components/popup-element.ts
@@ -15,12 +15,12 @@ class PopupElement extends ComponentVEvent {
* the top, and allowing global keyboard bindings to affect it. */
static activePopup: PopupElement | null = null;
- constructor(uid?: string) {
- super(uid);
+ constructor(uid?: string, instance?: string) {
+ super(uid, instance);
/* TODO populate remaining (??) */
- let obj = vcal_objects.get(this.uid);
+ let obj = this.getData();
if (obj && obj.calendar) {
this.dataset.calendar = obj.calendar;
}
@@ -48,8 +48,6 @@ class PopupElement extends ComponentVEvent {
let template = document.getElementById('popup-template') as HTMLTemplateElement
let body = (template.content.cloneNode(true) as DocumentFragment).firstElementChild!;
- let uid = this.uid;
-
/* nav bar */
let nav = body.getElementsByClassName("popup-control")[0] as HTMLElement;
bind_popup_control(nav);
@@ -61,7 +59,8 @@ class PopupElement extends ComponentVEvent {
maximize_btn.addEventListener('click', () => this.maximize());
let remove_btn = body.querySelector('.popup-control .remove-button') as HTMLButtonElement
- remove_btn.addEventListener('click', () => remove_event(uid));
+ /* TODO repeating removal */
+ remove_btn.addEventListener('click', () => remove_event(this.uid));
/* end nav bar */
this.replaceChildren(body);
@@ -147,7 +146,7 @@ class PopupElement extends ComponentVEvent {
*/
function setup_popup_element(ev: VEvent): PopupElement {
let uid = ev.getProperty('uid');
- let popup = new PopupElement(uid);
+ let popup = new PopupElement(uid, ev.getProperty('dtstart')?.format('~Y-~m-~dT~H:~M:~S'));
ev.register(popup);
/* TODO propper way to find popup container */
(document.querySelector('.days') as Element).appendChild(popup);
diff --git a/static/components/tab-group-element.ts b/static/components/tab-group-element.ts
index e90997e9..11949870 100644
--- a/static/components/tab-group-element.ts
+++ b/static/components/tab-group-element.ts
@@ -26,8 +26,8 @@ class TabGroupElement extends ComponentVEvent {
tabs: HTMLElement[] = [];
tabLabels: HTMLElement[] = [];
- constructor(uid?: string) {
- super(uid);
+ constructor(uid?: string, instance?: string) {
+ super(uid!, instance!);
this.menu = makeElement('div', {}, {
role: 'tablist',
@@ -43,7 +43,8 @@ class TabGroupElement extends ComponentVEvent {
if (!this.has_rrule_tab()) {
/* Note that EditRRule register itself to be updated on changes
to the event */
- this.addTab(new EditRRule(data.getProperty('uid')),
+ this.addTab(new EditRRule(data.getProperty('uid'),
+ data.getProperty('dtstart')?.format('~Y-~m-~dT~H:~M:~S')),
"↺", "Upprepningar");
}
} else {
@@ -71,7 +72,7 @@ class TabGroupElement extends ComponentVEvent {
}
/* redraw might add or remove tabs depending on our data, so call it here */
- this.redraw(vcal_objects.get(this.uid)!);
+ this.redraw(this.getData()!);
/* All tabs should now be ready, focus the first one */
if (this.tabLabels.length > 0) {
@@ -144,7 +145,7 @@ class TabGroupElement extends ComponentVEvent {
if (tab.firstChild) {
let child = tab.firstChild as HTMLElement;
if (isRedrawable(child)) {
- vcal_objects.get(this.uid)?.unregister(child)
+ this.getData()?.unregister(child)
}
}
diff --git a/static/components/vevent-block.ts b/static/components/vevent-block.ts
index 8cf61d30..f97a0e54 100644
--- a/static/components/vevent-block.ts
+++ b/static/components/vevent-block.ts
@@ -10,8 +10,8 @@ import { parseDate, to_local } from '../lib'
A grahpical block in the week view.
*/
class ComponentBlock extends ComponentVEvent {
- constructor(uid?: string) {
- super(uid);
+ constructor(uid?: string, instance?: string) {
+ super(uid!, instance!);
if (!this.template) {
throw 'vevent-block template required';
diff --git a/static/components/vevent-description.ts b/static/components/vevent-description.ts
index f0d224be..efa619c4 100644
--- a/static/components/vevent-description.ts
+++ b/static/components/vevent-description.ts
@@ -9,8 +9,8 @@ import { formatters } from '../formatters'
*/
class ComponentDescription extends ComponentVEvent {
- constructor(uid?: string) {
- super(uid);
+ constructor(uid?: string, instance?: string) {
+ super(uid!, instance!);
if (!this.template) {
throw 'vevent-description template required';
}
diff --git a/static/components/vevent-edit.ts b/static/components/vevent-edit.ts
index bf72678c..108146a3 100644
--- a/static/components/vevent-edit.ts
+++ b/static/components/vevent-edit.ts
@@ -14,8 +14,8 @@ import { to_boolean, gensym } from '../lib'
*/
class ComponentEdit extends ComponentVEvent {
- constructor(uid?: string) {
- super(uid);
+ constructor(uid?: string, instance?: string) {
+ super(uid, instance);
if (!this.template) {
throw 'vevent-edit template required';
@@ -39,10 +39,10 @@ class ComponentEdit extends ComponentVEvent {
/* Edit tab is rendered here. It's left blank server-side, since
it only makes sense to have something here if we have javascript */
- let data = vcal_objects.get(this.uid)
+ let data = this.getData()
if (!data) {
- throw `Data missing for uid ${this.dataset.uid}.`
+ throw `Data missing for uid ${this.getKey()}.`
}
@@ -59,7 +59,7 @@ class ComponentEdit extends ComponentVEvent {
el.addEventListener('change', (e) => {
let v = (e.target as HTMLSelectElement).selectedOptions[0].value
- let obj = vcal_objects.get(this.uid)!
+ let obj = this.getData()!
obj.calendar = v;
});
}
@@ -70,7 +70,7 @@ class ComponentEdit extends ComponentVEvent {
for (let el of this.querySelectorAll("[data-property]")) {
// console.log(el);
el.addEventListener('input', (e) => {
- let obj = vcal_objects.get(this.uid)
+ let obj = this.getData()
// console.log(el, e);
if (obj === undefined) {
throw 'No object with uid ' + this.uid
@@ -117,18 +117,25 @@ class ComponentEdit extends ComponentVEvent {
/* TODO unselecting and reselecting this checkbox deletes all entered data.
Cache it somewhere */
if (has_repeats.checked) {
- vcal_objects.get(this.uid)!.setProperty('rrule', new RecurrenceRule())
+ this.getData()!.setProperty('rrule', new RecurrenceRule())
} else {
/* TODO is this a good way to remove a property ? */
- vcal_objects.get(this.uid)!.setProperty('rrule', undefined)
+ this.getData()!.setProperty('rrule', undefined)
}
})
}
let submit = this.querySelector('form') as HTMLFormElement
+ /* TODO If start or end DATE is changed, only allow THIS */
+ /* if only time component was changed, allow all */
submit.addEventListener('submit', (e) => {
console.log(submit, e);
- create_event(vcal_objects.get(this.uid)!);
+ // submit button pressed (e.submitter);
+ let submit_type = 'all';
+ if (e.submitter) {
+ submit_type = e.submitter.dataset.key!;
+ }
+ create_event(submit_type, this.getData()!);
e.preventDefault();
return false;
diff --git a/static/components/vevent.ts b/static/components/vevent.ts
index 5852a2ff..abf0f4c0 100644
--- a/static/components/vevent.ts
+++ b/static/components/vevent.ts
@@ -12,12 +12,13 @@ abstract class ComponentVEvent extends HTMLElement {
template: HTMLTemplateElement | null
uid: string
+ instance: string | null
- constructor(uid?: string) {
+ constructor(uid?: string, instance?: string) {
super();
this.template = document.getElementById(this.tagName.toLowerCase()) as HTMLTemplateElement | null
- let real_uid;
+ let real_uid, real_instance;
if (uid) {
// console.log('Got UID directly');
@@ -29,6 +30,7 @@ abstract class ComponentVEvent extends HTMLElement {
// console.log('Had UID as direct attribute');
real_uid = this.dataset.uid;
} else {
+ /* TODO when is this case relevant? */
let el = this.closest('[data-uid]')
if (el) {
// console.log('Found UID higher up in the tree');
@@ -48,7 +50,32 @@ abstract class ComponentVEvent extends HTMLElement {
this.uid = real_uid;
this.dataset.uid = real_uid;
- vcal_objects.get(this.uid)?.register(this);
+ if (instance) {
+ real_instance = instance
+ } else {
+ if (this.dataset.instance) {
+ real_instance = this.dataset.instance
+ } else {
+ let el = this.closest('[data-instance]')
+ if (el) {
+ real_instance = (el as HTMLElement).dataset.instance
+ if (real_instance === undefined) {
+ real_instance = null;
+ }
+ } else {
+ real_instance = null
+ }
+ }
+ }
+ this.instance = real_instance;
+ if (real_instance) {
+ this.dataset.instance = real_instance;
+ }
+
+ /* TODO */
+ /* Here, choose different rules depending on if we are repeating or not */
+
+ vcal_objects.get(this.getKey())?.register(this);
/* We DON'T have a redraw here in the general case, since the
HTML rendered server-side should be fine enough for us.
@@ -56,12 +83,27 @@ abstract class ComponentVEvent extends HTMLElement {
should take care of that some other way */
}
- connectedCallback() {
+ getKey(): string {
let uid = this.dataset.uid
- if (uid) {
- let v = vcal_objects.get(uid)
- if (v) this.redraw(v);
- }
+ // let instance_id = ev.getProperty('dtstart')!.format('~Y-~m-~dT~H:~M:~S')
+ let instance = this.dataset.instance
+ if (!uid) throw new Error("UID missing");
+ let key = uid;
+ /* NOTE proper composite keys would be nice, since this can collide with
+ a regular key. However, javascript's Map doesn't support lists (or
+ object) as keys by default. */
+ if (instance) key += '---' + instance;
+ return key;
+ }
+
+ /* This return different object for different instances */
+ getData(): VEvent | undefined {
+ return vcal_objects.get(this.getKey())
+ }
+
+ connectedCallback() {
+ let v = this.getData();
+ if (v) this.redraw(v);
}
abstract redraw(data: VEvent): void
diff --git a/static/event-creator.ts b/static/event-creator.ts
index 0f2c42b4..6ce04d78 100644
--- a/static/event-creator.ts
+++ b/static/event-creator.ts
@@ -69,7 +69,7 @@ class EventCreator {
that.ev.calendar = window.default_calendar;
// let ev_block = document.createElement('vevent-block') as ComponentBlock;
- let ev_block = new ComponentBlock(that.ev.getProperty('uid'));
+ let ev_block = new ComponentBlock(that.ev.getProperty('uid'), that.ev.getProperty('dtstart')?.format('~Y-~m-~dT~H:~M:~S'));
ev_block.classList.add('generated');
that.event = ev_block;
that.ev.register(ev_block);
diff --git a/static/script.ts b/static/script.ts
index ec771773..79365e7d 100644
--- a/static/script.ts
+++ b/static/script.ts
@@ -20,12 +20,29 @@ window.addEventListener('load', function() {
*/
// let json_objects_el = document.getElementById('json-objects');
- let div = document.getElementById('xcal-data')!;
- let vevents = div.firstElementChild!.children;
- for (let vevent of vevents) {
- let ev = xml_to_vcal(vevent);
- vcal_objects.set(ev.getProperty('uid'), ev)
+ {/* Load "regular" (non-repeating) events */
+ let div = document.getElementById('xcal-data')!;
+ let vevents = div.firstElementChild!.children;
+
+ for (let vevent of vevents) {
+ let ev = xml_to_vcal(vevent);
+ vcal_objects.set(ev.getProperty('uid'), ev)
+ }
+ }
+
+ {/* Load repeating events */
+ let div = document.getElementById('xcal-data-repeating')!;
+ let vevents = div.firstElementChild!.children;
+ for (let vevent of vevents) {
+ let ev = xml_to_vcal(vevent);
+ /* NOTE manuall calculation of key, since getKey is method of vevent
+ component, not the abstract vevent */
+ let instance_id = ev.getProperty('dtstart')!
+ .format('~Y-~m-~dT~H:~M:~S')
+ let key = ev.getProperty('uid') + '---' + instance_id
+ vcal_objects.set(key, ev);
+ }
}
@@ -38,6 +55,7 @@ window.addEventListener('load', function() {
throw "UID required"
}
event_calendar_mapping.set(uid, calendar_name);
+ /* TODO this fails for repeating events */
let obj = vcal_objects.get(uid);
if (obj) obj.calendar = calendar_name
}
diff --git a/static/server_connect.ts b/static/server_connect.ts
index d1a544eb..d2617bf9 100644
--- a/static/server_connect.ts
+++ b/static/server_connect.ts
@@ -55,7 +55,7 @@ async function remove_event(uid: uid) {
// ];
// }
-async function create_event(event: VEvent) {
+async function create_event(submit_type: string, event: VEvent) {
// let xml = event.getElementsByTagName("icalendar")[0].outerHTML
let calendar = event.calendar;
@@ -67,6 +67,9 @@ async function create_event(event: VEvent) {
console.log('calendar=', calendar/*, xml*/);
let data = new URLSearchParams();
+
+ data.append('submit_type', submit_type);
+
data.append("cal", calendar);
// data.append("data", xml);
diff --git a/static/vevent.ts b/static/vevent.ts
index 6a2c6f0f..a7f67a7f 100644
--- a/static/vevent.ts
+++ b/static/vevent.ts
@@ -555,3 +555,32 @@ function xml_to_vcal(xml: Element): VEvent {
return new VEvent(property_map, component_list)
}
+
+
+class MultiInstanceVEvent extends VEvent {
+
+ private base_event: VEvent | null = null;
+ private overlayProperties: Map<string, VEventValue | VEventValue[]>;
+
+ constructor(parent: VEvent) {
+ super();
+
+ this.base_event = parent;
+
+ this.overlayProperties = new Map
+
+ /* Add this to alternative set of parent */
+ }
+
+ setProperty(key: string, value: any, type?: ical_type) {
+ /* TODO type resolution a setPropertyInternal */
+ this.overlayProperties.set(key.toUpperCase(), value);
+ }
+
+ getProperty(key: string): any | any[] | undefined {
+ let a = this.overlayProperties.get(key.toUpperCase())
+ if (a !== undefined) return a
+ return super.getProperty(key)
+ }
+
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 17:45:52 +0200