aleksis/AlekSIS-App-Chronos
Watch
10
0
Fork
You've already forked AlekSIS-App-Chronos
 0
Code Issues 49 Pull requests 4 Projects Releases 4 Packages 1 Activity Actions

Resolve "Take teachers' availability status into account in substitution planning" #741

Merged
hansegucker merged 17 commits from 290-take-teachers-availability-status-into-account-in-substitution-planning into master 2025-07-14 14:24:49 +02:00
Conversation 22 Commits 17 Files changed 7 +172 -44
yuha commented 2025-05-15 01:12:13 +02:00
Member
Copy link

Closes #290

Closes #290
yuha commented 2025-05-15 01:12:13 +02:00
Author
Member
Copy link

assigned to @yuha

assigned to @yuha
yuha commented 2025-05-31 22:45:33 +02:00
Author
Member
Copy link

added 6 commits

  • 7d225bc6 - Include LessonEvents in FreeBusyEvent feed
  • ee5bd730 - Handle absences correctly (?)
  • 40f58929 - Add str method to LessonEvent
  • 906b26b6 - Finally fix f/b aggregation handling of amended lessons
  • c3aaa658 - Reformat
  • bd0ad225 - (Probably) make substitution method faster

Compare with previous version

added 6 commits <ul><li>7d225bc6 - Include LessonEvents in FreeBusyEvent feed</li><li>ee5bd730 - Handle absences correctly (?)</li><li>40f58929 - Add str method to LessonEvent</li><li>906b26b6 - Finally fix f/b aggregation handling of amended lessons</li><li>c3aaa658 - Reformat</li><li>bd0ad225 - (Probably) make substitution method faster</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/437/diffs?diff_id=63400&start_sha=9fa9e38749488c02d21b7c0bdd3a4ec53206a057)
yuha commented 2025-05-31 23:16:31 +02:00
Author
Member
Copy link

added 1 commit

  • 8513af0a - Pass availability time range to teacher field

Compare with previous version

added 1 commit <ul><li>8513af0a - Pass availability time range to teacher field</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/437/diffs?diff_id=63403&start_sha=bd0ad2250d330b9415e466acc76becd1e46c439c)
yuha commented 2025-06-01 00:06:43 +02:00
Author
Member
Copy link

added 2 commits

  • a407eb72 - Exclude cancelled lesson events from f/b feed
  • 76cc9a4b - Merge branch '247-use-lessonevent-feed-for-aggregated-availability-feed' into...

Compare with previous version

added 2 commits <ul><li>a407eb72 - Exclude cancelled lesson events from f/b feed</li><li>76cc9a4b - Merge branch &#39;247-use-lessonevent-feed-for-aggregated-availability-feed&#39; into...</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/437/diffs?diff_id=63410&start_sha=8513af0a3135f584f54c847bc5e54921c5a49dee)
yuha commented 2025-06-06 17:17:59 +02:00
Author
Member
Copy link

added 1 commit

  • 71c58cfb - Fix substitution planning page for non-admin users

Compare with previous version

added 1 commit <ul><li>71c58cfb - Fix substitution planning page for non-admin users</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/437/diffs?diff_id=64600&start_sha=76cc9a4b9135e1b36a5246561a9d049c8bf779ee)
yuha commented 2025-06-06 17:22:39 +02:00
Author
Member
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>b7d9ebb4 - Reformat</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/437/diffs?diff_id=64601&start_sha=71c58cfb5c3a29792112002d026472d49ccf3429)
yuha commented 2025-06-29 12:54:03 +02:00
Author
Member
Copy link

marked this merge request as ready

marked this merge request as **ready**
yuha commented 2025-06-29 12:55:05 +02:00
Author
Member
Copy link

@hansegucker please give this a test; somehow it seems to me that after dropping the detour via the legacy calendar feed generation mechanism and instead resorting directly on get_occurrences this became slower?

@hansegucker please give this a test; somehow it seems to me that after dropping the detour via the legacy calendar feed generation mechanism and instead resorting directly on get_occurrences this became slower?
yuha commented 2025-06-29 12:55:14 +02:00
Author
Member
Copy link

