Resolve "Add frontend for Free/Busy model" #2975

Merged
hansegucker merged 160 commits from 928-add-frontend-for-free-busy-model into master 2025-05-06 09:28:36 +02:00
Member

Closes #928

Closes #928
Author
Member

added 4 commits

  • 61022d9b - Add FreeBusyEvent model and simple inline list for managing own FreeBusyEvents
  • 8fb5b3a0 - Move routes under persons parent route
  • 06a4c20c - Add translation strings
  • 5fe34810 - Beautify free/busy status in inline list

Compare with previous version

added 4 commits <ul><li>61022d9b - Add FreeBusyEvent model and simple inline list for managing own FreeBusyEvents</li><li>8fb5b3a0 - Move routes under persons parent route</li><li>06a4c20c - Add translation strings</li><li>5fe34810 - Beautify free/busy status in inline list</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=34889&start_sha=4fc87f0f7e90dc13e9e5794c23829ec7dc559b8b)
Author
Member

added 1 commit

  • 718a14e6 - Beautify free/busy status in inline list

Compare with previous version

added 1 commit <ul><li>718a14e6 - Beautify free/busy status in inline list</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=34890&start_sha=5fe348102a7d823a526de9a26aafdd7afc48f60c)
Author
Member

added 4 commits

  • 81ce75f5 - Re-introduce auto setting of end date
  • 103e0d25 - Add free/busy event overview page
  • f52c62f7 - Change people menu entry permissions
  • e3d9af29 - Let myFreeBusyEvents query actually only return own events

Compare with previous version

added 4 commits <ul><li>81ce75f5 - Re-introduce auto setting of end date</li><li>103e0d25 - Add free/busy event overview page</li><li>f52c62f7 - Change people menu entry permissions</li><li>e3d9af29 - Let myFreeBusyEvents query actually only return own events</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=34891&start_sha=718a14e60732ca82fcbba31eefbfc9b23f353008)
Author
Member

added 1 commit

  • 8f228e19 - Reformat

Compare with previous version

added 1 commit <ul><li>8f228e19 - Reformat</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=34892&start_sha=e3d9af2959ccb40ad14779525d5e0b3ceb78efd8)
Author
Member

marked this merge request as ready

marked this merge request as **ready**
Author
Member

assigned to @yuha

assigned to @yuha
Author
Member

assigned to @hansegucker and unassigned @yuha

assigned to @hansegucker and unassigned @yuha
Owner

requested review from @nik

requested review from @nik
Owner

I think the event color should be set depending on free/busy status (like green for free, red for busy, configurable).

I think the event color should be set depending on free/busy status (like green for free, red for busy, configurable).
Owner

Please use rules.

Please use rules.
Owner

Please use rules.

Please use rules.
Owner

Please use a permission to enforce that this mutation can be only used by users with a person.

Please use a permission to enforce that this mutation can be only used by users with a person.
Owner

What the hell? That's no valid permission in any case, also please use rules.

What the hell? That's no valid permission in any case, also please use rules.
Owner

That's not valid. Use very simple rule instead, please.

That's not valid. Use very simple rule instead, please.
Owner

Please undo and extend rule ...

Please undo and extend rule ...
Owner

Please also add screenshots.

Please also add screenshots.
Author
Member

Screenshot_from_2023-10-19_19-14-56Screenshot_from_2023-10-19_19-14-46

![Screenshot_from_2023-10-19_19-14-56](/uploads/1dd9a65072d5b3748ab259ae310be40a/Screenshot_from_2023-10-19_19-14-56.png)![Screenshot_from_2023-10-19_19-14-46](/uploads/9cb4990bc1d566d379af2765ec71d0fa/Screenshot_from_2023-10-19_19-14-46.png)
Author
Member

changed this line in version 5 of the diff

changed this line in [version 5 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=35138&start_sha=8f228e1923c5f1b86e2c8be9a28b2385d6868154#811482ac63103123119f100d70d08f515aad10d6_75_73)
Author
Member

changed this line in version 5 of the diff

changed this line in [version 5 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=35138&start_sha=8f228e1923c5f1b86e2c8be9a28b2385d6868154#811482ac63103123119f100d70d08f515aad10d6_62_60)
Author
Member

changed this line in version 5 of the diff

changed this line in [version 5 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=35138&start_sha=8f228e1923c5f1b86e2c8be9a28b2385d6868154#18c2c57fbfdb3dafd264f1e4a4eab1a8c6ab10bb_247_247)
Author
Member

changed this line in version 5 of the diff

changed this line in [version 5 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=35138&start_sha=8f228e1923c5f1b86e2c8be9a28b2385d6868154#f3b09070d21b8a3db0f111ac66567324cc2bd287_313_313)
Author
Member

changed this line in version 5 of the diff

changed this line in [version 5 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=35138&start_sha=8f228e1923c5f1b86e2c8be9a28b2385d6868154#f3b09070d21b8a3db0f111ac66567324cc2bd287_82_82)
Author
Member

added 15 commits

  • 8f228e19...078c9e11 - 9 commits from branch master
  • 6b1df51b - Let myFreeBusyEvents query actually only return own events
  • 709f9b6f - Reformat
  • 79823234 - Fix permissions
  • 99448da1 - Merge branch 'master' into 928-add-frontend-for-free-busy-model
  • bcee2813 - Adapt people menu rule
  • 98d02528 - Reformat

Compare with previous version

added 15 commits <ul><li>8f228e19...078c9e11 - 9 commits from branch <code>master</code></li><li>6b1df51b - Let myFreeBusyEvents query actually only return own events</li><li>709f9b6f - Reformat</li><li>79823234 - Fix permissions</li><li>99448da1 - Merge branch &#39;master&#39; into 928-add-frontend-for-free-busy-model</li><li>bcee2813 - Adapt people menu rule</li><li>98d02528 - Reformat</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=35138&start_sha=8f228e1923c5f1b86e2c8be9a28b2385d6868154)
Author
Member

changed this line in version 6 of the diff

changed this line in [version 6 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=35140&start_sha=98d02528fed166061cead44890edc610f3c692d8#2e44ad1f61249cf0440bea20d23bd07cc7f3a61a_1699_1705)
Author
Member

resolved all threads

resolved all threads
Author
Member

added 2 commits

Compare with previous version

added 2 commits <ul><li>b46b9ff5 - Reformat</li><li>4df216ee - Set free/busy event color depending on status</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=35140&start_sha=98d02528fed166061cead44890edc610f3c692d8)
Author
Member

marked this merge request as draft

marked this merge request as **draft**
Author
Member

FIXME: There are issues with the calendar fetching behaviour when changing weeks.

FIXME: There are issues with the calendar fetching behaviour when changing weeks.
Author
Member

resolved all threads

resolved all threads
Author
Member

added 1 commit

  • 2f071c22 - Keep all events on calendar refresh that are not fully contained in renge to be fetched

Compare with previous version

added 1 commit <ul><li>2f071c22 - Keep all events on calendar refresh that are not fully contained in renge to be fetched</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=35202&start_sha=4df216ee61ee61a191d1c845e62e6aa151b0c060)
Author
Member

marked this merge request as ready

marked this merge request as **ready**
Owner

@nik Please review the frontend according to the needs of ~"source::customer::teckids"

@nik Please review the frontend according to the needs of ~"source::customer::teckids"
Owner

Please update the changelog.

Please update the changelog.
Author
Member

marked this merge request as draft

marked this merge request as **draft**
Author
Member

TODO: Add recurrence field

TODO: Add recurrence field
Author
Member

TODO: Change overview page to calendar-based page with multiple select (persons, groups)

TODO: Change overview page to calendar-based page with multiple select (persons, groups)
Author
Member

TODO: Allow creation of own free/busy events in calendar overview

TODO: Allow creation of own free/busy events in calendar overview
Author
Member

added 51 commits

  • 2f071c22...00324c41 - 4 commits from branch master
  • 00324c41...c0518d92 - 37 earlier commits
  • 271dbc2f - Add code comments for the template in the custom event detail component
  • e3a7cd08 - Reformat
  • bf718298 - Do not set seconds when managing custom events
  • da326bb7 - Fix automatic setting of owner
  • 4d87cfb0 - Merge branch 'master' into 904-allow-for-creation-of-simple-events
  • ac8bb31a - Rename additional/custom event to personal event
  • 935940a5 - Add changelog line
  • b4ed62cc - Merge branch '904-allow-for-creation-of-simple-events' into 928-add-frontend-for-free-busy-model
  • 8a47188e - Fix migrations
  • cb05e69a - Add recurrences to free/busy events

Compare with previous version

added 51 commits <ul><li>2f071c22...00324c41 - 4 commits from branch <code>master</code></li><li>00324c41...c0518d92 - 37 earlier commits</li><li>271dbc2f - Add code comments for the template in the custom event detail component</li><li>e3a7cd08 - Reformat</li><li>bf718298 - Do not set seconds when managing custom events</li><li>da326bb7 - Fix automatic setting of owner</li><li>4d87cfb0 - Merge branch &#39;master&#39; into 904-allow-for-creation-of-simple-events</li><li>ac8bb31a - Rename additional/custom event to personal event</li><li>935940a5 - Add changelog line</li><li>b4ed62cc - Merge branch &#39;904-allow-for-creation-of-simple-events&#39; into 928-add-frontend-for-free-busy-model</li><li>8a47188e - Fix migrations</li><li>cb05e69a - Add recurrences to free/busy events</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=35466&start_sha=2f071c229239b8ecb5265b3544b2b9625cd92c99)
Author
Member

added 1 commit

  • 47cb6d94 - Use calendar view for free/busy event overview

Compare with previous version

added 1 commit <ul><li>47cb6d94 - Use calendar view for free/busy event overview</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=35549&start_sha=cb05e69ac58fb5f9810ee6d946181eab11dbc2cd)
Author
Member

added 1 commit

Compare with previous version

added 1 commit <ul><li>2ee0b1c8 - Reformat</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=35550&start_sha=47cb6d9480f7470feed3ba511ca48074c7fff7f2)
Author
Member

added 1 commit

  • 644b3d1a - Fix fetching of free/busy events in overview

Compare with previous version

added 1 commit <ul><li>644b3d1a - Fix fetching of free/busy events in overview</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=35898&start_sha=2ee0b1c82da0397a3207729dc35e99786d861e6f)
Author
Member

added 1 commit

  • c03cf8f0 - Fix fetching of free/busy events in overview

Compare with previous version

added 1 commit <ul><li>c03cf8f0 - Fix fetching of free/busy events in overview</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=35900&start_sha=644b3d1ac4be21605353c42036ce3373ac176bbf)
Author
Member

