Resolve "Allow creation of custom LessonEvents" #740

Merged

permcu merged 35 commits from 237-allow-creation-of-custom-lessonevents into master 2025-06-04 10:20:28 +02:00

Conversation 26 Commits 35 Files changed 11 +454 -55

permcu commented 2025-04-16 17:45:51 +02:00 (Migrated from edugit.org)

Copy link

Closes #237

Closes #237 

permcu commented 2025-04-16 17:45:51 +02:00 (Migrated from edugit.org)

Copy link

requested review from @ZugBahnHof

requested review from @ZugBahnHof

permcu commented 2025-04-16 17:45:51 +02:00 (Migrated from edugit.org)

Copy link

assigned to @hansegucker

assigned to @hansegucker

permcu commented 2025-04-16 17:47:03 +02:00 (Migrated from edugit.org)

Copy link

added 1 commit

• 511581d9 - TMP Create LessonEventDialog

Compare with previous version

added 1 commit <ul><li>511581d9 - TMP Create LessonEventDialog</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/436/diffs?diff_id=60081&start_sha=0dd44ccc645fcc0141ff24e2e10b3b1e1dad1be6)

yuha commented 2025-04-16 22:53:54 +02:00 (Migrated from edugit.org)

Copy link

added 2 commits

• 353b358a - Fix typo
• b4e5cbfe - Add create button component correctly

Compare with previous version

added 2 commits <ul><li>353b358a - Fix typo</li><li>b4e5cbfe - Add create button component correctly</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/436/diffs?diff_id=60104&start_sha=511581d96bb4fb57bb20095256a2e65d8fdbfb52)

permcu commented 2025-04-25 16:22:30 +02:00 (Migrated from edugit.org)

Copy link

added 15 commits

• b4e5cbfe...9fa9e387 - 5 commits from branch master
• c9b96507 - Merge remote-tracking branch 'origin/master' into 237-allow-creation-of-custom-lessonevents
• 47d31b04 - Add labels and their translations for fields of LessonEventDialog
• 90506dfd - Reorder fields of LessonEventDialog and comment slotNumber* fields
• 4916b3b7 - Use standard fields in AmendLesson.vue
• cfe1d2b9 - Make AmendLesson comment field wider and narrower with auto-grow
• e48628aa - Use fields from AmendLesson in LessonEventDialog
• dd40ef70 - Add GroupField to LessonEventDialog
• 701fabb9 - Add CourseField to LessonEventDialog
• 4bc0d3a8 - Remove unused item arg
• d58c68d4 - Fill LessonEventDialog with course fields if selected and appropriate

Compare with previous version

added 15 commits <ul><li>b4e5cbfe...9fa9e387 - 5 commits from branch <code>master</code></li><li>c9b96507 - Merge remote-tracking branch &#39;origin/master&#39; into 237-allow-creation-of-custom-lessonevents</li><li>47d31b04 - Add labels and their translations for fields of LessonEventDialog</li><li>90506dfd - Reorder fields of LessonEventDialog and comment slotNumber* fields</li><li>4916b3b7 - Use standard fields in AmendLesson.vue</li><li>cfe1d2b9 - Make AmendLesson comment field wider and narrower with auto-grow</li><li>e48628aa - Use fields from AmendLesson in LessonEventDialog</li><li>dd40ef70 - Add GroupField to LessonEventDialog</li><li>701fabb9 - Add CourseField to LessonEventDialog</li><li>4bc0d3a8 - Remove unused item arg</li><li>d58c68d4 - Fill LessonEventDialog with course fields if selected and appropriate</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/436/diffs?diff_id=60423&start_sha=b4e5cbfe535115ef293eb856fa7ca44dd8d9d130)

permcu commented 2025-04-25 16:23:30 +02:00 (Migrated from edugit.org)

Copy link

added 3 commits

• 2c94b3cf - Fix wrong casing in lessonEvent.graphql
• 68375c2e - Add rules for custom lesson events
• d5b59fa6 - Add LessonEventsBatchCreateMutation

Compare with previous version

added 3 commits <ul><li>2c94b3cf - Fix wrong casing in lessonEvent.graphql</li><li>68375c2e - Add rules for custom lesson events</li><li>d5b59fa6 - Add LessonEventsBatchCreateMutation</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/436/diffs?diff_id=60424&start_sha=d58c68d4b1b78cbb8d60d111e27c5ae87a2c4f72)

