aleksis/AlekSIS-Core
9
0
Fork 0
Code Issues 197 Pull requests 63 Projects Releases 14 Packages 1 Wiki Activity Actions

WIP: Draft: Resolve "Add specific availability planning frontend" #3513

Draft
yuha wants to merge 25 commits from 1268-add-specific-availability-planning-frontend into master
pull from: 1268-add-specific-availability-planning-frontend
merge into: aleksis:master
Conversation 34 Commits 25 Files changed 15 +515 -73
yuha commented 2025-05-23 18:48:24 +02:00
Member
Copy link

Closes #1268

image.png

Closes #1268 ![image.png](/uploads/d531222da63ac9592d7f5d812b063de8/image.png)
yuha commented 2025-05-23 18:48:25 +02:00
Author
Member
Copy link

assigned to @yuha

assigned to @yuha
yuha commented 2025-06-06 17:52:26 +02:00
Author
Member
Copy link

added 72 commits

  • 5931820d...0cd57842 - 72 commits from branch master

Compare with previous version

added 72 commits <ul><li>5931820d...0cd57842 - 72 commits from branch <code>master</code></li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1868/diffs?diff_id=64605&start_sha=5931820d8707a6dd575356e5a44e6e650a0edbb2)
yuha commented 2025-06-29 13:01:31 +02:00
Author
Member
Copy link

added 16 commits

  • 0cd57842...0b048115 - 16 commits from branch master

Compare with previous version

added 16 commits <ul><li>0cd57842...0b048115 - 16 commits from branch <code>master</code></li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1868/diffs?diff_id=65672&start_sha=0cd578425788716933a2c3cdd9044bc75ea3519e)
yuha commented 2025-06-29 14:50:23 +02:00
Author
Member
Copy link

added 1 commit

  • 703cf802 - WIP: Add planning and overview frontend for availability events

Compare with previous version

added 1 commit <ul><li>703cf802 - WIP: Add planning and overview frontend for availability events</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1868/diffs?diff_id=65693&start_sha=0b0481155aa9c00dd09172230c2adab772827ac8)
yuha commented 2025-07-01 02:16:53 +02:00
Author
Member
Copy link

added 1 commit

  • 4b00d9d9 - Add planning and overview frontend for availability events

Compare with previous version

added 1 commit <ul><li>4b00d9d9 - Add planning and overview frontend for availability events</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1868/diffs?diff_id=65721&start_sha=703cf8020eaa3d46ec64683d73213b7d0083f1ff)
yuha commented 2025-07-02 11:07:47 +02:00
Author
Member
Copy link

added 1 commit

  • 53d666a3 - WIP: Fix edit dialog in AvailabilityEvent list

Compare with previous version

added 1 commit <ul><li>53d666a3 - WIP: Fix edit dialog in AvailabilityEvent list</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1868/diffs?diff_id=65784&start_sha=4b00d9d978a0d62ce2c06e4c03fab1e4576db335)
yuha commented 2025-07-02 23:51:57 +02:00
Author
Member
Copy link

added 1 commit

  • 56a9d841 - WIP: Fix edit dialog in AvailabilityEvent list

Compare with previous version

added 1 commit <ul><li>56a9d841 - WIP: Fix edit dialog in AvailabilityEvent list</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1868/diffs?diff_id=65827&start_sha=53d666a39af97a647b5094ff83cd4b69c2a2174f)
yuha commented 2025-07-02 23:52:44 +02:00
Author
Member
Copy link

added 34 commits

  • 56a9d841...3729a583 - 32 commits from branch master
  • 234b43a2 - Add planning and overview frontend for availability events
  • ab125cf8 - WIP: Fix edit dialog in AvailabilityEvent list

Compare with previous version

added 34 commits <ul><li>56a9d841...3729a583 - 32 commits from branch <code>master</code></li><li>234b43a2 - Add planning and overview frontend for availability events</li><li>ab125cf8 - WIP: Fix edit dialog in AvailabilityEvent list</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1868/diffs?diff_id=65828&start_sha=56a9d8410d9261b8a5b77c217361f3d766ffd9c2)
yuha commented 2025-07-03 01:35:21 +02:00
Author
Member
Copy link

added 3 commits

  • a765f153 - Fix edit dialog and title field in AvailabilityEvent list
  • fe486e79 - Add person field to AE patch mutation
  • 04653fa9 - Fix person field handling