added 1 commit

  • c9a03325 - Fix fetching of free/busy events in overview

Compare with previous version

added 1 commit <ul><li>c9a03325 - Fix fetching of free/busy events in overview</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=35902&start_sha=c03cf8f0af86823e756f254c7b5460adb9631956)
Author
Member

added 1 commit

  • 4273722f - Use DateTime instead of Date for free/busy events

Compare with previous version

added 1 commit <ul><li>4273722f - Use DateTime instead of Date for free/busy events</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=35904&start_sha=c9a033256f69669b4a13046cbb8a9dd621a4c4f0)
Author
Member

added 2 commits

  • 743aa2f3 - Use DateTime instead of Date for free/busy events
  • bed2c618 - Add dialog for creating free/busy events on calendar overview page

Compare with previous version

added 2 commits <ul><li>743aa2f3 - Use DateTime instead of Date for free/busy events</li><li>bed2c618 - Add dialog for creating free/busy events on calendar overview page</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=35906&start_sha=4273722f8cb48f85b5666701ce87c72091f6b957)
Author
Member

added 3 commits

Compare with previous version

added 3 commits <ul><li>a327e352 - Change free/busy overview sidenav icon</li><li>ccf18866 - Add permission checking</li><li>4ba65098 - Reformat</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=36324&start_sha=bed2c618b13def713a789d15d6a1c2ffe1567d16)
Author
Member

added 1 commit

Compare with previous version

added 1 commit <ul><li>60fe3d9e - Update translations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=36325&start_sha=4ba65098fed580e5a22bfa799bf84ba37e837e5a)
Author
Member

added 1 commit

  • 3a8d0b42 - Show informationc card when no person/group is selected on free/busy overview page

Compare with previous version

added 1 commit <ul><li>3a8d0b42 - Show informationc card when no person/group is selected on free/busy overview page</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=36329&start_sha=60fe3d9e3701fd161e09a1095b4f3999c2ab7aef)
Author
Member

added 1 commit

  • d93946e7 - Add mobile-compatible select chip on free/busy overview

Compare with previous version

added 1 commit <ul><li>d93946e7 - Add mobile-compatible select chip on free/busy overview</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=36330&start_sha=3a8d0b4276624462efc464414214ff3e1fcd6b6f)
Author
Member

resolved all threads

resolved all threads
Author
Member

marked this merge request as ready

marked this merge request as **ready**
Author
Member

Unite creation dialogs of personal event and free/busy event (one dialog with button group to select event type)

Unite creation dialogs of personal event and free/busy event (one dialog with button group to select event type)
Author
Member

Rename to "availability event"

Rename to "availability event"
Author
Member

marked this merge request as draft

marked this merge request as **draft**
Author
Member

Generalize timetable component and the free/busy event overview component into one that allows for selection of certain groups of events inside a feed

Generalize timetable component and the free/busy event overview component into one that allows for selection of certain groups of events inside a feed
Author
Member

mentioned in merge request AlekSIS-App-Chronos!1946

mentioned in merge request AlekSIS-App-Chronos!1946
Author
Member

added 1 commit

  • da2aaf90 - Generalize free/busy event overview page

Compare with previous version

added 1 commit <ul><li>da2aaf90 - Generalize free/busy event overview page</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=36506&start_sha=d93946e70a738d52bbd3a6eb226199ac9f66944b)
Author
Member

added 102 commits

  • da2aaf90...ea7ee176 - 101 commits from branch master
  • 25a7f360 - Merge branch 'master' into 928-add-frontend-for-free-busy-model

Compare with previous version

added 102 commits <ul><li>da2aaf90...ea7ee176 - 101 commits from branch <code>master</code></li><li>25a7f360 - Merge branch &#39;master&#39; into 928-add-frontend-for-free-busy-model</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=37051&start_sha=da2aaf90c8cd4df6347d887941b21f6d923dc378)
Author
Member

added 1 commit

  • 1f60866b - Merge branch 'master' into 928-add-frontend-for-free-busy-model

Compare with previous version

added 1 commit <ul><li>1f60866b - Merge branch &#39;master&#39; into 928-add-frontend-for-free-busy-model</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=37053&start_sha=25a7f360b1a9d7b668cc5f3886014163a5d79066)
Author
Member

added 1 commit

  • 8c98ea5f - Merge branch 'master' into 928-add-frontend-for-free-busy-model

Compare with previous version

added 1 commit <ul><li>8c98ea5f - Merge branch &#39;master&#39; into 928-add-frontend-for-free-busy-model</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=37060&start_sha=1f60866be1e1dd2723e7add99121da75f184084e)
Author
Member

added 2 commits

  • e5306288 - Adapt to removal of sites framework
  • e5e2b143 - WIP: Aggregate events to free/busy feed

Compare with previous version

added 2 commits <ul><li>e5306288 - Adapt to removal of sites framework</li><li>e5e2b143 - WIP: Aggregate events to free/busy feed</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=37080&start_sha=8c98ea5f08c9f734e5d48e5485718428b0cd678a)
Owner

Should be none

Should be none
Owner

Use sets, is iterable

Use sets, is iterable
Owner

Not useful here

Not useful here
Author
Member

What do you mean exactly? Honestly, I can't really remember...

What do you mean exactly? Honestly, I can't really remember...
Owner

We wanted to move permission checks to the FreeBusy aggregator because should be either able to see all free/busy slots of a person (or resource) or none.

We wanted to move permission checks to the FreeBusy aggregator because should be either able to see all free/busy slots of a person (or resource) or none.
Author
Member

ah alright, thanks

ah alright, thanks
Author
Member

changed this line in version 26 of the diff

changed this line in [version 26 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=37270&start_sha=e5e2b143e05b414a8d990b1571926ae071d061b6#9104f183b254581056a368588770f82082815153_645_644)
Author
Member

changed this line in version 26 of the diff

changed this line in [version 26 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=37270&start_sha=e5e2b143e05b414a8d990b1571926ae071d061b6#2e44ad1f61249cf0440bea20d23bd07cc7f3a61a_1611_1605)
Author
Member

changed this line in version 26 of the diff

changed this line in [version 26 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=37270&start_sha=e5e2b143e05b414a8d990b1571926ae071d061b6#2e44ad1f61249cf0440bea20d23bd07cc7f3a61a_1712_1698)
Author
Member

added 1 commit

  • bedc8640 - WIP: Aggregate events to free/busy feed

Compare with previous version

added 1 commit <ul><li>bedc8640 - WIP: Aggregate events to free/busy feed</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=37270&start_sha=e5e2b143e05b414a8d990b1571926ae071d061b6)
Author
Member

TODO: Add title to FreeBusyEvent

TODO: Add title to FreeBusyEvent
Author
Member

added 3 commits

  • 5d585590 - Merge branch 'master' into 928-add-frontend-for-free-busy-model
  • 61961523 - Adapt to removal of sites framework
  • 316bad0b - WIP: Aggregate events to free/busy feed

Compare with previous version

added 3 commits <ul><li>5d585590 - Merge branch &#39;master&#39; into 928-add-frontend-for-free-busy-model</li><li>61961523 - Adapt to removal of sites framework</li><li>316bad0b - WIP: Aggregate events to free/busy feed</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=37350&start_sha=bedc8640a22b74702ee2ebb7a90b39341253ddbc)
Author
Member

added 1 commit

  • e8f49eff - Add title field for free/busy event

Compare with previous version

added 1 commit <ul><li>e8f49eff - Add title field for free/busy event</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=37352&start_sha=316bad0be4c268d9863eb48f0967799e8b9bbe63)
Author
Member

added 1 commit

Compare with previous version

added 1 commit <ul><li>d61dca50 - Reformat</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=37355&start_sha=e8f49effcbcaf1b1d500367557674ccea43521cd)
Author
Member

added 56 commits

  • d61dca50...2ead9fc3 - 41 commits from branch master
  • 2ead9fc3...201a0ff8 - 5 earlier commits
  • cbf48695 - Make event creation dialog more dense
  • d9bca565 - Hide recurrence field if event is not recurring
  • eec008db - Fix editing of personal events
  • eb48ad1d - Translate new fields in PersonalEventDialog
  • 271e16e8 - Merge branch 'master' into 928-add-frontend-for-free-busy-model
  • ac3352e3 - Merge branch '943-allow-for-creation-of-full-day-events' into 928-add-frontend-for-free-busy-model
  • 14bb2a30 - Hide FreeBusy feed in calendar overview
  • 382c51d6 - Reformat
  • fc455da2 - Unify creation dialogues for free/busy and personal events
  • 89e2603a - Reformat

