Fix employment contract feature #200

Open

yuha wants to merge 30 commits from 62-fix-employment-contract into master

pull from: 62-fix-employment-contract

merge into: aleksis:master

aleksis:master

aleksis:weblate-frontend

aleksis:tmp-alsijil-migration-fsmw

aleksis:aleksolotl-checks

aleksis:53-fix-expand-row-in-employmentcontract-list

aleksis:check/update-builddeps-package-json

aleksis:check/update-eslint-rc-js

aleksis:46-add-management-of-working-times

aleksis:49-use-generic-crud-list-features

aleksis:47-add-injectable-calendar-details-event-bar-indicating-work-hour-quotas-sourced-from-kolego

aleksis:release/0.1.0.dev3

aleksis:9-bugs-with-absences

Conversation 3 Commits 30 Files changed 19 +596 -144

yuha commented 2026-09-25 00:38:53 +02:00

Member

Copy link

Information and screenshots

No further information have been provided.

Checklist

• tox -e reformat,lint used
• Changelog updated/No update necessary
• Documentation (incl. Screenshots) up-to-date
• Copyright in apps.py and README.rst up-to-date
• (Unit) tests for new feature/regression tests for bug fixes (only if useful)
• Adhere to URL scheme
• Tested with admin account
• Tested with normal account (based on permissions)

Backend checklist

• Use permissions for all GraphQL mutations
• Use query optimizer for all GraphQL queries
• Don't use inefficient DB queries

Frontend checklist (mandatory with ~"part::frontend")

• Screenshots are attached (mobile and desktop)
• Tested on mobile, tablet, and desktop sizes
• Adhered to frontend guidelines
• Checked with Firefox Accessibility Checker

## Information and screenshots No further information have been provided. ## Checklist - [x] `tox -e reformat,lint` used - [x] Changelog updated/No update necessary - [ ] Documentation (incl. Screenshots) up-to-date - [ ] Copyright in `apps.py` and `README.rst` up-to-date - [ ] (Unit) tests for new feature/regression tests for bug fixes (only if useful) - [ ] Adhere to [URL scheme](https://code.teckids.org/aleksis/aleksis/issues/86) - [ ] Tested with admin account - [ ] Tested with normal account (based on permissions) ## Backend checklist - [x] Use permissions for all GraphQL mutations - [x] Use query optimizer for all GraphQL queries - [x] Don't use inefficient DB queries ## Frontend checklist (mandatory with ~"part::frontend") - [x] Screenshots are attached (mobile and desktop) - [x] Tested on mobile, tablet, and desktop sizes - [ ] Adhered to [frontend guidelines](hhttps://code.teckids.org/aleksis/AlekSIS/src/branch/master/project/frontend_guidelines.rst) - [ ] Checked with [Firefox Accessibility Checker](https://firefox-source-docs.mozilla.org/devtools-user/accessibility_inspector/)

yuha added the

part

backend

type

bug

labels 2026-09-25 00:38:53 +02:00

yuha self-assigned this 2026-09-25 00:38:53 +02:00

yuha added 1 commit 2026-09-25 00:38:53 +02:00

Bump version to 3.0.0 799e97332a

yuha added

part

frontend

and removed

part

backend

labels 2026-09-25 00:38:57 +02:00

yuha changed title from Fix employment contract feature to WIP: Fix employment contract feature 2026-09-25 00:39:01 +02:00

yuha commented 2026-09-25 00:40:59 +02:00

Author

Member

Copy link

Closes #53
Closes #59
Closes #60

Closes https://code.teckids.org/aleksis/AlekSIS-App-Kolego/issues/53 Closes https://code.teckids.org/aleksis/AlekSIS-App-Kolego/issues/59 Closes https://code.teckids.org/aleksis/AlekSIS-App-Kolego/issues/60

yuha added 1 commit 2026-09-25 00:41:40 +02:00

Remove v-container from absence CRUD list 89216413a0

yuha added 1 commit 2026-09-25 15:11:06 +02:00

Add uuid to person 251eff3a81

yuha added 1 commit 2026-09-25 15:11:50 +02:00

Re-add date_start cdf668c6b0

yuha added 1 commit 2026-09-25 15:12:23 +02:00

Adapt employment contract list to composable API 8d60bbaf85

yuha added 1 commit 2026-09-30 21:37:14 +02:00

Use CalendarFeedField directly from objectSchema 11da828629

yuha added 1 commit 2026-09-30 23:34:00 +02:00

Make subquota form fields wider 4a2cead553

yuha added 1 commit 2026-09-30 23:34:22 +02:00