Compare with previous version

added 3 commits <ul><li>a765f153 - Fix edit dialog and title field in AvailabilityEvent list</li><li>fe486e79 - Add person field to AE patch mutation</li><li>04653fa9 - Fix person field handling</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1868/diffs?diff_id=65830&start_sha=ab125cf84017edfdfce3454a6b647a75bc3607b7)
yuha commented 2025-07-03 01:35:49 +02:00
Author
Member
Copy link

marked this merge request as ready

marked this merge request as **ready**
yuha commented 2025-07-03 01:35:53 +02:00
Author
Member
Copy link

assigned to @hansegucker and unassigned @yuha

assigned to @hansegucker and unassigned @yuha
yuha commented 2025-07-03 01:36:31 +02:00
Author
Member
Copy link

changed the description

changed the description
yuha commented 2025-07-03 01:43:43 +02:00
Author
Member
Copy link

added 3 commits

Compare with previous version

added 3 commits <ul><li>def6b1ae - Reformat</li><li>f71a040a - Use correct translation keys</li><li>3988d954 - Add changelog entry</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1868/diffs?diff_id=65832&start_sha=04653fa9975b345b66f5e5d1c78835682a1bbfd5)
yuha commented 2025-07-04 14:00:49 +02:00
Author
Member
Copy link

added 1 commit

  • 03b260fd - Return object in person field

Compare with previous version

added 1 commit <ul><li>03b260fd - Return object in person field</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1868/diffs?diff_id=65868&start_sha=3988d95464b8039e59fe529c7088c5ffdecb1492)
yuha commented 2025-07-04 14:07:11 +02:00
Author
Member
Copy link

added 8 commits

  • 806a6fb8 - Fix recurrence and date range handling of FreeBusyEvents
  • 8ee669d3 - Merge branch '1306-person-rule-broken' into...
  • 4881a984 - Remove passing of additional filters
  • df3779ab - Add stringified event object in F/B description
  • 1fdfbd31 - Re-implement f/b aggregation with proper handling of occurences and instance-wise filtering
  • 6aaee036 - Merge branch 'master' into...
  • f647637f - Merge branch 'master' into...
  • fca21304 - Merge branch...

Compare with previous version

added 8 commits <ul><li>806a6fb8 - Fix recurrence and date range handling of FreeBusyEvents</li><li>8ee669d3 - Merge branch &#39;1306-person-rule-broken&#39; into...</li><li>4881a984 - Remove passing of additional filters</li><li>df3779ab - Add stringified event object in F/B description</li><li>1fdfbd31 - Re-implement f/b aggregation with proper handling of occurences and instance-wise filtering</li><li>6aaee036 - Merge branch &#39;master&#39; into...</li><li>f647637f - Merge branch &#39;master&#39; into...</li><li>fca21304 - Merge branch...</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1868/diffs?diff_id=65874&start_sha=03b260fd12f3fb9f6f10f81ee199223fc01ab9f7)
hansegucker commented 2025-07-08 22:39:52 +02:00
Owner
Copy link

added 22 commits

  • fca21304...a2699471 - 21 commits from branch master
  • 69cd3906 - Merge branch 'master' into '1268-add-specific-availability-planning-frontend'

Compare with previous version

added 22 commits <ul><li>fca21304...a2699471 - 21 commits from branch <code>master</code></li><li>69cd3906 - Merge branch &#39;master&#39; into &#39;1268-add-specific-availability-planning-frontend&#39;</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1868/diffs?diff_id=66123&start_sha=fca213047f2ad904dbc63ea465875a1fa56213d8)
hansegucker commented 2025-07-08 22:43:34 +02:00
Owner
Copy link

What does that rule name mean?

What does that rule name mean?
yuha commented 2025-07-13 20:14:59 +02:00
Author
Member
Copy link

you're right, that doesn't really make sense. as with personal events, this rule indicates whether a user is allowed to create the respective type of event for other persons/groups. calling this "invitations" is, in that sense, generally misleading since nothing like an invitation happens, people/groups are just added to said event.

you're right, that doesn't really make sense. as with personal events, this rule indicates whether a user is allowed to create the respective type of event for other persons/groups. calling this "invitations" is, in that sense, generally misleading since nothing like an invitation happens, people/groups are just added to said event.
yuha commented 2025-07-13 20:18:27 +02:00
Author
Member
Copy link