permcu commented 2025-04-29 16:53:05 +02:00 (Migrated from edugit.org)

Copy link

added 20 commits

• d5b59fa6...3ec50a95 - 10 earlier commits
• 7bcffe67 - Add CourseField to LessonEventDialog
• cc0288cf - Remove unused item arg
• c5831bc2 - Fill LessonEventDialog with course fields if selected and appropriate
• b3b617a2 - Fix wrong casing in lessonEvent.graphql
• 09c999c3 - Add rules for custom lesson events
• 4cec0f43 - Add LessonEventsBatchCreateMutation
• 9e12936a - Rename LessonEventsBatchCreateMutation to singular
• 9468bba6 - Change type_name of AmendLessonBatchCreateMutation to not nameclash
• b63b039c - Fix handleCourse's setting of the course itself.
• 06bc1343 - Add managed_by_app_label to LessonEvent's meta object

Compare with previous version

added 20 commits <ul><li>d5b59fa6...3ec50a95 - 10 earlier commits</li><li>7bcffe67 - Add CourseField to LessonEventDialog</li><li>cc0288cf - Remove unused item arg</li><li>c5831bc2 - Fill LessonEventDialog with course fields if selected and appropriate</li><li>b3b617a2 - Fix wrong casing in lessonEvent.graphql</li><li>09c999c3 - Add rules for custom lesson events</li><li>4cec0f43 - Add LessonEventsBatchCreateMutation</li><li>9e12936a - Rename LessonEventsBatchCreateMutation to singular</li><li>9468bba6 - Change type_name of AmendLessonBatchCreateMutation to not nameclash</li><li>b63b039c - Fix handleCourse&#39;s setting of the course itself.</li><li>06bc1343 - Add managed_by_app_label to LessonEvent&#39;s meta object</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/436/diffs?diff_id=60464&start_sha=d5b59fa69c16651e749018bc6e2fd007eddf744c)

permcu commented 2025-04-30 17:42:08 +02:00 (Migrated from edugit.org)

Copy link

mentioned in merge request AlekSIS-Core!2109

mentioned in merge request AlekSIS-Core!2109

permcu commented 2025-05-06 17:02:47 +02:00 (Migrated from edugit.org)

Copy link

marked this merge request as ready

marked this merge request as **ready**

hansegucker commented 2025-05-20 09:23:11 +02:00 (Migrated from edugit.org)

Copy link

Please remove or use.

Please remove or use.

hansegucker commented 2025-05-20 09:23:11 +02:00 (Migrated from edugit.org)

Copy link

Please fix merge conflicts in this file.

Please fix merge conflicts in this file.

hansegucker commented 2025-05-20 09:23:11 +02:00 (Migrated from edugit.org)

Copy link

Please fix merge conflicts in this file.

Please fix merge conflicts in this file.

hansegucker commented 2025-05-20 09:23:12 +02:00 (Migrated from edugit.org)

Copy link

Please also fix lint.

Please also fix lint.

hansegucker commented 2025-05-20 09:23:12 +02:00 (Migrated from edugit.org)

Copy link

requested changes

requested changes

permcu commented 2025-05-20 17:28:57 +02:00 (Migrated from edugit.org)

Copy link

Should I implement support for slotNumbers if Lesrooster is present? Removed it for now.

Should I implement support for slotNumbers if Lesrooster is present? Removed it for now.

permcu commented 2025-05-20 17:47:58 +02:00 (Migrated from edugit.org)

Copy link

changed this line in version 6 of the diff