Compare with previous version

added 56 commits <ul><li>d61dca50...2ead9fc3 - 41 commits from branch <code>master</code></li><li>2ead9fc3...201a0ff8 - 5 earlier commits</li><li>cbf48695 - Make event creation dialog more dense</li><li>d9bca565 - Hide recurrence field if event is not recurring</li><li>eec008db - Fix editing of personal events</li><li>eb48ad1d - Translate new fields in PersonalEventDialog</li><li>271e16e8 - Merge branch &#39;master&#39; into 928-add-frontend-for-free-busy-model</li><li>ac3352e3 - Merge branch &#39;943-allow-for-creation-of-full-day-events&#39; into 928-add-frontend-for-free-busy-model</li><li>14bb2a30 - Hide FreeBusy feed in calendar overview</li><li>382c51d6 - Reformat</li><li>fc455da2 - Unify creation dialogues for free/busy and personal events</li><li>89e2603a - Reformat</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=37416&start_sha=d61dca506eee2bf0c57ca788785d5f290e3b9006)
Author
Member

added 4 commits

  • 442f88de - Unify creation dialogues for free/busy and personal events
  • 79923b0b - Reformat
  • 37f2cb3d - Add some color to calendar type chip group
  • 4dd6d9c9 - Make required fields for calendar creation actually required

Compare with previous version

added 4 commits <ul><li>442f88de - Unify creation dialogues for free/busy and personal events</li><li>79923b0b - Reformat</li><li>37f2cb3d - Add some color to calendar type chip group</li><li>4dd6d9c9 - Make required fields for calendar creation actually required</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=37418&start_sha=89e2603a84968a3e19b5d9a602722f8d4d325193)
Author
Member

added 1 commit

  • c1bb87b7 - Make required fields for calendar creation actually required

Compare with previous version

added 1 commit <ul><li>c1bb87b7 - Make required fields for calendar creation actually required</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=37420&start_sha=4dd6d9c9669906596d71976dc3ca97caf787284a)
Author
Member

added 7 commits

  • 2118025a - Merge branch '943-allow-for-creation-of-full-day-events' into 928-add-frontend-for-free-busy-model
  • dd06a30e - Hide FreeBusy feed in calendar overview
  • 2ec690d9 - Reformat
  • 0de408e8 - Unify creation dialogues for free/busy and personal events
  • 16b0991e - Reformat
  • 9060416d - Add some color to calendar type chip group
  • 401b1142 - Make required fields for calendar creation actually required

Compare with previous version

added 7 commits <ul><li>2118025a - Merge branch &#39;943-allow-for-creation-of-full-day-events&#39; into 928-add-frontend-for-free-busy-model</li><li>dd06a30e - Hide FreeBusy feed in calendar overview</li><li>2ec690d9 - Reformat</li><li>0de408e8 - Unify creation dialogues for free/busy and personal events</li><li>16b0991e - Reformat</li><li>9060416d - Add some color to calendar type chip group</li><li>401b1142 - Make required fields for calendar creation actually required</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=37887&start_sha=c1bb87b727d59c5c6929583379e90b112e2c6ac5)
Author
Member

added 7 commits

  • 73d33b8f - Merge branch '943-allow-for-creation-of-full-day-events' into 928-add-frontend-for-free-busy-model
  • 11509ad7 - Hide FreeBusy feed in calendar overview
  • 06c97376 - Reformat
  • b6ab6a50 - Unify creation dialogues for free/busy and personal events
  • 64c93f17 - Reformat
  • 3f49930d - Add some color to calendar type chip group
  • 4b866e20 - Make required fields for calendar creation actually required

Compare with previous version

added 7 commits <ul><li>73d33b8f - Merge branch &#39;943-allow-for-creation-of-full-day-events&#39; into 928-add-frontend-for-free-busy-model</li><li>11509ad7 - Hide FreeBusy feed in calendar overview</li><li>06c97376 - Reformat</li><li>b6ab6a50 - Unify creation dialogues for free/busy and personal events</li><li>64c93f17 - Reformat</li><li>3f49930d - Add some color to calendar type chip group</li><li>4b866e20 - Make required fields for calendar creation actually required</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=37888&start_sha=401b1142b579f36443a58915544260da75445923)
Author
Member

mentioned in issue AlekSIS-App-Chronos#230

mentioned in issue AlekSIS-App-Chronos#230
Author
Member

mentioned in merge request AlekSIS-App-Chronos!1974

mentioned in merge request AlekSIS-App-Chronos!1974
Author
Member

added 464 commits

  • 4b866e20...7cfbec3c - 463 commits from branch master
  • f0e36ee8 - Merge branch '953-prepare-for-django-5-0' into 'master'

Compare with previous version

added 464 commits <ul><li>4b866e20...7cfbec3c - 463 commits from branch <code>master</code></li><li>f0e36ee8 - Merge branch &#39;953-prepare-for-django-5-0&#39; into &#39;master&#39;</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=43452&start_sha=4b866e200ccd920cee228acaaca491c4b0d06833)
Author
Member

TODO: this needs some adapting to the changes happened in the meantime regarding CRUD stuff (batch mutations etc)

TODO: this needs some adapting to the changes happened in the meantime regarding CRUD stuff (batch mutations etc)
Author
Member

added 1 commit

  • 5cc98c4c - Merge branch '953-prepare-for-django-5-0' into 'master'

Compare with previous version

added 1 commit <ul><li>5cc98c4c - Merge branch &#39;953-prepare-for-django-5-0&#39; into &#39;master&#39;</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=43456&start_sha=f0e36ee8c1e023a75175536ee407f170d9b00cf2)
Author
Member

added 48 commits

  • 5cc98c4c...b87afe9b - 47 commits from branch master
  • bf183adb - Merge branch '1036-emit-raw-items-from-querymixin-as-received-from-the-backend' into 'master'

Compare with previous version

added 48 commits <ul><li>5cc98c4c...b87afe9b - 47 commits from branch <code>master</code></li><li>bf183adb - Merge branch &#39;1036-emit-raw-items-from-querymixin-as-received-from-the-backend&#39; into &#39;master&#39;</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=44327&start_sha=5cc98c4ce2957e291e48b1b3c8873e9e0c914711)
Author
Member

added 1 commit

Compare with previous version

added 1 commit <ul><li>47c8f2c6 - Fix migrations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=44329&start_sha=bf183adb892e0deee359c7aea46e7d3042aaa10e)
Author
Member

changed this line in version 40 of the diff

changed this line in [version 40 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=44331&start_sha=47c8f2c6a0b2c8c38ec333287af6a5a0e5e6941a#811482ac63103123119f100d70d08f515aad10d6_75_71)
Author
Member

added 1 commit

  • 0d40ec1e - Adapt to batch mutations & fix mutations

Compare with previous version

added 1 commit <ul><li>0d40ec1e - Adapt to batch mutations &amp; fix mutations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=44331&start_sha=47c8f2c6a0b2c8c38ec333287af6a5a0e5e6941a)
Author
Member

There is a title in the model itself, but its not getting set (there is no input field for it)

There is a title in the model itself, but its not getting set (there is no input field for it)
Author
Member

added 1 commit

Compare with previous version

added 1 commit <ul><li>7517a4a8 - Fix event creation dialogue</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=44348&start_sha=0d40ec1e716d7465b0a3622aef9d7f32fc23f2c0)
Author
Member

added 2 commits

  • 3f87bf6a - Add some transitions
  • cb3de888 - Fix error with full-day event timezone handling

Compare with previous version

added 2 commits <ul><li>3f87bf6a - Add some transitions</li><li>cb3de888 - Fix error with full-day event timezone handling</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=44349&start_sha=7517a4a87800b792d3723111412ff8bff95ae2e3)
Author
Member

added 1 commit

  • 705babd7 - Some fixes to calendar event dialog & use it in all places

Compare with previous version

added 1 commit <ul><li>705babd7 - Some fixes to calendar event dialog &amp; use it in all places</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=44530&start_sha=cb3de8884ffeb4ad9e774f415f4a96d920f2c2be)
Author
Member

...which will be resolved when the new CalendarEventDialog is used in all places. For now, this doesn't work – for some reason – with the FreeBusy event CRUD list

...which will be resolved when the new `CalendarEventDialog` is used in all places. For now, this doesn't work – for some reason – with the FreeBusy event CRUD list
Author
Member

added 31 commits

  • 705babd7...98168bf3 - 21 earlier commits
  • faf33353 - Add selection slot
  • da60a764 - Merge branch '1022-extend-foreignkeyfield' into...
  • cf6948f8 - Merge branch '1022-extend-foreignkeyfield' into...
  • e769c709 - Merge branch...
  • 163ea307 - Merge branch 'master' into 1005-add-generic-date-sorted-infinite-scrolling-crud-iterator-component
  • e86e18b9 - Merge branch 'master' into 1005-add-generic-date-sorted-infinite-scrolling-crud-iterator-component
  • 9597ed41 - Merge branch 'master' into 1005-add-generic-date-sorted-infinite-scrolling-crud-iterator-component
  • 910bb8af - Add some more default slot content
  • 9f8b6c92 - Merge branch...
  • 5dcab907 - Allow getting calendar events wieh precise DateTimes

