Introduce substitution to do list #633
No reviewers
Labels
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
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference
aleksis/AlekSIS-App-Chronos!633
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "225-introduce-substitution-to-do-list-generated-from-teachers-absences"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Closes #225
assigned to @yuha
added 12 commits
masterCompare with previous version
added 86 commits
ef150b95- Merge branch 'master' into new-model-based-on-calendar1d3d4ead- Merge branch 'new-model-based-on-calendar' of...0947c567- Update pyproject.toml25585b51- Fix lintfa1706c9- Drop outdated regression testc2a4ccb8- Bump version3e10726d- Correctly show supervisions in the calendar315680b9- Add supervisions to timetablec6af6bed- Merge branch 'new-model-based-on-calendar' into 211-implement-vue-substitution-frontendCompare with previous version
added 1 commit
Compare with previous version
added 1 commit
7286c731- Merge branch '211-implement-vue-substitution-frontend' into...Compare with previous version
marked this merge request as draft
added 24 commits
masterefeed7b3- Merge branch 'master' into new-model-based-on-calendare105841a- Fix migrations197cc817- Remove (unused) model and form extensions56621109- Merge branch 'new-model-based-on-calendar' into...Compare with previous version
added 1 commit
Compare with previous version
added 1 commit
Compare with previous version
changed title from Draft: {-Add view for all timetables with lesson events-} to Draft: {+Introduce substitution to do list+}
added 1 commit
Compare with previous version
added 6 commits
89e7d348- Allow filtering LessonEvents by course6552e7fc- Add graphene type for LessonEvent4a7d8da4- Fix "No newline at end of file"750ff75a- Allow filtering for amended and amending LessonEvents in get_objectsfa84c9d8- WIP: Add very basic substitution to-do-list8c8cb592- Merge branch 'new-model-based-on-calendar' into...Compare with previous version
added 7 commits
d1af59cf- Allow filtering for own lessons as teacherfdd0d935- Bump dev versionae6f14ac- Fix get_objects filtering for all/own lessonse1695a38- Translate timetable types in frontende028f57d- Reformat63826a5d- Show all groups in timetable view089667c1- Merge branch 'new-model-based-on-calendar' into...Compare with previous version
added 1 commit
Compare with previous version
added 1 commit
Compare with previous version
added 1 commit
d118ed16- Reformat, add translations and fix gql queriesCompare with previous version
added 8 commits
955800d1- Specify active icon for chronosf0a822c1- Merge branch 'new-model-based-on-calendar' into 211-implement-vue-substitution-frontendb022bdba- Merge branch '211-implement-vue-substitution-frontend' into...19e2816e- Adapt to CRUD refactoringcf092d08- Properly handle LessonEvents without subject3aae76cc- Merge branch '211-implement-vue-substitution-frontend' into...40edcdd0- Adapt deletion of substitutions to CRUD refactoringCompare with previous version
added 1 commit
262dc6fc- Merge branch '211-implement-vue-substitution-frontend' into...Compare with previous version
added 1 commit
37f416ea- Fix predicateCompare with previous version
TODO: Some substitutions are not displayed correctly in timetables
TODO: Menu point naming is confusing
TODO: Time range selection fields
.
(similar to coursebook)
There are some fixes related to this in !614. I am not sure whether they are already adapted here.
I'll have a look, thanks for the hint
added 7 commits
master1a573779- Merge branch 'new-model-based-on-calendar' into...f94b824e- Adapt to dropping of real_amendsCompare with previous version
added 6 commits
master0e1ffed5- Merge branch 'master' into 211-implement-vue-substitution-frontendbb438cc7- Reformat and fix lint3bec1bec- Merge branch '211-implement-vue-substitution-frontend' into...Compare with previous version
FIXME: the amendment related managers are broken – all LessonEvents with one ore more LEs they amend/that amends them are filtered out (which is not we want in this situation since we're dealing with individual lessons) – maybe the mechanism of get_single_events does this already in the correct way (by evaluating ical, cf alsijil)?
added 38 commits
master400c5787- Merge branch '216-add-preference-for-group-type-to-show-in-timetable-view' into 'master'Compare with previous version
not_amendingdoes work correctly after all, since it filters forLessonEventsthat haveamendedset, which are usually single lesson events amending a repetitive lesson eventsee https://edugit.org/AlekSIS/official/AlekSIS-Core/-/merge_requests/1448
must wait for @permcu 's changes regarding the dynamic loading mechanism in coursebook
seems to be fine now
added 1 commit
cbdf65c2- Remove uneeded commentCompare with previous version
added 1 commit
Compare with previous version
added 1 commit
42022c38- Change wording to "substitution (lesson)" in some casesCompare with previous version
This would, in general, massively benefit from some components built for the new coursebook being generalised (e.g.
LessonInformation)Filter by teachers
TODO: Add information box (including note that absences can be added in kolego) & possible allow adding absences on same page?
added 5 commits
5601afca- Change date designd80db3a0- Remove CRUDIterator elevation698cbffd- Remove some margin19b7b681- Move component related to substitution overview to seperate foldercce0c911- Layout improvementsCompare with previous version
added 1 commit
23280f8c- Reorganise grouping of substitution lessons (taken from coursebook)Compare with previous version
added 1 commit
24eb6ee1- Some visual improvements to CRUD iteratorCompare with previous version
added 1 commit
6469ef1a- Generalise date select/dynamic loading mechanism from coursebook & use for substitution pageCompare with previous version
added 1 commit
784b6359- ReformatCompare with previous version
added 2 commits
74a82a79- Add info alert with link to absences page of AlekSIS-App-Kolego57d0a08a- Add icon for cancelled lessonsCompare with previous version
added 2 commits
00de6b60- Change texts in info alertc59306db- Use small buttonCompare with previous version
added 1 commit
Compare with previous version
added 1 commit
Compare with previous version
done, requires generic component from https://edugit.org/AlekSIS/official/AlekSIS-Core/-/merge_requests/1455
done, requires https://edugit.org/AlekSIS/official/AlekSIS-Core/-/merge_requests/1455
added 1 commit
8366f02d- Adapt to generic infinite scrolling CRUD iteratorCompare with previous version
added 3 commits
9a9df667- Change cancel lesson button text4090f58d- Change layout of substitution paged949531d- Add loading status indicator in cancel buttonCompare with previous version
TODO: make cards less high
TODO: edit subject & room
i believe the word you are looking for is
tallTODO: add status icon (already edited or not?)
TODO: add filter for switching between all affected lessons & all those that still "need work"
maybe combine with the icon for cancelled lessons?
e.g. stati are:
TODO: (probably needs another issue) add options for teachers to indicate preferences (free/busy etc)
TODO: free/busy also for rooms??
t a l lTODO: short names for teachers??
TODO: cancelled button -> chip group select?
because that button is too prominent rn
approved this merge request
unapproved this merge request
TODO: show non-available teachers separately (outside of the teacher select field)?
TODO: add comment field
for now:
TODO: use status icon or card as loading indicator
and disable all fields during loading
approved this merge request
unapproved this merge request
FIXME: for some reason, prepended teacher chips disappear when loading sometimes?
added 2 commits
7bc11a67- Use item card to indicate loading status & disable fields when loadingCompare with previous version
added 1 commit
7e3b5d0a- Add skeleton loadersCompare with previous version
fields are disabled now
approved this merge request
unapproved this merge request
also needs another issue
this apparently does not happen anymore
added 2 commits
c7f41389- Remove unused code sections that were commented out21af0cbf- Use chip group for selecting cancellation statusCompare with previous version
added 2 commits
64b2f8bc- Add fields to query6f92da60- Use status-based chips for teachersCompare with previous version
card is used now
added 1 commit
7ca215a3- Make substitution card less tallCompare with previous version
added 1 commit
0e28260e- Use dummy objects instead of always creating substitutionsCompare with previous version
added 1 commit
cb9b41bb- Prevent triggering mutation on substitution card creationCompare with previous version
it's way faster now :))
looks like this now, btw:
added 1 commit
36f74cc3- ReformatCompare with previous version
add tooltips
TODO: add way to ignore absent teachers
think of way to actually persist that
TODO: button group for cancellation status?
added 4 commits
e6e1934f- Change cancellation wording8ed36ae5- Use default value for cancelled valuefd610836- Remove revert button for absent teachersa5c1bcb7- Use different iconsCompare with previous version
added 1 commit
f52c5551- Remove unused fixtureCompare with previous version
added 3 commits
51c80584- Tidy up information component1b8463ac- Drop iterator mixind930c675- Add status iconCompare with previous version
added 1 commit
c21bb4cd- Fix setting of cancellation statusCompare with previous version
added 1 commit
79e3e3d4- Patch substitutions directly after changeCompare with previous version
added 1 commit
51dee3d7- Use different initial value for cancelledCompare with previous version
added 10 commits
masterb23d8b5f- Merge branch 'master' into 225-introduce-substitution-to-do-list-generated-from-teachers-absencesCompare with previous version
added 1 commit
7fbc04f1- Fix import of timetable component in chronos menuCompare with previous version
added 2 commits
b4a356b9- Use correct query for group selectf2045a9b- Fix permissionsCompare with previous version
added 1 commit
b5b4d2a0- Remove commented out linesCompare with previous version
added 2 commits
7cdcf31e- Add comment field42e0af0b- Adapt style of teacher selectCompare with previous version
changed this line in version 55 of the diff
added 1 commit
aed4f3bf- Apply 1 suggestion(s) to 1 file(s)Compare with previous version
it does happen still; seemingly sometimes when more are fetched?
added 1 commit
57ad72fc- Add room field & rewrite save logicCompare with previous version
added 1 commit
Compare with previous version
added 1 commit
659a8dbb- Fix room selectCompare with previous version
added 1 commit
621b9b31- ReformatCompare with previous version
added 1 commit
c7179a14- Adapt to teacher fieldCompare with previous version
added 1 commit
e62d741a- Improve layoutCompare with previous version
room possible now
kind of resolved:
TeacherFieldis now used which also displays short namesadded 1 commit
032150b3- Add tooltips to teacher selectCompare with previous version
added 4 commits
070697e3- Adapt to changes in teacherField27cec7b9- Rename computed property5214a215- Add filter for incomplete substitutions4d032d66- ReformatCompare with previous version
Additionally, take other events of teacher into consideration
& indicate availability of teachers based on these factors in teacher select
this should probably be done using the aggregated free/busy mechanism from https://edugit.org/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330#2e44ad1f61249cf0440bea20d23bd07cc7f3a61a
new issue for that?
@hansegucker what do you think?
TODO: add nicer templates for the
no-dataandloadingslotsadded 2 commits
06429f5a- Move substitution overview componentde84d864- Fix room/teacher removing mechanismCompare with previous version
I have no idea how this can be done – editing the absence itself doesn't make sense; and creating a substitution with the teacher that is supposed to be absent feels weird too. Any ideas?
added 1 commit
1bf05bfe- Allow editing subjectCompare with previous version
Yes
TODO: check permissions (it probably does not make sense to only allow for showing & editing substitutions when user is owner of the respective group)
see coursebook?
added 6 commits
6e000055- Move comment field to end4b33626d- Change to grid layoutaadf0b7c- Change wording in i18n texts3e1f445e- Make icons smaller & change plus icondbe9c4c0- Add labels18a52a25- Make absence entering alert more responsiveCompare with previous version
added 1 commit
Compare with previous version
added 1 commit
9a542b4e- Add global permission to manage substitutionsCompare with previous version
now there is a global permission that bypasses this filtering and allows for managing substitutions for every group
added 1 commit
4d99f213- Delete substitutions when all fields are emptiedCompare with previous version
added 1 commit
dd7a13be- Reset ID to oldId if present on delete instead of removing substitutionCompare with previous version
added 1 commit
19b97d27- Emit event when substitution is emtied & does not contain oldIdCompare with previous version
added 2 commits
2d93f185- Only consider LessonEvent objects when searching for existing substitutionsCompare with previous version
added 1 commit
9ae3d71c- Use empty content page from coreCompare with previous version
added 1 commit
9d702308- Pass substitution start/end date to teacher fieldCompare with previous version
both possible now
This works now with https://edugit.org/AlekSIS/onboarding/AlekSIS-App-Cursus/-/merge_requests/51
added 1 commit
2357fb10- Use button group for cancellation statusCompare with previous version
added 50 commits
masterCompare with previous version
added 1 commit
Compare with previous version
added 1 commit
f23575ad- Merge branch 'master' into 225-introduce-substitution-to-do-list-generated-from-teachers-absencesCompare with previous version
requested review from @hansegucker
anyways, I'll put that in a follow-up issue
added 7 commits
masterCompare with previous version
added 1 commit
3054c85c- Merge branch 'master' into 225-introduce-substitution-to-do-list-generated-from-teachers-absencesCompare with previous version
looks nicer now:
created #254 to continue this discussion
mentioned in issue #254
Please delete file.
I don't think that this line will have an effect as the related model seems to be a group and not a substitution.
allis not a good name (reserved).Valid change?
We have Django 5 ;-)
Please make more readable.
Please make more readable.
Please make more readable.
Please add some comments explaining what is happening here.
FIXME
added 1 commit
15ed1bb4- Allow filtering by teacherCompare with previous version
this works now – but the page got painfully slow somewhere in the process.
added 1 commit
cb846ef4- Improve teacher filtering mechanism when generating substitutions from absencesCompare with previous version
changed this file in version 83 of the diff
added 1 commit
dcde9e47- Remove coverage fileCompare with previous version
I don't think so. Why do you think the related model is a group?
changed this line in version 84 of the diff
changed this line in version 84 of the diff
added 1 commit
6531ffcc- Rename permissionCompare with previous version
changed this line in version 85 of the diff
added 1 commit
0717fd02- Avoid collision with reserved nameCompare with previous version
changed this line in version 86 of the diff
added 1 commit
c55288a2- Fix manager filtersCompare with previous version
oh
changed this line in version 87 of the diff
added 1 commit
72af4d7f- Revise commentCompare with previous version
but still, we can't properly use it due to its inability to differentiate between different permissions that are to be checked depending on the operation
changed this line in version 88 of the diff
added 1 commit
Compare with previous version
changed this line in version 89 of the diff
added 1 commit
Compare with previous version
changed this line in version 90 of the diff
added 1 commit
046f9821- Improve readabilityCompare with previous version
added 1 commit
83832f8b- Add some explaining commentsCompare with previous version
added 1 commit
e4d70539- Remove unneeded importsCompare with previous version
changed this line in version 93 of the diff
added 2 commits
a1ce195f- Include teacher id in route2bfbeb67- Refetch day on delete of item without oldIdCompare with previous version
done, needs https://edugit.org/AlekSIS/official/AlekSIS-Core/-/merge_requests/1598
added 2 commits
6f974c30- Reformat7bfa14f0- Fix lesson event graphene typeCompare with previous version
added 1 commit
3cd2e0fa- ReformatCompare with previous version
@hansegucker ?
What about using the subject chip select field?
good idea
added 1 commit
ce422359- Use subject chip select fieldCompare with previous version
marked this merge request as ready
How could it be a substitution? This is a permission for creating – there is no substitution yet.
changed this line in version 97 of the diff
added 1 commit
28ed5668- Remove superfluous object perm checkCompare with previous version
resolved all threads
assigned to @hansegucker and unassigned @yuha
@hansegucker please have a look again
German comment
changed this line in version 98 of the diff
added 1 commit
5f2101c1- Remove unused commentCompare with previous version
resolved all threads
What's the status on this? @yuha @hansegucker
added 125 commits
masterCompare with previous version
marked this merge request as draft
added 2 commits
Compare with previous version
added 3 commits
c3cc1065- Merge branch 'master' into 225-introduce-substitution-to-do-list-generated-from-teachers-absencesd1238637- Add permission check for owner timetables05dd6d08- Fix prefetch absence logicCompare with previous version
added 1 commit
3df5f151- Add missing importsCompare with previous version
marked this merge request as ready
resolved all threads
changed this line in version 103 of the diff
added 1 commit
9036631a- Apply 1 suggestion(s) to 1 file(s)Compare with previous version
That doesn't work:
BROKEN!
TODO: do some optimizations – the page gets fairly slow with a high amount of lessons
added 2 commits
8158904e- Fix duplicated roomsf9d0bce2- Fix faulty clearing of teachers on comment saveCompare with previous version
added 1 commit
9ce289d4- Set cancelled to false when entering teacher/roomCompare with previous version
added 1 commit
6f0c5145- Fix filtering by teachersCompare with previous version
1, 2, 4, 5 fixed
added 1 commit
c30cfe63- Update changelogCompare with previous version
.
3 fixed
added 1 commit
188b6b64- Clear dummy substitution after deleting substitution with oldIdCompare with previous version
added 1 commit
Compare with previous version
added 1 commit
356bd117- Fix setting of subject of substitutionsCompare with previous version
added 2 commits
7eb1105f- Use shorter dayIncrement0f093525- Don't pass start/end date to teacher fieldCompare with previous version
added 1 commit
681754c4- Make layout slightly more compactCompare with previous version
added 1 commit
c58464f9- Fetch subjects, teachers and rooms once and pass them downCompare with previous version
I've reduced the increment now and teachers, rooms and subjects are now fetched once and passed down (needs https://edugit.org/AlekSIS/onboarding/AlekSIS-App-Cursus/-/merge_requests/68)– but I can't think of anything else right now
resolved all threads
changed the description
added 1 commit
3e4cdf88- Reformat and fix lintCompare with previous version
mentioned in commit
263e68fe45