shall we just rename these rules?

shall we just rename these rules?
yuha commented 2025-07-13 20:57:49 +02:00
Author
Member
Copy link

FIXME: when editing, the person isn't send apparently

FIXME: when editing, the person isn't send apparently
yuha commented 2025-07-13 21:00:06 +02:00
Author
Member
Copy link

.

.
yuha commented 2025-07-13 21:00:24 +02:00
Author
Member
Copy link

FIXME: i'm unsure whether recurrences work

FIXME: i'm unsure whether recurrences work
hansegucker commented 2025-07-14 13:35:49 +02:00
Owner
Copy link

Yeah, I think so.

Yeah, I think so.
yuha commented 2025-07-18 11:37:12 +02:00
Author
Member
Copy link

changed this line in version 11 of the diff

changed this line in [version 11 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1868/diffs?diff_id=66260&start_sha=69cd390676597170c32db553ae21d11731aa8e1d#216f48f50c6758eba4a72b334fd1ea4e6af4b3c0_547_547)
yuha commented 2025-07-18 11:37:13 +02:00
Author
Member
Copy link

added 1 commit

  • 5fdaa67c - Rename rules to avoid confusion

Compare with previous version

added 1 commit <ul><li>5fdaa67c - Rename rules to avoid confusion</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1868/diffs?diff_id=66260&start_sha=69cd390676597170c32db553ae21d11731aa8e1d)
yuha commented 2025-07-18 12:15:07 +02:00
Author
Member
Copy link

added 11 commits

  • 5fdaa67c...ae4ea62a - 9 commits from branch master
  • 027a1468 - Add person to availability event meta
  • da3d5b50 - Merge branch '1331-add-person-to-availability-event-meta' into...

Compare with previous version

added 11 commits <ul><li>5fdaa67c...ae4ea62a - 9 commits from branch <code>master</code></li><li>027a1468 - Add person to availability event meta</li><li>da3d5b50 - Merge branch &#39;1331-add-person-to-availability-event-meta&#39; into...</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1868/diffs?diff_id=66265&start_sha=5fdaa67cdf8b2579629c7166fb804746216dc5e6)
yuha commented 2025-07-18 13:36:24 +02:00
Author
Member
Copy link

added 2 commits

Compare with previous version

added 2 commits <ul><li>883d1c11 - Fix handling of person field</li><li>4b7dc4f2 - Fix rrule in frontend</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1868/diffs?diff_id=66267&start_sha=da3d5b5097888e13579366b1189c9cae730acdbf)
yuha commented 2025-07-18 13:36:57 +02:00
Author
Member
Copy link

resolved all threads

resolved all threads
hansegucker commented 2025-07-23 20:37:00 +02:00
Owner
Copy link

@yuha Please fix lint.

@yuha Please fix lint.
yuha commented 2025-07-23 20:39:12 +02:00
Author
Member
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>930270a5 - Reformat</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1868/diffs?diff_id=67521&start_sha=4b7dc4f2bd5330e40d66270c73234fdf2d2ebfb8)
yuha commented 2025-07-24 17:35:40 +02:00
Author
Member
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>f7e223d6 - Use id for person field</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1868/diffs?diff_id=67562&start_sha=930270a5ee20f8082175bd138f17e9145ae98fdd)
yuha commented 2025-07-30 21:01:54 +02:00
Author
Member
Copy link

added 33 commits

  • f7e223d6...bbac1dd4 - 32 commits from branch master
  • d312c672 - Merge branch 'master' into 1268-add-specific-availability-planning-frontend

Compare with previous version

added 33 commits <ul><li>f7e223d6...bbac1dd4 - 32 commits from branch <code>master</code></li><li>d312c672 - Merge branch &#39;master&#39; into 1268-add-specific-availability-planning-frontend</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1868/diffs?diff_id=68446&start_sha=f7e223d6a7e250615cab380fca8ab1ad6389c254)
hansegucker commented 2025-08-06 20:29:57 +02:00
Owner
Copy link

added 11 commits

  • d312c672...bb3cab4b - 10 commits from branch master
  • fa330798 - Merge branch 'master' into '1268-add-specific-availability-planning-frontend'

Compare with previous version