Compare with previous version

added 31 commits <ul><li>705babd7...98168bf3 - 21 earlier commits</li><li>faf33353 - Add selection slot</li><li>da60a764 - Merge branch &#39;1022-extend-foreignkeyfield&#39; into...</li><li>cf6948f8 - Merge branch &#39;1022-extend-foreignkeyfield&#39; into...</li><li>e769c709 - Merge branch...</li><li>163ea307 - Merge branch &#39;master&#39; into 1005-add-generic-date-sorted-infinite-scrolling-crud-iterator-component</li><li>e86e18b9 - Merge branch &#39;master&#39; into 1005-add-generic-date-sorted-infinite-scrolling-crud-iterator-component</li><li>9597ed41 - Merge branch &#39;master&#39; into 1005-add-generic-date-sorted-infinite-scrolling-crud-iterator-component</li><li>910bb8af - Add some more default slot content</li><li>9f8b6c92 - Merge branch...</li><li>5dcab907 - Allow getting calendar events wieh precise DateTimes</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=44676&start_sha=705babd79933fb65422cf5b6308945dfad7bd9ad)
Author
Member

added 1 commit

Compare with previous version

added 1 commit <ul><li>11daea03 - Fix permission checking</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=44678&start_sha=5dcab907ee54d3889ca299fa1e4c8fff12738928)
Author
Member

added 1 commit

  • 4dfd6290 - Add person list to aggregated free/busy meta data

Compare with previous version

added 1 commit <ul><li>4dfd6290 - Add person list to aggregated free/busy meta data</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=44795&start_sha=11daea0353dd339a046fd551734edb977224658e)
Author
Member

added 3 commits

Compare with previous version

added 3 commits <ul><li>5d75ecbf - Remove duplicated slots</li><li>b4a0a402 - Add load more mechanism when no data is present</li><li>f6e4b94f - Merge branch...</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=44850&start_sha=4dfd6290c94a9af173381784fe636328e18f4d77)
Author
Member

added 283 commits

  • f6e4b94f...be8cf9b8 - 281 commits from branch master
  • e82401bb - Merge branch 'master' into 928-add-frontend-for-free-busy-model
  • 705fe39d - Fix manager of FreeBusyEvent

Compare with previous version

added 283 commits <ul><li>f6e4b94f...be8cf9b8 - 281 commits from branch <code>master</code></li><li>e82401bb - Merge branch &#39;master&#39; into 928-add-frontend-for-free-busy-model</li><li>705fe39d - Fix manager of FreeBusyEvent</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=48512&start_sha=f6e4b94f2c02eaa20545d6fecbaf0c2a355d598f)
Author
Member

its a chip group now

its a chip group now
Author
Member

added 1 commit

  • 80a66c83 - Rename Free/Busy feeds

Compare with previous version

added 1 commit <ul><li>80a66c83 - Rename Free/Busy feeds</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=48514&start_sha=705fe39de892392ee2a59767d79d3da79503d7fa)
Author
Member

added 1 commit

  • 52425ae2 - Fix get_objects methods

Compare with previous version

added 1 commit <ul><li>52425ae2 - Fix get_objects methods</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=48516&start_sha=80a66c836a75a36c39d756f673d4c3ecc1f6da7e)
Author
Member

added 2 commits

Compare with previous version

added 2 commits <ul><li>7b9b0a5c - Rename Free/Busy feeds</li><li>845e29bb - Fix get_objects methods</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=48531&start_sha=52425ae27e817c7efe12f00ccd86e06e4487cfc7)
Author
Member

added 2 commits

  • d085d2e7 - Fix manager
  • 6c5f9511 - Add timezone field to additional event related graphene type/mutations

Compare with previous version

added 2 commits <ul><li>d085d2e7 - Fix manager</li><li>6c5f9511 - Add timezone field to additional event related graphene type/mutations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=48580&start_sha=845e29bb2a2a81c42f8569bfb5bf65e8b683c6ef)
Author
Member

created #1105 to continue this discussion

created #1105 to continue this discussion
Author
Member

resolved all threads

resolved all threads
Author
Member

mentioned in issue #1105

mentioned in issue #1105
Author
Member

marked this merge request as ready

marked this merge request as **ready**
Author
Member

added 1 commit

Compare with previous version

added 1 commit <ul><li>36248f20 - Reformat</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=48582&start_sha=6c5f951124d490a6ec74226959e15ce606cc3c6e)
Owner

Screenshot is missing

Screenshot is missing
Owner

Merge conflicts

Merge conflicts
Owner

Add typing

Add typing
Owner
        return []
```suggestion:-0+0 return [] ```
Owner

?

?
Author
Member

added 1 commit

  • 2676704c - Fix calendar event dialog and use it in availability event CRUD list

Compare with previous version

added 1 commit <ul><li>2676704c - Fix calendar event dialog and use it in availability event CRUD list</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=49060&start_sha=36248f20c297d8a7939a0e1a1ce1dce3c33d8a5b)
Author
Member

added 1 commit

Compare with previous version

added 1 commit <ul><li>58de2694 - Fix full day switching</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=49089&start_sha=2676704c8750d87df415a3fe7bbed936bd063e0c)
Author
Member

changed this line in version 57 of the diff

changed this line in [version 57 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=49090&start_sha=58de2694cb222f1360e54e61f9dcdce3a6fa6a80#2e44ad1f61249cf0440bea20d23bd07cc7f3a61a_1825_1825)
Author
Member

added 1 commit

  • b28179ad - Apply 1 suggestion(s) to 1 file(s)

Compare with previous version

added 1 commit <ul><li>b28179ad - Apply 1 suggestion(s) to 1 file(s)</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=49090&start_sha=58de2694cb222f1360e54e61f9dcdce3a6fa6a80)
Author
Member

added 1 commit

Compare with previous version

added 1 commit <ul><li>e144c249 - Reformat</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=49091&start_sha=b28179ad647b9cdc4e5af577a1cb158492db199a)
Author
Member

added 21 commits

  • e144c249...12384983 - 20 commits from branch master
  • c10af291 - Merge branch 'master' into 928-add-frontend-for-free-busy-model

Compare with previous version

added 21 commits <ul><li>e144c249...12384983 - 20 commits from branch <code>master</code></li><li>c10af291 - Merge branch &#39;master&#39; into 928-add-frontend-for-free-busy-model</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=49092&start_sha=e144c24997e69bb4ae8df852be4a8430c6be17d1)
Author
Member

added 1 commit

Compare with previous version

added 1 commit <ul><li>b1a0bbee - Fix models and migrations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=49197&start_sha=c10af291ea50fad58eaeaf341a3aadf90507a54e)
Author
Member

added 18 commits

  • b1a0bbee...22f2aeac - 17 commits from branch master
  • 6b72da73 - Merge branch 'master' into 928-add-frontend-for-free-busy-model

Compare with previous version

added 18 commits <ul><li>b1a0bbee...22f2aeac - 17 commits from branch <code>master</code></li><li>6b72da73 - Merge branch &#39;master&#39; into 928-add-frontend-for-free-busy-model</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=49199&start_sha=b1a0bbee33b9dd00cbcc2c93b03d67ae49410579)
Author
Member

added 1 commit

Compare with previous version

added 1 commit <ul><li>4a0f21ed - Fix edit item handling</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=49201&start_sha=6b72da73cabc3d2730371881cdd008bfabe27487)
Author
Member

added 2 commits

Compare with previous version

added 2 commits <ul><li>f201b938 - Fix handling of creation</li><li>fb7a320b - Pass affected query</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=49203&start_sha=4a0f21eda2b7a9478ee89bcd772d836ed6ba4a8e)
Author
Member

added 1 commit

Compare with previous version

added 1 commit <ul><li>bd6ee834 - Add typing</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=49205&start_sha=fb7a320b6c733414fdb8081b3c7ac29862affdb3)
Author
Member

changed this line in version 65 of the diff

changed this line in [version 65 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=49207&start_sha=bd6ee8345ee27fb0016438281bcd901a0e0b0925#2e44ad1f61249cf0440bea20d23bd07cc7f3a61a_1752_1751)
Author
Member

added 1 commit

  • ee48c436 - Fix meta information about persons/groups

Compare with previous version

added 1 commit <ul><li>ee48c436 - Fix meta information about persons/groups</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=49207&start_sha=bd6ee8345ee27fb0016438281bcd901a0e0b0925)
Author
Member

added 1 commit

  • 6fac31b5 - Add proper detail component for aggregated free/busy events

Compare with previous version

added 1 commit <ul><li>6fac31b5 - Add proper detail component for aggregated free/busy events</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=49212&start_sha=ee48c436f2013849eddd9075c7983c44083a60f0)
Author
Member

Screenshot from 2024-10-26 15-26-18.png

Screenshot from 2024-10-26 15-26-06.png

Screenshot from 2024-10-26 15-25-57.png

Screenshot from 2024-10-26 15-25-50.png

![Screenshot from 2024-10-26 15-26-18.png](/uploads/2af1406c5f3bb8ef5cfb9ff5ca158f13/Screenshot_from_2024-10-26_15-26-18.png) ![Screenshot from 2024-10-26 15-26-06.png](/uploads/d8169d09b2210527413bf5c8b33e2217/Screenshot_from_2024-10-26_15-26-06.png) ![Screenshot from 2024-10-26 15-25-57.png](/uploads/759b6dd797d30a4adb0fe41e5fe81223/Screenshot_from_2024-10-26_15-25-57.png) ![Screenshot from 2024-10-26 15-25-50.png](/uploads/f97fdca92aaabb85279cb4a4332dbfe6/Screenshot_from_2024-10-26_15-25-50.png)
Author
Member