changed this line in [version 6 of the diff](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/436/diffs?diff_id=61655&start_sha=06bc1343363714f00c493ea407fca72506a6b8c6#0a6cf926dfc8bdb970edb54c84502b739b23c89c_105_80)

permcu commented 2025-05-20 17:47:59 +02:00 (Migrated from edugit.org)

Copy link

changed this line in version 6 of the diff

changed this line in version 6 of the diff

permcu commented 2025-05-20 17:47:59 +02:00 (Migrated from edugit.org)

Copy link

changed this line in version 6 of the diff

changed this line in version 6 of the diff

permcu commented 2025-05-20 17:48:00 +02:00 (Migrated from edugit.org)

Copy link

added 18 commits

• 06bc1343...9fa9e387 - 5 commits from branch master
• 9fa9e387...745759de - 3 earlier commits
• 0f38be18 - Pass attrs & listeners from LessonEventDialog to CalendarEventDialog
• ccef2083 - Remove nonexistent description field from LessonEvent backend
• fc4ee65c - Move comment up in LessonEventDialog
• f9f5e983 - Fix name of LessonEvent patch mutation
• 3738a8fe - Make LessonDetails handle creating and deleting custom LessonEvents
• 85b44827 - Pass save event through LessonEventDialog and refresh timetable with
• 4baef40a - Fix cancelled v-checkbox having null as falsy value
• 695f5193 - Remove unimplemented and commented slotNumberX fields
• 5a1ce2cd - Merge 'origin/master' into 237-allow-creation-of-custom-lessonevents
• b53d71fb - Reformat

Compare with previous version

added 18 commits <ul><li>06bc1343...9fa9e387 - 5 commits from branch <code>master</code></li><li>9fa9e387...745759de - 3 earlier commits</li><li>0f38be18 - Pass attrs &amp; listeners from LessonEventDialog to CalendarEventDialog</li><li>ccef2083 - Remove nonexistent description field from LessonEvent backend</li><li>fc4ee65c - Move comment up in LessonEventDialog</li><li>f9f5e983 - Fix name of LessonEvent patch mutation</li><li>3738a8fe - Make LessonDetails handle creating and deleting custom LessonEvents</li><li>85b44827 - Pass save event through LessonEventDialog and refresh timetable with</li><li>4baef40a - Fix cancelled v-checkbox having null as falsy value</li><li>695f5193 - Remove unimplemented and commented slotNumberX fields</li><li>5a1ce2cd - Merge &#39;origin/master&#39; into 237-allow-creation-of-custom-lessonevents</li><li>b53d71fb - Reformat</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/436/diffs?diff_id=61655&start_sha=06bc1343363714f00c493ea407fca72506a6b8c6)

permcu commented 2025-05-20 17:48:16 +02:00 (Migrated from edugit.org)

Copy link

resolved all threads

resolved all threads

permcu commented 2025-05-20 18:27:33 +02:00 (Migrated from edugit.org)

Copy link

I reformated & no errors on my machine. But 18 errors here. All of them graphql related. Some fields are not queriable. But this is not true, as a quick look at the schema reveals. I do not know what is going on there.

I reformated & no errors on my machine. But 18 errors here. All of them graphql related. Some fields are not queriable. But this is not true, as a quick look at the schema reveals. I do not know what is going on there.

permcu commented 2025-05-30 10:59:15 +02:00 (Migrated from edugit.org)

Copy link

added 1 commit

• e94ab92a - Update input names in amendLesson.graphql as well

Compare with previous version

added 1 commit <ul><li>e94ab92a - Update input names in amendLesson.graphql as well</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/436/diffs?diff_id=63349&start_sha=b53d71fb1f5ee604e13ade46317ac7245be1d1c9)

hansegucker commented 2025-06-03 22:12:04 +02:00 (Migrated from edugit.org)

Copy link

changed the description

changed the description

hansegucker commented 2025-06-03 22:21:37 +02:00 (Migrated from edugit.org)

Copy link

added 1 commit

• ede798d1 - Allow empty courses/subjects for custom lesson events and fix layout of dialog

Compare with previous version

added 1 commit <ul><li>ede798d1 - Allow empty courses/subjects for custom lesson events and fix layout of dialog</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/436/diffs?diff_id=64269&start_sha=e94ab92a6a9ef89f090cb07c17d19f74ba94c855)

hansegucker commented 2025-06-03 22:22:29 +02:00 (Migrated from edugit.org)

Copy link

resolved all threads

resolved all threads

hansegucker (Migrated from edugit.org) merged commit 44b65b93ec into master 2025-06-04 10:20:28 +02:00

hansegucker commented 2025-06-04 10:20:29 +02:00 (Migrated from edugit.org)

Copy link

mentioned in commit 44b65b93ec

mentioned in commit 44b65b93ec4d8612c371651d8253ae28e4bed995

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

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-Chronos!740

No description provided.