added 11 commits <ul><li>d312c672...bb3cab4b - 10 commits from branch <code>master</code></li><li>fa330798 - Merge branch &#39;master&#39; into &#39;1268-add-specific-availability-planning-frontend&#39;</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1868/diffs?diff_id=69100&start_sha=d312c6720a1a5a387de587023b8ac12008e0bcd8)
hansegucker scheduled this pull request to auto merge when all checks succeed 2025-08-06 20:30:46 +02:00
nik commented 2025-11-12 20:22:52 +01:00
Owner
Copy link

marked this merge request as draft

marked this merge request as **draft**
This pull request has changes conflicting with the target branch.
  • CHANGELOG.rst
  • aleksis/core/frontend/components/availability_event/AvailabilityEventList.vue
  • aleksis/core/frontend/components/calendar/FilteredCalendarSelect.vue
  • aleksis/core/frontend/components/calendar_feeds/details/AvailabilitiesDetails.vue
  • aleksis/core/frontend/components/free_busy/FreeBusyOverview.vue
  • aleksis/core/frontend/components/free_busy/helpers.graphql
  • aleksis/core/frontend/messages/en.json
  • aleksis/core/frontend/routes.js
  • aleksis/core/schema/availability_event.py
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 1268-add-specific-availability-planning-frontend:1268-add-specific-availability-planning-frontend
git switch 1268-add-specific-availability-planning-frontend

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master
git merge --no-ff 1268-add-specific-availability-planning-frontend
git switch 1268-add-specific-availability-planning-frontend
git rebase master
git switch master
git merge --ff-only 1268-add-specific-availability-planning-frontend
git switch 1268-add-specific-availability-planning-frontend
git rebase master
git switch master
git merge --no-ff 1268-add-specific-availability-planning-frontend
git switch master
git merge --squash 1268-add-specific-availability-planning-frontend
git switch master
git merge --ff-only 1268-add-specific-availability-planning-frontend
git switch master
git merge 1268-add-specific-availability-planning-frontend
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Security

   
TeX
Needs LaTeX template

  
auto-update
  
board
done

  
board
ready

  
board
todo

  
check
delete-eslint-rc-js

  
check
update-builddeps-package-json

  
check
update-eslint-rc-js

  
check
update-gitignore

  
check
update-merge-request-template

  
check
update-prettier-ignore

  
check
update-pyproject-toml

  
check
update-renovate-json

  
check
update-tox-ini

  
part
backend
 Backend (view code, models, logic, etc.)

  
part
ci

  
part
docs
 Issue or addition to the documentation

  
part
frontend
 Frontend (templates, etc.)

  
part
i18n
 Translation or internationalisation issue

  
part
non-technical
 Non-technical (policy, maintenance, etc.) issue or discussion

  
part
packaging
 Issue concerning the packaging of AlekSIS and components

  
prio
1
 Priority High

  
prio
2
 Priority Medium

  
prio
3
 Priority Low

  
release-mr-5.x
  
size
large

  
size
medium

  
size
small

  
source
customer
 Requested by a customer or affiliated user

  
source
customer::fsmw

  
source
customer::fss

  
source
customer::teckids

  
source
downstream
 Issue or merge request from other projects using AlekSIS or parts of it

  
type
breaking

  
type
bug
 Bug

  
type
feature
 New feature

  
type
refactoring

  
workflow
blocked
 Issue is blocked by another issue

  
workflow
confirmed
 The bug is reproducible and will be fixed

  
workflow
current-todo

  
workflow
discussing
 Needs to be discussed before implementation

  
workflow
new-app
 Requires new AlekSIS app, which has to be created

  
workflow
wontfix
 The bug is not reproducible or the feature was decided against

No labels
Security
TeX
auto-update
board
done
board
ready
board
todo
check
delete-eslint-rc-js
check
update-builddeps-package-json
check
update-eslint-rc-js
check
update-gitignore
check
update-merge-request-template
check
update-prettier-ignore
check
update-pyproject-toml
check
update-renovate-json
check
update-tox-ini
part
backend
part
ci
part
docs
part
frontend
part
i18n
part
non-technical
part
packaging
prio
1
prio
2
prio
3
release-mr-5.x
size
large
size
medium
size
small
source
customer
source
customer::fsmw
source
customer::fss
source
customer::teckids
source
downstream
type
breaking
type
bug
type
feature
type
refactoring
workflow
blocked
workflow
confirmed
workflow
current-todo
workflow
discussing
workflow
new-app
workflow
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
hansegucker
3 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!3513
No description provided.