Fix quota field modelValue update mechanism / drop id 23fd1ec722

yuha added 1 commit 2026-10-01 00:18:10 +02:00

Ensure quota value is always sent with patch data 8f6e1c14df

yuha added 1 commit 2026-10-01 00:22:25 +02:00

Fix time logging calendar feeds creation and display for subquotas 0ff51046d8

yuha added 1 commit 2026-10-02 00:35:17 +02:00

Change base durations for quota 8e9e0d118f

yuha force-pushed 62-fix-employment-contract from 8e9e0d118f to 70944dd066 2026-10-02 00:37:08 +02:00 Compare

yuha added 1 commit 2026-10-02 01:07:10 +02:00

WIP: Add function to aggregate linked calendar events' duration for employment contracts 7dbdc0fd74

yuha referenced this pull request from aleksis/AlekSIS-Core 2026-10-08 14:06:21 +02:00

Add get_objects_for_person helper function to CalendarEvent/CalendarFeed #4020

yuha force-pushed 62-fix-employment-contract from 7dbdc0fd74 to 8c1c9dff59 2026-10-08 15:35:57 +02:00 Compare

yuha added 1 commit 2026-10-08 17:21:21 +02:00

Add calendar event duration fields to graphql types 14a089aad9

yuha added 1 commit 2026-10-08 18:02:05 +02:00

WIP: Add person widget for employment contracts 85965ba80a

yuha added 1 commit 2026-10-08 23:47:13 +02:00

Use i18n for quota display & add seperate card 233bd30c05

yuha added 1 commit 2026-10-08 23:58:10 +02:00

Also display subquotas 460b36ad33

yuha added 1 commit 2026-10-09 00:02:14 +02:00

Use quota units 80b98af44b

yuha added 1 commit 2026-10-09 00:33:55 +02:00

Handle empty subquotas 12cccdd3b7

yuha added 1 commit 2026-10-09 00:37:01 +02:00

Factor out useQuotaDisplay 23394d39b1

yuha added 1 commit 2026-10-09 00:39:10 +02:00

Improve layout of quota statistics card d43a9cda10

yuha added 1 commit 2026-10-09 00:50:09 +02:00

Drop statistics page references b70b1c8654

yuha added 1 commit 2026-10-09 01:45:11 +02:00

Hide calendarEventDurationInTimePeriod field from tables 8d2ac7789c

yuha added 1 commit 2026-10-09 01:51:02 +02:00

Add date field 24c6210009

yuha added 1 commit 2026-10-09 02:14:47 +02:00

Improve layout 41d0023d03

yuha added 1 commit 2026-10-09 02:20:28 +02:00

Show relevant time span 0b5dd46c43

yuha commented 2026-10-09 02:22:36 +02:00

Author

Member

Copy link


image.png

46 KiB

yuha commented 2026-10-09 02:22:42 +02:00

Author

Member

Copy link


image.png

80 KiB

yuha added 1 commit 2026-10-09 02:23:07 +02:00

Also shrink size of absence reason chip 81dc920c82

yuha added 1 commit 2026-10-09 02:30:32 +02:00

Remove todos & add permissions 17de5d20ca

yuha added 1 commit 2026-10-09 02:32:17 +02:00

Fix rules naming 06a9c19ed8

yuha added 1 commit 2026-10-09 02:34:47 +02:00

Add changelog 5ab2b2dfbc

yuha added 1 commit 2026-10-09 02:38:56 +02:00

Fix predicate naming df5aacdb37

yuha added 1 commit 2026-10-09 02:40:25 +02:00

Reformat 8bce7219f5

yuha changed title from WIP: Fix employment contract feature to Fix employment contract feature 2026-10-09 02:40:26 +02:00

yuha requested review from hansegucker 2026-10-09 02:40:32 +02:00

Some checks failed

Hide checks

CI / lock (push) Successful in 31s

Details

CI / lint (push) Failing after 52s

Details

CI / build (push) Successful in 1m13s

Details

CI / test (push) Successful in 2m43s

Details

CI / tests-done (push) Failing after 2s

Required

Details

CI / publish (push) Has been skipped

Details

This pull request is blocked because it's outdated.

This branch is out-of-date with the base branch

You are not authorized to merge this pull request.

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin 62-fix-employment-contract:62-fix-employment-contract

git switch 62-fix-employment-contract

Sign in to join this conversation.

Reviewers

No reviewers

hansegucker

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-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-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

yuha

1 participant

Notifications

Subscribe

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-Kolego!200

No description provided.