From 3aafa9c03afa4a3acf126c33a439eac2396ca827 Mon Sep 17 00:00:00 2001 From: lodewiges Date: Mon, 14 Oct 2024 01:29:48 +0200 Subject: [PATCH 1/8] first version --- app/constants.js | 3 +-- mirage/factories/activity.js | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/constants.js b/app/constants.js index 1d3631bf6..6a6563134 100644 --- a/app/constants.js +++ b/app/constants.js @@ -22,8 +22,7 @@ const ActivityCategories = [ 'Algemeen', 'Sociëteit', 'Vorming', - 'Dinsdagkring', - 'Woensdagkring', + 'Kring', 'ChOOSE', 'IFES', 'OZON', diff --git a/mirage/factories/activity.js b/mirage/factories/activity.js index 27014874f..a91989c4e 100644 --- a/mirage/factories/activity.js +++ b/mirage/factories/activity.js @@ -16,8 +16,7 @@ export default Factory.extend({ 'algemeen', 'sociëteit', 'vorming', - 'dinsdagkring', - 'woensdagkring', + 'kring', 'choose', 'ifes', 'ozon', From b8378eef65e0d37a594deca86ce2d776f1de8f19 Mon Sep 17 00:00:00 2001 From: Jorai Geertsema Date: Fri, 21 Feb 2025 00:54:51 +0100 Subject: [PATCH 2/8] Remove catogories from ical link --- app/controllers/activities/ical.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/activities/ical.js b/app/controllers/activities/ical.js index ae3fad973..e22389f66 100644 --- a/app/controllers/activities/ical.js +++ b/app/controllers/activities/ical.js @@ -35,11 +35,11 @@ export default class ActivitiesIcalController extends Controller { } get iCalURL() { - return `${window.location.origin}${this.iCalBase}&${this.categoriesParams}`; + return `${window.location.origin}${this.iCalBase}`; } get webcalURL() { - return `webcal://${window.location.host}${this.iCalBase}&${this.categoriesParams}`; + return `webcal://${window.location.host}${this.iCalBase}`; } _activityCategoryToOption(activityCategory) { From e904abeaa133ee591ddea3eed4d834e0c412a6df Mon Sep 17 00:00:00 2001 From: Jorai Geertsema Date: Mon, 24 Feb 2025 10:25:05 +0100 Subject: [PATCH 3/8] Trying to save the categories locally --- app/controllers/activities/ical.js | 29 ++++++++++++++++++++++------- app/models/user.js | 1 + app/templates/activities/ical.hbs | 12 +++++++++--- 3 files changed, 32 insertions(+), 10 deletions(-) diff --git a/app/controllers/activities/ical.js b/app/controllers/activities/ical.js index e22389f66..f493acfb8 100644 --- a/app/controllers/activities/ical.js +++ b/app/controllers/activities/ical.js @@ -1,13 +1,12 @@ -import Controller from '@ember/controller'; +import EditController from 'amber-ui/controllers/application/edit'; // eslint-disable-next-line ember/no-computed-properties-in-native-classes import { computed } from '@ember/object'; import { inject as service } from '@ember/service'; import { ActivityCategories } from 'amber-ui/constants'; import { tracked } from '@glimmer/tracking'; -export default class ActivitiesIcalController extends Controller { +export default class ActivitiesIcalController extends EditController { @service session; - @tracked activityCategoryOptions; constructor() { @@ -24,10 +23,9 @@ export default class ActivitiesIcalController extends Controller { @computed('activityCategoryOptions.@each.checked') get categoriesParams() { - const selected = this.activityCategoryOptions - .filter((category) => category.checked) - .map((category) => category.value); - return `categories=${selected.join(',')}`; + return this.activityCategoryOptions + .filter(category => category.checked) + .map(category => category.value); } get iCalBase() { @@ -49,4 +47,21 @@ export default class ActivitiesIcalController extends Controller { checked: true, }; } + + saveCategories = () => { + const { currentUser } = this.session; + const selectedCategories = this.categoriesParams; + + currentUser.set('icalCategories', selectedCategories); + + return currentUser.save() + .then(() => { + console.log('Categories saved successfully!'); + }) + .catch((error) => { + console.error('Failed to save categories:', error); + }); + }; + + } diff --git a/app/models/user.js b/app/models/user.js index 2688bb730..1049c8dcf 100644 --- a/app/models/user.js +++ b/app/models/user.js @@ -42,6 +42,7 @@ export default class User extends Model { // Security properties @attr otpRequired; @attr icalSecretKey; + @attr icalCategories; @attr webdavSecretKey; @attr password; diff --git a/app/templates/activities/ical.hbs b/app/templates/activities/ical.hbs index c0da45e18..70dc23ee8 100644 --- a/app/templates/activities/ical.hbs +++ b/app/templates/activities/ical.hbs @@ -17,8 +17,9 @@ uitgelegd.

+
- {{#each activityCategoryOptions as |opt|}} + {{#each this.activityCategoryOptions as |opt|}}
{{/each}} +
+ +
@@ -51,8 +57,8 @@ anderen.
-

{{iCalURL}}

+

{{this.iCalURL}}

- \ No newline at end of file + From 4b6c18cf0bf8ab1fbfb193cbb8fabf94ddc5ae61 Mon Sep 17 00:00:00 2001 From: Lodewiges Date: Mon, 3 Nov 2025 21:34:18 +0100 Subject: [PATCH 4/8] add genootschapen --- app/constants.js | 3 +-- mirage/factories/activity.js | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/constants.js b/app/constants.js index 6a6563134..cdebad6e5 100644 --- a/app/constants.js +++ b/app/constants.js @@ -27,11 +27,10 @@ const ActivityCategories = [ 'IFES', 'OZON', 'Disputen', - 'Kiemgroepen', + 'Genootschapen', 'Huizen', 'Extern', 'Eerstejaars', - 'Curiositates', ]; const OpenQuestionTypes = ['text', 'textarea', 'number']; diff --git a/mirage/factories/activity.js b/mirage/factories/activity.js index a91989c4e..277f14dd5 100644 --- a/mirage/factories/activity.js +++ b/mirage/factories/activity.js @@ -21,10 +21,9 @@ export default Factory.extend({ 'ifes', 'ozon', 'disputen', - 'kiemgroepen', + 'genootschapen', 'huizen', 'extern', - 'curiositates', ]), afterCreate(activity, server) { From 440ec7f936cc5caadc8c9cbc9ae8d175abacbf6f Mon Sep 17 00:00:00 2001 From: Lodewiges Date: Mon, 3 Nov 2025 23:32:22 +0100 Subject: [PATCH 5/8] edit message --- app/templates/activities/ical.hbs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/templates/activities/ical.hbs b/app/templates/activities/ical.hbs index 70dc23ee8..220621137 100644 --- a/app/templates/activities/ical.hbs +++ b/app/templates/activities/ical.hbs @@ -7,9 +7,8 @@

- Als je de agenda's die je wilt volgen wilt aanpassen, dien je eerst - in je agenda-programma je oude Alpha-agenda te verwijderen voordat - je de nieuwe agenda-url toevoegt. + Als je de agenda's die je wilt volgen wilt aanpassen, update die automatisch + de bestaande agenda's in je agenda-applicatie.

Hoe je de agenda in Google Calendar importeert staat From 7a53472a446160c75bd797183237874e1e99dddc Mon Sep 17 00:00:00 2001 From: Lodewiges Date: Tue, 4 Nov 2025 00:08:18 +0100 Subject: [PATCH 6/8] fix lint --- app/controllers/activities/ical.js | 11 +++++------ app/templates/activities/ical.hbs | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/controllers/activities/ical.js b/app/controllers/activities/ical.js index f493acfb8..b9c9ae188 100644 --- a/app/controllers/activities/ical.js +++ b/app/controllers/activities/ical.js @@ -24,8 +24,8 @@ export default class ActivitiesIcalController extends EditController { @computed('activityCategoryOptions.@each.checked') get categoriesParams() { return this.activityCategoryOptions - .filter(category => category.checked) - .map(category => category.value); + .filter((category) => category.checked) + .map((category) => category.value); } get iCalBase() { @@ -53,8 +53,9 @@ export default class ActivitiesIcalController extends EditController { const selectedCategories = this.categoriesParams; currentUser.set('icalCategories', selectedCategories); - - return currentUser.save() + + return currentUser + .save() .then(() => { console.log('Categories saved successfully!'); }) @@ -62,6 +63,4 @@ export default class ActivitiesIcalController extends EditController { console.error('Failed to save categories:', error); }); }; - - } diff --git a/app/templates/activities/ical.hbs b/app/templates/activities/ical.hbs index 220621137..b52c28edf 100644 --- a/app/templates/activities/ical.hbs +++ b/app/templates/activities/ical.hbs @@ -35,7 +35,7 @@

{{/each}}
-
From 3ad73264a7fc792e70452ee379381601ea0e1b16 Mon Sep 17 00:00:00 2001 From: Lodewiges Date: Tue, 4 Nov 2025 00:47:33 +0100 Subject: [PATCH 7/8] use flash notifications for success and error --- app/controllers/activities/ical.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/activities/ical.js b/app/controllers/activities/ical.js index b9c9ae188..972225ae0 100644 --- a/app/controllers/activities/ical.js +++ b/app/controllers/activities/ical.js @@ -57,9 +57,12 @@ export default class ActivitiesIcalController extends EditController { return currentUser .save() .then(() => { - console.log('Categories saved successfully!'); + this.flashNotice.sendSuccess('Categorieën succesvol opgeslagen!'); }) .catch((error) => { + this.flashNotice.sendError( + 'Er ging iets fout bij het opslaan van je categorieën.' + ); console.error('Failed to save categories:', error); }); }; From cb4ed136fa88020f822e7534c6d12e9700bb1170 Mon Sep 17 00:00:00 2001 From: Lodewiges Date: Tue, 4 Nov 2025 00:55:57 +0100 Subject: [PATCH 8/8] fix lint --- app/controllers/activities/ical.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/activities/ical.js b/app/controllers/activities/ical.js index 972225ae0..2f2a8aced 100644 --- a/app/controllers/activities/ical.js +++ b/app/controllers/activities/ical.js @@ -60,7 +60,7 @@ export default class ActivitiesIcalController extends EditController { this.flashNotice.sendSuccess('Categorieën succesvol opgeslagen!'); }) .catch((error) => { - this.flashNotice.sendError( + this.flashNotice.sendError( 'Er ging iets fout bij het opslaan van je categorieën.' ); console.error('Failed to save categories:', error);