resolved all threads

resolved all threads
Author
Member

added 1 commit

Compare with previous version

added 1 commit <ul><li>b39de266 - Reformat</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=49214&start_sha=6fac31b590cd117511c7cc628081b7d42a6a723c)
Author
Member

@hansegucker please have a look again

@hansegucker please have a look again
Owner

@nik Please also have a look.

@nik Please also have a look.
Owner

I think this is the wrong menu tab for end users. Data management shouldn't be shown with normal users.

I think this is the wrong menu tab for end users. Data management shouldn't be shown with normal users.
Owner

This doesn't like a consistent structure one class method for busy stuff and two object methods for availability stuff.

This doesn't like a consistent structure one **class** method for busy stuff and two **object** methods for availability stuff.
Owner

Wrong typing

Wrong typing
Owner

Looks superfluous.

Looks superfluous.
Owner

Looks superfluous.

Looks superfluous.
Owner
            for group in Group.objects.filter(id__in=groups):
```suggestion:-1+0 for group in Group.objects.filter(id__in=groups): ```
Owner

same as groups (see below)

same as groups (see below)
Owner

Would be probably better to init with empty defaults, not every feed has to be useful for availability. Also fix typing. Also same with busy.

Would be probably better to init with empty defaults, not every feed has to be useful for availability. Also fix typing. Also same with busy.
Owner

What is this? Please comment or use better matching var name.

What is this? Please comment or use better matching var name.
Owner

Don't forget to run super

Don't forget to run super
Owner

This should now be solved in another way.

This should now be solved in another way.
Owner
        return []
```suggestion:-0+0 return [] ```
Owner
        return []
```suggestion:-0+0 return [] ```
Owner

What is this change for?

What is this change for?
Owner

@ZugBahnHof Please review frontend.

@ZugBahnHof Please review frontend.
Member

this looks dangerous (and bad)

this looks dangerous (and bad)
Member

what about one computed property that will simply return "personal_events" or "availability" and then you can build all these keys yourself? also, this doesn't look very future proof right now, what would we do if we added another event type?

what about one computed property that will simply return "personal_events" or "availability" and then you can build all these keys yourself? also, this doesn't look very future proof right now, what would we do if we added another event type?
Author
Member

mentioned in issue AlekSIS/onboarding/AlekSIS-App-Cursus#32

mentioned in issue AlekSIS/onboarding/AlekSIS-App-Cursus#32
permcu commented 2025-03-13 10:43:31 +01:00 (Migrated from edugit.org)

added 712 commits

  • b39de266...1efc0078 - 711 commits from branch master
  • c6af4013 - Merge origin/master into 928-add-frontend-for-free-busy-model

Compare with previous version

added 712 commits <ul><li>b39de266...1efc0078 - 711 commits from branch <code>master</code></li><li>c6af4013 - Merge origin/master into 928-add-frontend-for-free-busy-model</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=57109&start_sha=b39de266b1edf005d9a29ed5f0af4ce8e32c3fd5)
permcu commented 2025-03-14 18:27:52 +01:00 (Migrated from edugit.org)

added 1 commit

  • 1450bfb3 - Merge origin/master into 928-add-frontend-for-free-busy-model

Compare with previous version

added 1 commit <ul><li>1450bfb3 - Merge origin/master into 928-add-frontend-for-free-busy-model</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=57175&start_sha=c6af4013bab5b79b981e8c2152ea02097ddd39f1)
permcu commented 2025-03-21 22:25:11 +01:00 (Migrated from edugit.org)

changed this line in version 70 of the diff

changed this line in [version 70 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=57566&start_sha=1450bfb34aa524ba47b0a88030be22f6c8bc498a#1e75bd0060997ddec5f15730e6c99146f3a31752_311_339)
permcu commented 2025-03-21 22:25:11 +01:00 (Migrated from edugit.org)

changed this line in version 70 of the diff

changed this line in [version 70 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=57566&start_sha=1450bfb34aa524ba47b0a88030be22f6c8bc498a#1e75bd0060997ddec5f15730e6c99146f3a31752_456_380)
permcu commented 2025-03-21 22:25:12 +01:00 (Migrated from edugit.org)

added 4 commits

  • 265b9fb6 - Add missing timezone-field to availabilityEventFields
  • cd3f45e6 - Fix timezone-field declaration in availability-event-backend
  • 6fdfac45 - Add hideTime prop to DateTimeField
  • cd5a134c - Rework the CalendarEventDialog

Compare with previous version

added 4 commits <ul><li>265b9fb6 - Add missing timezone-field to availabilityEventFields</li><li>cd3f45e6 - Fix timezone-field declaration in availability-event-backend</li><li>6fdfac45 - Add hideTime prop to DateTimeField</li><li>cd5a134c - Rework the CalendarEventDialog</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=57566&start_sha=1450bfb34aa524ba47b0a88030be22f6c8bc498a)
Owner

marked this merge request as draft

marked this merge request as **draft**
permcu commented 2025-03-27 21:52:27 +01:00 (Migrated from edugit.org)

added 4 commits

  • 567878dd - Add missing event related german translations
  • 1d6afdb3 - Fix CalendarEventDialog translation handling
  • 64a66ca2 - Finish and fix fullDay handling
  • 6396dc2e - Filter recurring field

Compare with previous version

added 4 commits <ul><li>567878dd - Add missing event related german translations</li><li>1d6afdb3 - Fix CalendarEventDialog translation handling</li><li>64a66ca2 - Finish and fix fullDay handling</li><li>6396dc2e - Filter recurring field</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=57934&start_sha=cd5a134c0f0a6af65461dcf562083e969cf475db)
permcu commented 2025-03-28 21:00:25 +01:00 (Migrated from edugit.org)

added 107 commits

  • 6396dc2e...834a79bc - 103 commits from branch master
  • 1695b603 - Merge origin/master
  • 769ab467 - Add expand-arg to get_objects of AvailabilityEvent
  • 77d5f033 - Rename AvailabilityEvent verbose_name
  • 7d72dae1 - Port get_objects of AvailabilityEvent to use super().get_objects

Compare with previous version

added 107 commits <ul><li>6396dc2e...834a79bc - 103 commits from branch <code>master</code></li><li>1695b603 - Merge origin/master</li><li>769ab467 - Add expand-arg to get_objects of AvailabilityEvent</li><li>77d5f033 - Rename AvailabilityEvent verbose_name</li><li>7d72dae1 - Port get_objects of AvailabilityEvent to use super().get_objects</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=58032&start_sha=6396dc2e2021b7eb49bfa4eb7d4471fd3d4593be)
permcu commented 2025-04-03 20:02:52 +02:00 (Migrated from edugit.org)

added 100 commits

  • 7d72dae1...8250dac1 - 98 commits from branch master
  • 4734b96a - Merge origin/master
  • 8e3d9aa6 - Properly implement fullDay handling as intented

Compare with previous version

added 100 commits <ul><li>7d72dae1...8250dac1 - 98 commits from branch <code>master</code></li><li>4734b96a - Merge origin/master</li><li>8e3d9aa6 - Properly implement fullDay handling as intented</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=58364&start_sha=7d72dae15f711e770e2804aebc98aefe0dd7847d)
permcu commented 2025-04-04 22:04:10 +02:00 (Migrated from edugit.org)

changed this line in version 74 of the diff

changed this line in [version 74 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=58421&start_sha=8e3d9aa63660d5d3739f01840dcd7c2f0ae3a2b5#ada4dcc0ec8ff1e71728a0961bca866dce0a95ef_93_87)
permcu commented 2025-04-04 22:04:11 +02:00 (Migrated from edugit.org)

added 11 commits

  • 151514b9 - 1 earlier commit
  • 7c192787 - Reorder CalendarEventDialog
  • 8884c0c1 - Filter timezone & recurrences in case of non-recurring event
  • 305c04f8 - Fix DateTimeField layout
  • 047e7edb - Set timezone in item filter
  • 2464f0e4 - Update personal&availability-event-schema and introduce base-classes
  • 545bad5a - Switch calendar-event-base-classes to mixins
  • 5e7cd4cb - Add missing permissions to PersonalEventBatchCreateMutation's Meta
  • 81668f07 - Fix unpythonic method-call
  • 4bd2aea9 - Introduce per-event filter to allow toggling free/busy
  • 728b59a5 - Default fields to empty object

Compare with previous version

added 11 commits <ul><li>151514b9 - 1 earlier commit</li><li>7c192787 - Reorder CalendarEventDialog</li><li>8884c0c1 - Filter timezone &amp; recurrences in case of non-recurring event</li><li>305c04f8 - Fix DateTimeField layout</li><li>047e7edb - Set timezone in item filter</li><li>2464f0e4 - Update personal&amp;availability-event-schema and introduce base-classes</li><li>545bad5a - Switch calendar-event-base-classes to mixins</li><li>5e7cd4cb - Add missing permissions to PersonalEventBatchCreateMutation&#39;s Meta</li><li>81668f07 - Fix unpythonic method-call</li><li>4bd2aea9 - Introduce per-event filter to allow toggling free/busy</li><li>728b59a5 - Default fields to empty object</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=58421&start_sha=8e3d9aa63660d5d3739f01840dcd7c2f0ae3a2b5)
Author
Member

mentioned in issue AlekSIS-App-Chronos#237

mentioned in issue AlekSIS-App-Chronos#237
permcu commented 2025-04-10 16:03:46 +02:00 (Migrated from edugit.org)

added 36 commits

  • 728b59a5...ea94457a - 33 commits from branch master
  • 961b5a22 - Merge origin/master into 928-add-frontend-for-free-busy-model
  • 58d3d30d - Remove done TODO
  • 067a394d - Remove leftover slide-transition

Compare with previous version

added 36 commits <ul><li>728b59a5...ea94457a - 33 commits from branch <code>master</code></li><li>961b5a22 - Merge origin/master into 928-add-frontend-for-free-busy-model</li><li>58d3d30d - Remove done TODO</li><li>067a394d - Remove leftover slide-transition</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=59659&start_sha=728b59a5a5ece03e85c62de7b23b2f02905c1381)
permcu commented 2025-04-10 22:48:30 +02:00 (Migrated from edugit.org)

