Resolve "Add management of working times" #153
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-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-Kolego!153
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "46-add-management-of-working-times"
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 #46
assigned to @hansegucker
added 5 commits
Compare with previous version
added 1 commit
Compare with previous version
added 5 commits
Compare with previous version
added 15 commits
Compare with previous version
added 6 commits
Compare with previous version
added 3 commits
Compare with previous version
added 7 commits
Compare with previous version
added 1 commit
Compare with previous version
marked this merge request as ready
Needs:
https://edugit.org/AlekSIS/official/AlekSIS-App-Kolego/-/merge_requests/91
added 46 commits
masterd4948f2e- Add _str_ and metaclass to EmploymentContract391277bf- Change time_logging_calendar_feeds to ArrayField0d0fd99e- Add missing CalendarFeedField importd2fdec6f- Show timeLoggingCalendarFeeds with chipsf9b6ad0e- Rename EmploymentContracts queries and mutationsd18a5cea- Add rules to EmploymentContract frontend404af384- Make updating EmploymentContracts workd0ace01e- Reformatb0f58180- Fix missing icon621e51c8- ReformatCompare with previous version
This logic should live as properties in the model.
This logic should live as property in the model.
This looks inefficient, nobody will set a permission for a single absence reason.
This concept now exists.
Please use consistent capitalization.
That should live in
maintain_default_datainstead of a migration.TODO
requested changes
resolved all threads
I can not reproduce. Can you try again and if applicable please send more detailed instructions for reproduction.
resolved all threads
changed this line in version 10 of the diff
changed this line in version 10 of the diff
changed this line in version 10 of the diff
changed this line in version 10 of the diff
changed this line in version 10 of the diff
changed this line in version 10 of the diff
added 12 commits
5dbab94f- Create staff AbsenceReasonTag via maintain_default_datad5948fb6- Allow EmploymentContract end date to be empty1e885e23- Change capitalization8fb8f20f- Remove already done todoaccf3d47- Add AvailabilityTypeQuotas to EmploymentContracts95f4bcba- Reformatf396dadc- Set more useful default values for working hours12b5b194- Guard against unset quotas51e1c61c- Fix uuid field in employment contract migration04cc5eef- Exclude uuid in auto generated quotasCompare with previous version
added 1 commit
a04470b8- ReformatCompare with previous version
Lint runs locally. The three errors seem caused by missing imports from core. Errors do not happen if code is run. Only here during lint.
TODO: Add timeLoggingCalendarFeeds to individual staff absence reason and availability type quotas
TODO: Add duration field in frontend
added 1 commit
Compare with previous version
.
I filled out the minimum data:
OK. Even with this input which is similar to the last you posted I can not reproduce the original error. The new error you encountered seems to be related to Hangzihs WIP commit. Since it is called WIP I think errors could still happen there.
I have no idea. It just doesn't work and please coordinate with @yuha to solve it.
Please try without yuhas wip commit. It should work then. That a wip can error seems fine for me. It is not finished.
Unkaputte das mal
probably as own model
TODO: generalize quotas into one model; at least one of absence reason, availability type and time logging calendar feeds all needs to be not empty
does help to represent something like subquotas for actually delivered substitution lessons
with durations as generated fields
see https://edugit.org/AlekSIS/official/AlekSIS-App-Kolego/-/merge_requests/90#note_114700
added 1 commit
Compare with previous version
added 1 commit
Compare with previous version
added 1 commit
Compare with previous version
added 1 commit
Compare with previous version
added 1 commit
d8574b7e- Implement subquotas and seperate time quota model and adapt frontendCompare with previous version
added 1 commit
f7ea197c- ReformatCompare with previous version
added 4 commits
2bd63acc- Remove unused code78f6a783- Re-introduce encoded duration fields in graphene23b6e658- Remove comment853ad2f6- Use CRUDList instead of InlineCRUDListCompare with previous version
resolved all threads
added 1 commit
77d54b0d- Add better handling for empty subquotasCompare with previous version
added 2 commits
91bc5500- Set new quotaBase default valueCompare with previous version
added 1 commit
Compare with previous version
added 5 commits
a47e67bf- Add separate field for additional subquotasef7d849e- Refactor subquotas frontendd4df6906- Filter __typename prop of quotas when sending1852ecf5- Remove done todob49fef30- Fix querying for canEdit/canDelete fieldsCompare with previous version
added 1 commit
Compare with previous version
That should be a method in the quota model.
That should be a method in the quota model.
TODO
changed this line in version 25 of the diff
added 1 commit
Compare with previous version
added 1 commit
Compare with previous version
added 3 commits
Compare with previous version
resolved all threads
changed this line in version 28 of the diff
changed this line in version 28 of the diff
added 1 commit
Compare with previous version
added 5 commits
49956c24- Properly implement M2M/FK extras update/deletebbdc2bc6- Handle absence reason and availability type fields correctly0a368d65- Remove unused todoe26dbc6e- Add remove button for subquotas60507c25- Move duration iso string generator code in modelCompare with previous version
added 1 commit
23919b91- Remove accidentally added event bar componentCompare with previous version
added 1 commit
c43ef9fd- ReformatCompare with previous version
requested review from @hansegucker
mentioned in commit
ea91c75098