assigned to @hansegucker and unassigned @yuha

assigned to @hansegucker and unassigned @yuha
yuha commented 2025-07-05 02:26:35 +02:00
Author
Member
Copy link

added 1 commit

  • a5cba618 - Implement priority availability type

Compare with previous version

added 1 commit <ul><li>a5cba618 - Implement priority availability type</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/437/diffs?diff_id=65887&start_sha=b7d9ebb4cb7d7585d0f184545ecb297fd34f9d0e)
yuha commented 2025-07-05 02:34:44 +02:00
Author
Member
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>428de686 - Reformat</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/437/diffs?diff_id=65890&start_sha=a5cba618a848b41b6a1794cca5744c5c890cf654)
hansegucker commented 2025-07-08 22:48:24 +02:00
Owner
Copy link

Same as in the other MR

Same as in the other MR
hansegucker commented 2025-07-08 22:48:24 +02:00
Owner
Copy link

That distinct shouldn't be necessary.

That distinct shouldn't be necessary.
yuha commented 2025-07-13 20:15:30 +02:00
Author
Member
Copy link

forget about that, at least its not slow anymore for me. don't know how this occured

forget about that, at least its not slow anymore for me. don't know how this occured
yuha commented 2025-07-13 20:18:12 +02:00
Author
Member
Copy link

mentioned in merge request AlekSIS-Core!2173

mentioned in merge request AlekSIS-Core!2173
yuha commented 2025-07-13 20:36:04 +02:00
Author
Member
Copy link

changed this line in version 8 of the diff

changed this line in [version 8 of the diff](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/437/diffs?diff_id=66169&start_sha=428de6863486e64d64c053d2b0bcbd9d33e92409#aff889560e418df674a6887a541974fc95f8cd36_668_666)
yuha commented 2025-07-13 20:36:05 +02:00
Author
Member
Copy link

added 2 commits

  • 7107de33 - Use more efficient mechanism for filtering lesson events relevant for free/busy status
  • 68b31ebe - Merge branch '247-use-lessonevent-feed-for-aggregated-availability-feed' into...

Compare with previous version

added 2 commits <ul><li>7107de33 - Use more efficient mechanism for filtering lesson events relevant for free/busy status</li><li>68b31ebe - Merge branch &#39;247-use-lessonevent-feed-for-aggregated-availability-feed&#39; into...</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/437/diffs?diff_id=66169&start_sha=428de6863486e64d64c053d2b0bcbd9d33e92409)
yuha commented 2025-07-13 20:37:14 +02:00
Author
Member
Copy link

changed this line in version 9 of the diff

changed this line in [version 9 of the diff](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/437/diffs?diff_id=66170&start_sha=68b31ebe07460d1350ff4a24b7dce9e5cc6056f8#601948d5f8dd219a0874cb98a4b16b80f18d0628_73_73)
yuha commented 2025-07-13 20:37:15 +02:00
Author
Member
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>46e43a27 - Remove unused distinct call</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/437/diffs?diff_id=66170&start_sha=68b31ebe07460d1350ff4a24b7dce9e5cc6056f8)
yuha commented 2025-07-13 20:37:19 +02:00
Author
Member
Copy link

resolved all threads

resolved all threads
hansegucker commented 2025-07-14 13:33:51 +02:00
Owner
Copy link

added 39 commits

  • 46e43a27...9c50b779 - 38 commits from branch master
  • 103b6f62 - Merge branch 'master' into...

Compare with previous version

added 39 commits <ul><li>46e43a27...9c50b779 - 38 commits from branch <code>master</code></li><li>103b6f62 - Merge branch &#39;master&#39; into...</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/437/diffs?diff_id=66175&start_sha=46e43a270708bb08493f44031d942c922b8baf0f)
hansegucker commented 2025-07-14 14:24:50 +02:00
Owner
Copy link

mentioned in commit c25ff8a8c9

mentioned in commit c25ff8a8c97f1b60cbef652cdbaabd9b4455b381
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

  
source::aleksolotl
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
source::aleksolotl
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
hansegucker
2 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-App-Chronos!741
No description provided.