added 11 commits

  • 4732f18e - 1 earlier commit
  • 5dabf9be - Allow setting selectableEvents via prop in CalendarEventDialog
  • fa448767 - Move personalEvent to first position
  • 7a224970 - Properly set initialSelectedEvent
  • 1e507109 - Remove title-comment
  • 2c334d8f - Integrate new CalendarEventDialog into its edit-contexts
  • 4041718f - Add icon to CalendarEventDialog's title
  • 811a5981 - Move CalendarEventDialog related buttons into their slot
  • 3594597b - Replace calendar-event's create-fab with a speed-dial
  • f85ac791 - Layout calendar-event's create-speed-dial
  • 8a65424a - Add color to calendar-events

Compare with previous version

added 11 commits <ul><li>4732f18e - 1 earlier commit</li><li>5dabf9be - Allow setting selectableEvents via prop in CalendarEventDialog</li><li>fa448767 - Move personalEvent to first position</li><li>7a224970 - Properly set initialSelectedEvent</li><li>1e507109 - Remove title-comment</li><li>2c334d8f - Integrate new CalendarEventDialog into its edit-contexts</li><li>4041718f - Add icon to CalendarEventDialog&#39;s title</li><li>811a5981 - Move CalendarEventDialog related buttons into their slot</li><li>3594597b - Replace calendar-event&#39;s create-fab with a speed-dial</li><li>f85ac791 - Layout calendar-event&#39;s create-speed-dial</li><li>8a65424a - Add color to calendar-events</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=59747&start_sha=067a394de063f9bba3cb11b085594bd43fe9ea3f)
permcu commented 2025-04-11 16:02:08 +02:00 (Migrated from edugit.org)

added 4 commits

  • d808aaca - Update selectedEvent by watching initialSelectedEvent
  • ecc0366f - Remove redundant emit of save
  • 8cca771c - Remove unused value prop from calendar-event-dialog
  • 01e27754 - Simplify calendar-event-dialog's watch-section

Compare with previous version

added 4 commits <ul><li>d808aaca - Update selectedEvent by watching initialSelectedEvent</li><li>ecc0366f - Remove redundant emit of save</li><li>8cca771c - Remove unused value prop from calendar-event-dialog</li><li>01e27754 - Simplify calendar-event-dialog&#39;s watch-section</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=59833&start_sha=8a65424a8b1245ae4c6243cb8b7dad8a7cb09d27)
Author
Member

I have no clue.

I have no clue.
Author
Member

added 1 commit

Compare with previous version

added 1 commit <ul><li>fc211027 - Move free/busy route</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60062&start_sha=01e27754a0def8f8e3a9b2a14b05346389843d2d)
Author
Member

added 1 commit

  • 5fa414ef - Rename migrations in order to resolve conflict by merge

Compare with previous version

added 1 commit <ul><li>5fa414ef - Rename migrations in order to resolve conflict by merge</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60066&start_sha=fc211027940d5efa4aef9f49b5324d9d3f041f38)
Author
Member

changed this line in version 80 of the diff

changed this line in [version 80 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60068&start_sha=5fa414efde65ed3e3af1e81b28060a92b3e95e47#1b982284e924bbd2f9fd4391f9f63c6ebb3ba737_381_381)
Author
Member

added 1 commit

  • 9cfe9981 - Revert unnecessary change of default editItem value

Compare with previous version

added 1 commit <ul><li>9cfe9981 - Revert unnecessary change of default editItem value</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60068&start_sha=5fa414efde65ed3e3af1e81b28060a92b3e95e47)
Author
Member

changed this line in version 81 of the diff

changed this line in [version 81 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60070&start_sha=9cfe998113319732afced8dde1fc0cb07bbb73bc#9104f183b254581056a368588770f82082815153_758_758)
Author
Member

added 1 commit

Compare with previous version

added 1 commit <ul><li>c5b5086f - Add explaining comment</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60070&start_sha=9cfe998113319732afced8dde1fc0cb07bbb73bc)
Author
Member

changed this line in version 82 of the diff

changed this line in [version 82 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60105&start_sha=c5b5086f0e3cabe2e936137039ff332d6f7c7ea4#2e44ad1f61249cf0440bea20d23bd07cc7f3a61a_1748_1742)
Author
Member

changed this line in version 82 of the diff

changed this line in [version 82 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60105&start_sha=c5b5086f0e3cabe2e936137039ff332d6f7c7ea4#2e44ad1f61249cf0440bea20d23bd07cc7f3a61a_2518_2393)
Author
Member

changed this line in version 82 of the diff

changed this line in [version 82 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60105&start_sha=c5b5086f0e3cabe2e936137039ff332d6f7c7ea4#2e44ad1f61249cf0440bea20d23bd07cc7f3a61a_2193_2091)
Author
Member

changed this line in version 82 of the diff

changed this line in [version 82 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60105&start_sha=c5b5086f0e3cabe2e936137039ff332d6f7c7ea4#2e44ad1f61249cf0440bea20d23bd07cc7f3a61a_2031_1974)
Author
Member

changed this line in version 82 of the diff

changed this line in [version 82 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60105&start_sha=c5b5086f0e3cabe2e936137039ff332d6f7c7ea4#2e44ad1f61249cf0440bea20d23bd07cc7f3a61a_2025_1974)
Author
Member

changed this line in version 82 of the diff

changed this line in [version 82 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60105&start_sha=c5b5086f0e3cabe2e936137039ff332d6f7c7ea4#2e44ad1f61249cf0440bea20d23bd07cc7f3a61a_2014_1974)
Author
Member

changed this line in version 82 of the diff

changed this line in [version 82 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60105&start_sha=c5b5086f0e3cabe2e936137039ff332d6f7c7ea4#2e44ad1f61249cf0440bea20d23bd07cc7f3a61a_2006_1974)
Author
Member

changed this line in version 82 of the diff

changed this line in [version 82 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60105&start_sha=c5b5086f0e3cabe2e936137039ff332d6f7c7ea4#2e44ad1f61249cf0440bea20d23bd07cc7f3a61a_1748_1742)
Author
Member

added 1 commit

  • e8799a2a - Remove code related to aggregated free/busy feed

Compare with previous version

added 1 commit <ul><li>e8799a2a - Remove code related to aggregated free/busy feed</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60105&start_sha=c5b5086f0e3cabe2e936137039ff332d6f7c7ea4)
Author
Member

mentioned in merge request !3442

mentioned in merge request !3442
Author
Member

resolved all threads

resolved all threads
Author
Member

resolved all threads

resolved all threads
Author
Member

changed this line in version 83 of the diff

changed this line in [version 83 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60107&start_sha=e8799a2a0f45959706ac6c7ca4846bb3b5f9c2ff#18c2c57fbfdb3dafd264f1e4a4eab1a8c6ab10bb_387_387)
Author
Member

changed this line in version 83 of the diff

changed this line in [version 83 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60107&start_sha=e8799a2a0f45959706ac6c7ca4846bb3b5f9c2ff#18c2c57fbfdb3dafd264f1e4a4eab1a8c6ab10bb_381_381)
Author
Member

added 1 commit

  • f876e7f0 - Apply 2 suggestion(s) to 1 file(s)

Compare with previous version

added 1 commit <ul><li>f876e7f0 - Apply 2 suggestion(s) to 1 file(s)</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60107&start_sha=e8799a2a0f45959706ac6c7ca4846bb3b5f9c2ff)
Author
Member

changed this line in version 84 of the diff

changed this line in [version 84 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60109&start_sha=f876e7f0ecbbe6192a51feafe28baf7c507305d6#f3b09070d21b8a3db0f111ac66567324cc2bd287_242_255)
Author
Member

added 1 commit

  • 09589e62 - Move availability event overview route

Compare with previous version

added 1 commit <ul><li>09589e62 - Move availability event overview route</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60109&start_sha=f876e7f0ecbbe6192a51feafe28baf7c507305d6)
Author
Member

added 2 commits

  • 9384fe77 - Remove unused console log
  • 1e0d98ca - Fix edit mode in availability event list

Compare with previous version

added 2 commits <ul><li>9384fe77 - Remove unused console log</li><li>1e0d98ca - Fix edit mode in availability event list</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60112&start_sha=09589e62fe0ff2df0d4529799f3ab322a84ae0bf)
Author
Member

added 1 commit

  • e926e0e2 - Remove unused slots

Compare with previous version

added 1 commit <ul><li>e926e0e2 - Remove unused slots</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60114&start_sha=1e0d98cae414d76bb524efe14e85e23a06bb280c)
Author
Member

added 1 commit

  • c49a6729 - Remove unused slots

Compare with previous version

added 1 commit <ul><li>c49a6729 - Remove unused slots</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60116&start_sha=e926e0e27f7773af53bd4a45a52dbedd6460b65d)
Author
Member

added 1 commit

Compare with previous version

added 1 commit <ul><li>d4f82cfd - Remove unused slots</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60118&start_sha=c49a67290e94a5451fb943d32ce1eea9422c742d)
Author
Member

added 1 commit

  • 9c4bd38b - Fix handling of full day events

Compare with previous version

added 1 commit <ul><li>9c4bd38b - Fix handling of full day events</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60120&start_sha=d4f82cfd7512612d384855339f957ea01f5bdb0d)
Author
Member

added 1 commit

  • cfe928be - Fix handling of full day events

Compare with previous version

added 1 commit <ul><li>cfe928be - Fix handling of full day events</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60123&start_sha=9c4bd38b34cccd44b48ba1add5d6c224f01691d6)
Author
Member

added 1 commit

  • 10cb76f8 - Fix initial selected event type handling

Compare with previous version

added 1 commit <ul><li>10cb76f8 - Fix initial selected event type handling</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60125&start_sha=cfe928be3e2cb9c4328736e115ff7ac16b24e9da)
Author
Member

@permcu When editing (not when creating) recurrences of availability events (but not personal events; and that's why I'm fairly confused right now), I get the following error:

{"errors":[{"message":"Variable '$input' got invalid value 'Europe/Berlin' at 'input[0].timezone'; Value 'Europe/Berlin' does not exist in 'CalendarEventTimezone' enum. Did you mean the enum value 'EUROPE_BERLIN', 'EUROPE_DUBLIN', 'EUROPE_JERSEY', 'EUROPE_PARIS', or 'EUROPE_TALLINN'?","locations":[{"line":1,"column":35}]}]}

@permcu When editing (not when creating) recurrences of availability events (but not personal events; and that's why I'm fairly confused right now), I get the following error: `{"errors":[{"message":"Variable '$input' got invalid value 'Europe/Berlin' at 'input[0].timezone'; Value 'Europe/Berlin' does not exist in 'CalendarEventTimezone' enum. Did you mean the enum value 'EUROPE_BERLIN', 'EUROPE_DUBLIN', 'EUROPE_JERSEY', 'EUROPE_PARIS', or 'EUROPE_TALLINN'?","locations":[{"line":1,"column":35}]}]}`
Author
Member

added 1 commit

  • c514533f - Make title field of availability event not required

Compare with previous version

added 1 commit <ul><li>c514533f - Make title field of availability event not required</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60127&start_sha=10cb76f883e26046bb6ef23154a397ad48437565)
Author
Member

added 1 commit

Compare with previous version

added 1 commit <ul><li>60b9982b - Add changelog</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60138&start_sha=c514533f635b3c39943d29c969b07616996e56a5)
Author
Member

Screenshots:

Screenshot From 2025-04-17 15-07-23.png

Screenshot From 2025-04-17 15-07-14.png

Screenshot From 2025-04-17 15-07-08.png

Screenshot From 2025-04-17 15-06-59.png

Screenshot From 2025-04-17 15-05-34.png

Screenshot From 2025-04-17 15-05-27.png

Screenshot From 2025-04-17 15-05-17.png

Screenshots: ![Screenshot From 2025-04-17 15-07-23.png](/uploads/e33493814575b825afb3e777bdc16985/Screenshot_From_2025-04-17_15-07-23.png) ![Screenshot From 2025-04-17 15-07-14.png](/uploads/73f0b08e7e640df67c0dc7bb31d8be3f/Screenshot_From_2025-04-17_15-07-14.png) ![Screenshot From 2025-04-17 15-07-08.png](/uploads/67defd93f4b140bfc2cb65bed1744957/Screenshot_From_2025-04-17_15-07-08.png) ![Screenshot From 2025-04-17 15-06-59.png](/uploads/c91691d659ab7b56d5e12cfcfcf55970/Screenshot_From_2025-04-17_15-06-59.png) ![Screenshot From 2025-04-17 15-05-34.png](/uploads/01ef2f329c7dcdebc391a50bf2fedcf9/Screenshot_From_2025-04-17_15-05-34.png) ![Screenshot From 2025-04-17 15-05-27.png](/uploads/abe97f11cc99902ac2a8f5c50e8a9279/Screenshot_From_2025-04-17_15-05-27.png) ![Screenshot From 2025-04-17 15-05-17.png](/uploads/5bb78ddafa123d81e705aa3591fbbbb5/Screenshot_From_2025-04-17_15-05-17.png)
Author
Member

added 1 commit

  • 30d3fd34 - Fix handling of recurring availability events

Compare with previous version

added 1 commit <ul><li>30d3fd34 - Fix handling of recurring availability events</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60140&start_sha=60b9982b4b6d70fbe3d74a231e276f54fe69f049)
Author
Member

added 1 commit

  • b775a8d4 - Re-add deleted FreeBusy class

Compare with previous version

added 1 commit <ul><li>b775a8d4 - Re-add deleted FreeBusy class</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60154&start_sha=30d3fd34851f7d7c80a3bbb9b122ac4e136ec85c)
permcu commented 2025-04-17 17:49:08 +02:00 (Migrated from edugit.org)

added 1 commit

  • 4694c765 - Add timezone-field-type to AvailabilityEventBatchPatchMutation

Compare with previous version

added 1 commit <ul><li>4694c765 - Add timezone-field-type to AvailabilityEventBatchPatchMutation</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60159&start_sha=b775a8d455815f3bcdd1257367797ca59123d6af)
permcu commented 2025-04-17 17:51:22 +02:00 (Migrated from edugit.org)

added 1 commit

  • 51dd49b0 - Reorder AvailabilityEventBatchCreateMutation

Compare with previous version

added 1 commit <ul><li>51dd49b0 - Reorder AvailabilityEventBatchCreateMutation</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60161&start_sha=4694c765f27d782472ac8caa5d3465fb57103c2c)
Author
Member

resolved all threads

resolved all threads
Author
Member

marked this merge request as ready

marked this merge request as **ready**
Owner
    verbose_name = _("Color of busy events in availability event calendar feed")
```suggestion:-0+0 verbose_name = _("Color of busy events in availability event calendar feed") ```
Owner
    verbose_name = _("Color of free events in availability event calendar feed")
```suggestion:-0+0 verbose_name = _("Color of free events in availability event calendar feed") ```
Owner

TODO

TODO
Owner

That looks like a problematic OR (as in DB-wise). See Chronos how to handle this correctly.

That looks like a problematic OR (as in DB-wise). See Chronos how to handle this correctly.
Owner

This shouldn't check on instance, but whether it's an iterable.

This shouldn't check on instance, but whether it's an iterable.
Owner
                gp_filter = gp_filter
                if additional_filter is not None:
                    gp_filter = additional_filter & gp_filter
```suggestion:-3+0 gp_filter = gp_filter if additional_filter is not None: gp_filter = additional_filter & gp_filter ```
Owner

same as above

same as above
Owner

You sure that this is correct?

You sure that this is correct?
Owner

I thought that this has been moved to a new MR?

I thought that this has been moved to a new MR?
Owner

I thought that this has been moved to a new MR?

I thought that this has been moved to a new MR?
Owner

I thought that this has been moved to a new MR?

I thought that this has been moved to a new MR?
Owner

I thought that this has been moved to a new MR?

I thought that this has been moved to a new MR?
Owner

Missing docstrings

Missing docstrings
Owner

This should be a BadRequest, shouldn't use & (what is wrong about and).

This should be a `BadRequest`, shouldn't use `&` (what is wrong about `and`).
Owner

@ZugBahnHof Please review frontend.

@ZugBahnHof Please review frontend.
Owner

Please also fix lint.

Please also fix lint.
Owner

Two things:

  • Spacing between save and cancel button
  • "–" for title column if empty
Two things: - [ ] Spacing between save and cancel button - [ ] "–" for title column if empty
permcu commented 2025-04-17 20:28:54 +02:00 (Migrated from edugit.org)

added 4 commits

  • 13cdd068 - Remove unused arg
  • f1402a5b - Remove leftover handleCreate and associated ref
  • 5befa37a - Pass props and attrs from CalendarEventDialog to DialogObjectForm
  • 61364490 - Make sure CalendarEventDialog uses minimal-patch

Compare with previous version

added 4 commits <ul><li>13cdd068 - Remove unused arg</li><li>f1402a5b - Remove leftover handleCreate and associated ref</li><li>5befa37a - Pass props and attrs from CalendarEventDialog to DialogObjectForm</li><li>61364490 - Make sure CalendarEventDialog uses minimal-patch</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60169&start_sha=51dd49b09833da59d83627367dd9a55182303ed4)
permcu commented 2025-04-17 20:37:58 +02:00 (Migrated from edugit.org)

mentioned in merge request !3443

mentioned in merge request !3443
permcu commented 2025-04-17 20:43:20 +02:00 (Migrated from edugit.org)

added 1 commit

  • 55bd52aa - Let DialogObjectForm do the implicit isCreate handling

Compare with previous version

added 1 commit <ul><li>55bd52aa - Let DialogObjectForm do the implicit isCreate handling</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60177&start_sha=61364490d78676ba71e20e3fc346e97834cf6d24)
permcu commented 2025-04-17 20:59:41 +02:00 (Migrated from edugit.org)

added 1 commit

  • c1997c36 - Do not show until if not available in AvailabilityEventList

Compare with previous version

added 1 commit <ul><li>c1997c36 - Do not show until if not available in AvailabilityEventList</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60179&start_sha=55bd52aa926952037a08a4debf3c251357d3ec5e)
permcu commented 2025-04-17 21:08:02 +02:00 (Migrated from edugit.org)

After commit: Let DialogObjectForm do the implicit isCreate handling
this now needs: https://edugit.org/AlekSIS/official/AlekSIS-Core/-/merge_requests/1798

This was necessary because otherwise the CaledarEventDialog would not work for editing in normal CRUD-context.

After commit: Let DialogObjectForm do the implicit isCreate handling this now needs: https://edugit.org/AlekSIS/official/AlekSIS-Core/-/merge_requests/1798 This was necessary because otherwise the CaledarEventDialog would not work for editing in normal CRUD-context.
permcu commented 2025-04-18 15:10:15 +02:00 (Migrated from edugit.org)

Where is this component used? I can not find it.

Where is this component used? I can not find it.
permcu commented 2025-04-18 15:10:15 +02:00 (Migrated from edugit.org)

Where is this used?

Where is this used?
Owner

@yuha resolves threads ;-)

@yuha resolves threads ;-)
Author
Member

changed this line in version 101 of the diff

changed this line in [version 101 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60377&start_sha=c1997c363110132c86732cfee25e1016a8578848#cedfd047579474194a5f10a12c798242313675da_583_583)
Author
Member

changed this line in version 101 of the diff

changed this line in [version 101 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60377&start_sha=c1997c363110132c86732cfee25e1016a8578848#cedfd047579474194a5f10a12c798242313675da_571_571)
Author
Member

added 1 commit

  • 3679e52f - Apply 2 suggestion(s) to 1 file(s)

Compare with previous version

added 1 commit <ul><li>3679e52f - Apply 2 suggestion(s) to 1 file(s)</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60377&start_sha=c1997c363110132c86732cfee25e1016a8578848)
Author
Member

oh thanks for the reminder, that's a leftover component that is used for the f/b aggregation feature but that i forgot to remove. will do!

oh thanks for the reminder, that's a leftover component that is used for the f/b aggregation feature but that i forgot to remove. will do!
Author
Member

oh thanks for the reminder, that's a leftover component that is used for the f/b aggregation feature but that i forgot to remove. will do!

oh thanks for the reminder, that's a leftover component that is used for the f/b aggregation feature but that i forgot to remove. will do!
Author
Member

changed this line in version 102 of the diff

changed this line in [version 102 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60381&start_sha=3679e52fde0f26ffb722ae14b60766e06ed4376b#9104f183b254581056a368588770f82082815153_892_882)
Author
Member

changed this line in version 102 of the diff

changed this line in [version 102 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60381&start_sha=3679e52fde0f26ffb722ae14b60766e06ed4376b#9104f183b254581056a368588770f82082815153_758_754)
Author
Member

changed this line in version 102 of the diff

changed this line in [version 102 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60381&start_sha=3679e52fde0f26ffb722ae14b60766e06ed4376b#9104f183b254581056a368588770f82082815153_1040_1026)
Author
Member

changed this line in version 102 of the diff

changed this line in [version 102 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60381&start_sha=3679e52fde0f26ffb722ae14b60766e06ed4376b#9104f183b254581056a368588770f82082815153_732_729)
Author
Member

changed this file in version 102 of the diff

changed this file in [version 102 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60381&start_sha=3679e52fde0f26ffb722ae14b60766e06ed4376b#5679255b61a1f74696628fc2abfa1cd988e5d2d1)
Author
Member

changed this file in version 102 of the diff

changed this file in [version 102 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60381&start_sha=3679e52fde0f26ffb722ae14b60766e06ed4376b#8453f6dcca0499d4cf0de8cd95724b705692242b)
Author
Member

added 1 commit

  • fec22a68 - Remove leftovers from changes related to f/b overview/aggregation

Compare with previous version

added 1 commit <ul><li>fec22a68 - Remove leftovers from changes related to f/b overview/aggregation</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60381&start_sha=3679e52fde0f26ffb722ae14b60766e06ed4376b)
Author
Member
regarding first point: https://edugit.org/AlekSIS/official/AlekSIS-Core/-/merge_requests/1800
Author
Member

added 1 commit

  • 39061bcd - "–" for title column if empty

Compare with previous version

added 1 commit <ul><li>39061bcd - &quot;–&quot; for title column if empty</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60384&start_sha=fec22a688b43d7a4bb807a9173d4cd4e65187c32)
Author
Member

changed this line in version 104 of the diff

changed this line in [version 104 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60428&start_sha=39061bcd3f6e09b9f5772070311665a021fad9ce#2e44ad1f61249cf0440bea20d23bd07cc7f3a61a_2067_2051)
Author
Member

changed this line in version 104 of the diff

changed this line in [version 104 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60428&start_sha=39061bcd3f6e09b9f5772070311665a021fad9ce#2e44ad1f61249cf0440bea20d23bd07cc7f3a61a_2051_2051)
Author
Member

changed this line in version 104 of the diff

changed this line in [version 104 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60428&start_sha=39061bcd3f6e09b9f5772070311665a021fad9ce#2e44ad1f61249cf0440bea20d23bd07cc7f3a61a_2055_2051)
Author
Member

changed this line in version 104 of the diff

changed this line in [version 104 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60428&start_sha=39061bcd3f6e09b9f5772070311665a021fad9ce#2e44ad1f61249cf0440bea20d23bd07cc7f3a61a_2079_2055)
Author
Member

added 1 commit

  • 9c03eee2 - Simplify availability events get_objects logic

Compare with previous version

added 1 commit <ul><li>9c03eee2 - Simplify availability events get_objects logic</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60428&start_sha=39061bcd3f6e09b9f5772070311665a021fad9ce)
Author
Member

changed this line in version 105 of the diff

changed this line in [version 105 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60430&start_sha=9c03eee2e2354530b1095949ef180d90fd43a076#2e44ad1f61249cf0440bea20d23bd07cc7f3a61a_2050_2050)
Author
Member

added 1 commit

Compare with previous version

added 1 commit <ul><li>b9d4957d - Change type checking</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60430&start_sha=9c03eee2e2354530b1095949ef180d90fd43a076)
Author
Member

do you mean this part? and could you explain to me what makes this approach unproblematic (and the one now used in core problematic)?

https://edugit.org/AlekSIS/official/AlekSIS-App-Chronos/-/blob/master/aleksis/apps/chronos/managers.py?ref_type=heads#L187

do you mean this part? and could you explain to me what makes this approach unproblematic (and the one now used in core problematic)? https://edugit.org/AlekSIS/official/AlekSIS-App-Chronos/-/blob/master/aleksis/apps/chronos/managers.py?ref_type=heads#L187
Author
Member

added 1 commit

Compare with previous version

added 1 commit <ul><li>890079ac - Refactor filters</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60433&start_sha=b9d4957d0a1339469b895be44afd60873c3d15c1)
Author
Member

added 1 commit

Compare with previous version

added 1 commit <ul><li>ee6d8bdd - Fix typo</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60435&start_sha=890079acac1f5796b8c96b6caeee5e24249d062f)
Author
Member

Why shouldn't it be?

Why shouldn't it be?
Author
Member

added 1 commit

Compare with previous version

added 1 commit <ul><li>78966589 - Add docstrings</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60437&start_sha=ee6d8bdd867e2deb7bcfc42099e5448f7ec12f24)
Owner

I don't know what the str representation is, so I just asked.

I don't know what the str representation is, so I just asked.
Author
Member

changed this line in version 109 of the diff

changed this line in [version 109 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60439&start_sha=78966589d7d5804e8120d69e08851084561a9220#9bc6f6dbf7d5b3a92ff25fc3649c26a513ef5830_360_360)
Author
Member

added 1 commit

Compare with previous version

added 1 commit <ul><li>9aa94da0 - Use BadRequest</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60439&start_sha=78966589d7d5804e8120d69e08851084561a9220)
Owner

Yes, exactly this part. Doing ORs over multiple joined tables (like person__member_of or person__owner_of) is slow in PostgreSQL (remember our nightly sprint). But doing them as separate queries is very fast and unioning those is even cheaper (union is just adding things to a list).

Yes, exactly this part. Doing ORs over multiple joined tables (like `person__member_of` or `person__owner_of`) is slow in PostgreSQL (remember our nightly sprint). But doing them as separate queries is very fast and unioning those is even cheaper (union is just adding things to a list).
Author
Member

added 1 commit

Compare with previous version

added 1 commit <ul><li>35a974b5 - Reformat</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60441&start_sha=9aa94da0b89b0045231579ab3742bf05d6a40a2a)
permcu commented 2025-04-30 17:42:08 +02:00 (Migrated from edugit.org)

mentioned in merge request !3450

mentioned in merge request !3450
Author
Member

added 1 commit

  • 5ccb5d9a - Use more efficient filter mechanism

Compare with previous version

added 1 commit <ul><li>5ccb5d9a - Use more efficient filter mechanism</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330/diffs?diff_id=60661&start_sha=35a974b52c86f4d597161057eb2f1b30d7a0b880)
Author
Member

resolved all threads

resolved all threads
Author
Member

approved this merge request

approved this merge request
yuha approved these changes 2026-07-30 18:20:20 +02:00
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
4 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
aleksis/AlekSIS-Core!2975
No description provided.