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

New data model based on calendar events #605

Merged
hansegucker merged 65 commits from new-model-based-on-calendar into master 2024-03-07 11:28:09 +01:00
Conversation 112 Commits 65 Files changed 27 +1674 -354
hansegucker commented 2023-05-21 21:38:00 +02:00
Owner
Copy link
No description provided.
hansegucker commented 2023-05-27 12:55:25 +02:00
Author
Owner
Copy link

added 2 commits

  • 6995c47b - Add more detailed properties to LessonEvent
  • a71d04c2 - Add SupervisionEvent model for supervisions

Compare with previous version

added 2 commits <ul><li>6995c47b - Add more detailed properties to LessonEvent</li><li>a71d04c2 - Add SupervisionEvent model for supervisions</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=30227&start_sha=b9f4bc213ca0efc95d867f0aafd569ee0f5b08d6)
hansegucker commented 2023-06-04 18:16:35 +02:00
Author
Owner
Copy link

mentioned in issue AlekSIS#58

mentioned in issue AlekSIS#58
hansegucker commented 2023-06-04 18:21:24 +02:00
Author
Owner
Copy link

added 2 commits

  • 1e979f87 - Reformat
  • 6a6159a6 - Support substitutions with CalendarEvent (status and amends)

Compare with previous version

added 2 commits <ul><li>1e979f87 - Reformat</li><li>6a6159a6 - Support substitutions with CalendarEvent (status and amends)</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=30557&start_sha=a71d04c2e65f58e147eb6a65c951e45fb0e54914)
hansegucker commented 2023-06-05 22:01:19 +02:00
Author
Owner
Copy link

added 1 commit

  • 21bd3d8d - Provide current request to all value_ and get_ methods of calendar events

Compare with previous version

added 1 commit <ul><li>21bd3d8d - Provide current request to all value_ and get_ methods of calendar events</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=30627&start_sha=6a6159a627caae7ab6efe96ab8a9faf5c7c2a076)
hansegucker commented 2023-06-07 18:02:38 +02:00
Author
Owner
Copy link

added 1 commit

  • 05dcffa9 - Make descriptions of LessonEvents compatible with substitutions

Compare with previous version

added 1 commit <ul><li>05dcffa9 - Make descriptions of LessonEvents compatible with substitutions</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=30670&start_sha=21bd3d8d258671fe07de7f7d793602b6170f8101)
hansegucker commented 2023-06-17 23:14:33 +02:00
Author
Owner
Copy link

FIXME Parent groups instead of groups in certain situations

FIXME Parent groups instead of groups in certain situations
hansegucker commented 2023-06-17 23:15:18 +02:00
Author
Owner
Copy link

FIXME Supervisions shown two times and both times not correct

FIXME Supervisions shown two times and both times not correct
hansegucker commented 2023-06-17 23:26:22 +02:00
Author
Owner
Copy link

added 2 commits

  • 084d3e00 - Fix group names in lesson event description
  • 4d6a3ded - Customize event bar and event details for lesson events

Compare with previous version

added 2 commits <ul><li>084d3e00 - Fix group names in lesson event description</li><li>4d6a3ded - Customize event bar and event details for lesson events</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=30894&start_sha=05dcffa950bd4e38080fc230c8c2a809dd3e9aa6)
leuckeju commented 2023-06-29 17:13:11 +02:00
Member
Copy link

added 1 commit

  • 609ea368 - Create migration for lesson events

Compare with previous version

added 1 commit <ul><li>609ea368 - Create migration for lesson events</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=31451&start_sha=4d6a3ded60fc256c255e2d05a97d958471b87f63)
hansegucker commented 2023-07-09 22:06:35 +02:00
Author
Owner
Copy link

added 2 commits

  • 7010fa49 - Fix displaying of time in calendar events
  • 69035127 - Merge branch 'new-model-based-on-calendar' of...

Compare with previous version

added 2 commits <ul><li>7010fa49 - Fix displaying of time in calendar events</li><li>69035127 - Merge branch &#39;new-model-based-on-calendar&#39; of...</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=32432&start_sha=609ea368eeefe4cda2079302e0d523cad7a206db)
hansegucker commented 2023-07-10 21:37:22 +02:00
Author
Owner
Copy link

added 1 commit

  • 6fea5788 - Ensure that all content of LessonEventBar is in the event bar

Compare with previous version

added 1 commit <ul><li>6fea5788 - Ensure that all content of LessonEventBar is in the event bar</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=32470&start_sha=69035127eee2856de643c236d6af3433cf6f6e7b)
hansegucker commented 2023-07-18 21:03:47 +02:00
Author
Owner
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>b5b6feaa - Fix migration history</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=32706&start_sha=6fea5788120090da8cfd73552b3736a94139d3d3)
hansegucker commented 2023-07-23 13:21:50 +02:00
Author
Owner
Copy link

added 16 commits

  • b5b6feaa...86703408 - 14 commits from branch master
  • 0b64ddc3 - Merge branch 'master' into new-model-based-on-calendar
  • b1b46778 - Update common used mixins for groups, teachers, and rooms

Compare with previous version

added 16 commits <ul><li>b5b6feaa...86703408 - 14 commits from branch <code>master</code></li><li>0b64ddc3 - Merge branch &#39;master&#39; into new-model-based-on-calendar</li><li>b1b46778 - Update common used mixins for groups, teachers, and rooms</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=32980&start_sha=b5b6feaa5012b4f11276a5395b920ab4a1e58db6)
hansegucker commented 2023-08-01 09:20:34 +02:00
Author
Owner
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>59b489d8 - Add missing migration</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=33213&start_sha=b1b4677897bad590c2d955a32f0d44e7ffa9f3ad)
hansegucker commented 2023-08-03 14:16:40 +02:00
Author
Owner
Copy link

added 1 commit

  • a1d84b63 - Add view for all timetables with lesson events

Compare with previous version

added 1 commit <ul><li>a1d84b63 - Add view for all timetables with lesson events</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=33368&start_sha=59b489d85346d0531a9fd50a02ffb0d8b21361d5)
hansegucker commented 2023-08-04 18:40:26 +02:00
Author
Owner
Copy link

added 1 commit

  • 9dff100a - Show timetables in new calendar frontend

Compare with previous version

added 1 commit <ul><li>9dff100a - Show timetables in new calendar frontend</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=33474&start_sha=a1d84b638a46af6077b961ff3eff1ce7f25d9f0a)
hansegucker commented 2023-08-07 13:57:35 +02:00
Author
Owner
Copy link

added 1 commit

  • ad65d9c6 - Move LessonEvent queries to own queryset and drop dangerous attributes

Compare with previous version

added 1 commit <ul><li>ad65d9c6 - Move LessonEvent queries to own queryset and drop dangerous attributes</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=33527&start_sha=9dff100a47011a85c2470660372afda31fb1a94d)
magicfelix commented 2023-08-09 11:15:54 +02:00
Member
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>d8671616 - Fix LessonEventQuerySet</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=33548&start_sha=ad65d9c6fcf0e858eb4cf671e1cb4084c1dc89cf)
magicfelix commented 2023-08-13 00:05:55 +02:00
Member
Copy link

added 3 commits

  • d847e079 - Adapt to Core 4.0 managed_by feature
  • d8b0f606 - Merge branch '210-adapt-to-core-4-0' into new-model-based-on-calendar
  • eebb1823 - Fix migration history

Compare with previous version

added 3 commits <ul><li>d847e079 - Adapt to Core 4.0 managed_by feature</li><li>d8b0f606 - Merge branch &#39;210-adapt-to-core-4-0&#39; into new-model-based-on-calendar</li><li>eebb1823 - Fix migration history</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=33652&start_sha=d867161692cbeef76306402c4d2cda4786b5877e)
magicfelix commented 2023-08-13 16:23:06 +02:00
Member
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>ce4a8838 - Fix teacher timetable</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=33660&start_sha=eebb1823dc227d8fda2ee445d2f0a17bcbc12975)
hansegucker commented 2023-08-13 21:06:27 +02:00
Author
Owner
Copy link

added 2 commits

  • c9772b45 - Drop import of CalendarWithControls
  • 3f75b026 - Merge branch 'new-model-based-on-calendar' of...

Compare with previous version

added 2 commits <ul><li>c9772b45 - Drop import of CalendarWithControls</li><li>3f75b026 - Merge branch &#39;new-model-based-on-calendar&#39; of...</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=33662&start_sha=ce4a883802fb2fb8fb4efaabde1dfa23486ca851)
hansegucker commented 2023-08-16 20:02:17 +02:00
Author
Owner
Copy link

Cursus missing

Cursus missing
yuha commented 2023-08-18 13:23:47 +02:00
Member
Copy link

added 1 commit

  • 9e492da7 - Add get_objects method for Supervisions

Compare with previous version

added 1 commit <ul><li>9e492da7 - Add get_objects method for Supervisions</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=33867&start_sha=3f75b0266f2d29c1a87134258b7a8c03a4f21aec)
magicfelix commented 2023-08-22 00:28:22 +02:00
Member
Copy link

Any idea on this? ENGS has this problem.

Any idea on this? ENGS has this problem.
hansegucker commented 2023-08-25 12:25:04 +02:00
Author
Owner
Copy link

Screenshot_2023-08-25_at_12-24-34_AlekSISScreenshot_2023-08-25_at_12-24-10_AlekSIS

![Screenshot_2023-08-25_at_12-24-34_AlekSIS](/uploads/2ffc75aa526d550e05b28d0bf9d35ef2/Screenshot_2023-08-25_at_12-24-34_AlekSIS.png)![Screenshot_2023-08-25_at_12-24-10_AlekSIS](/uploads/602a1d233ae6b80a3f9ddf4242e23901/Screenshot_2023-08-25_at_12-24-10_AlekSIS.png)
hansegucker commented 2023-08-25 12:26:58 +02:00
Author
Owner
Copy link

added 3 commits

  • d48546a7 - Add mobile view for timetables and improve select for timetables
  • 459937ca - Reformat
  • 8a0dc2fc - Merge branch 'new-model-based-on-calendar' of...

Compare with previous version

added 3 commits <ul><li>d48546a7 - Add mobile view for timetables and improve select for timetables</li><li>459937ca - Reformat</li><li>8a0dc2fc - Merge branch &#39;new-model-based-on-calendar&#39; of...</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=33960&start_sha=9e492da7d8bfb41f22203b3db6887be83ac2b6a0)
hansegucker commented 2023-08-25 12:52:21 +02:00
Author
Owner
Copy link

added 1 commit

  • 9bcdca79 - Fix col widths in new timetable frontend

Compare with previous version

added 1 commit <ul><li>9bcdca79 - Fix col widths in new timetable frontend</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=33965&start_sha=8a0dc2fcad3cbf7e9dcfa5deb17d8c924976e946)
hansegucker commented 2023-08-25 13:45:10 +02:00
Author
Owner
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>c07bd892 - Add missing translations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=33973&start_sha=9bcdca7916641d8a21298d89aff3fdda9262ea55)
permcu commented 2023-08-30 19:39:05 +02:00 (Migrated from edugit.org)
Copy link

Bug: Navigating to timetable works in frontend. But directly navigating to specific timetable url leads to an error in log and generic timetable frontend is shown. Tested & reproducible with url: http://localhost:8000/app/chronos/timetable/teacher/1/

JS console shows error:
Uncaught (in promise) NavigationDuplicated: Avoided redundant navigation to current location: "/app/chronos/timetable/teacher/1/".
createRouterError vue-router.esm.js:2046
createNavigationDuplicatedError vue-router.esm.js:2016
confirmTransition vue-router.esm.js:2333
transitionTo vue-router.esm.js:2260
push2 vue-router.esm.js:2606
push vue-router.esm.js:3036
push vue-router.esm.js:3035
selected Timetable.vue:34
VueJS 12
click SelectTimetable.vue:44
VueJS 4
click VListItem.ts:126
VueJS 33
vue-router.esm.js:2046:14

Bug: Navigating to timetable works in frontend. But directly navigating to specific timetable url leads to an error in log and generic timetable frontend is shown. Tested & reproducible with url: http://localhost:8000/app/chronos/timetable/teacher/1/ JS console shows error: Uncaught (in promise) NavigationDuplicated: Avoided redundant navigation to current location: "/app/chronos/timetable/teacher/1/". createRouterError vue-router.esm.js:2046 createNavigationDuplicatedError vue-router.esm.js:2016 confirmTransition vue-router.esm.js:2333 transitionTo vue-router.esm.js:2260 push2 vue-router.esm.js:2606 push vue-router.esm.js:3036 push vue-router.esm.js:3035 selected Timetable.vue:34 VueJS 12 click SelectTimetable.vue:44 VueJS 4 click VListItem.ts:126 VueJS 33 vue-router.esm.js:2046:14
hansegucker commented 2023-08-30 19:41:20 +02:00
Author
Owner
Copy link

Based on group type?

Based on group type?
hansegucker commented 2023-08-30 19:43:23 +02:00
Author
Owner
Copy link

.

.
yuha commented 2023-09-06 20:40:49 +02:00
Member
Copy link

FIXME: My timetable does not redirect to my timetable

FIXME: My timetable does not redirect to my timetable
yuha commented 2023-09-14 11:52:51 +02:00
Member
Copy link

just remove this menu entry (and all the other legacy ones)

just remove this menu entry (and all the other legacy ones)
yuha commented 2023-09-14 11:53:00 +02:00
Member
Copy link

@permcu could you do that?

@permcu could you do that?
yuha commented 2023-09-14 11:53:05 +02:00
Member
Copy link

@permcu could you do that?

@permcu could you do that?
yuha commented 2023-09-20 01:05:19 +02:00
Member
Copy link

added 2 commits

Compare with previous version

added 2 commits <ul><li>a6946c66 - Remove legacy menu entries</li><li>8b7a9d87 - Add permission check</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=34434&start_sha=c07bd892f765162b3bf3bb924c099bfd711964a6)
yuha commented 2023-09-20 01:16:31 +02:00
Member
Copy link

added 1 commit

  • c8e10b49 - Show selected timetable according to route parameters

Compare with previous version

added 1 commit <ul><li>c8e10b49 - Show selected timetable according to route parameters</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=34441&start_sha=8b7a9d87d7693fb5a03a7f12d086b9fa8dada039)
yuha commented 2023-09-25 14:28:47 +02:00
Member
Copy link

FIXME: Differentiate permissions for timetables into group/teacher/room permissions (like it was before)

FIXME: Differentiate permissions for timetables into group/teacher/room permissions (like it was before)
yuha commented 2023-09-25 14:29:50 +02:00
Member
Copy link

FIXME: Chronos parent menu point is shown regardless of permissions (even though a user is not allowed to access any timetables).

FIXME: Chronos parent menu point is shown regardless of permissions (even though a user is not allowed to access any timetables).
yuha commented 2023-09-25 14:40:49 +02:00
Member
Copy link

FIXME: Calendar auto refresh fetches wrong data when the user has switched timetables beforehand, leading to the lessons/supervisions of the first accessed plan being displayed after the first refetch. @yuha

FIXME: Calendar auto refresh fetches wrong data when the user has switched timetables beforehand, leading to the lessons/supervisions of the first accessed plan being displayed after the first refetch. @yuha
yuha commented 2023-09-25 14:41:10 +02:00
Member
Copy link

FIXME: Complete German translations

FIXME: Complete German translations
yuha commented 2023-09-25 14:41:34 +02:00
Member
Copy link

FIXME: EventBars/Details for supervisions are not differentiated enough from lessons

FIXME: EventBars/Details for supervisions are not differentiated enough from lessons
yuha commented 2023-09-25 14:42:10 +02:00
Member
Copy link

FIXME: Contrast in some cases between text and subject colour is suboptimal (yellow lesson; white text)

FIXME: Contrast in some cases between text and subject colour is suboptimal (yellow lesson; white text)
yuha commented 2023-09-27 13:34:48 +02:00
Member
Copy link

Fixed with: https://edugit.org/AlekSIS/official/AlekSIS-Core/-/merge_requests/1324

Fixed with: https://edugit.org/AlekSIS/official/AlekSIS-Core/-/merge_requests/1324
leuckeju commented 2023-09-27 19:24:14 +02:00
Member
Copy link

to my knowledge those are finished?

to my knowledge those are finished?
magicfelix commented 2023-09-28 21:31:07 +02:00
Member
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>10b5781b - Use existing permissions</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=34630&start_sha=c8e10b49dd86d61ec5823e9cb897be6411ed2471)
hansegucker commented 2023-10-25 22:26:23 +02:00
Author
Owner
Copy link

Yeah, well that depends on setting the subject's colors?

Yeah, well that depends on setting the subject's colors?
hansegucker commented 2023-10-27 10:23:57 +02:00
Author
Owner
Copy link

added 10 commits

  • 10b5781b...0ee5cc68 - 6 commits from branch master
  • ef150b95 - Merge branch 'master' into new-model-based-on-calendar
  • 1d3d4ead - Merge branch 'new-model-based-on-calendar' of...
  • 0947c567 - Update pyproject.toml
  • 25585b51 - Fix lint

Compare with previous version

added 10 commits <ul><li>10b5781b...0ee5cc68 - 6 commits from branch <code>master</code></li><li>ef150b95 - Merge branch &#39;master&#39; into new-model-based-on-calendar</li><li>1d3d4ead - Merge branch &#39;new-model-based-on-calendar&#39; of...</li><li>0947c567 - Update pyproject.toml</li><li>25585b51 - Fix lint</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=35316&start_sha=10b5781b99dc7225430c73096cba9227d43ac094)
hansegucker commented 2023-10-27 10:36:09 +02:00
Author
Owner
Copy link

added 1 commit

  • fa1706c9 - Drop outdated regression test

Compare with previous version

added 1 commit <ul><li>fa1706c9 - Drop outdated regression test</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=35319&start_sha=25585b51e76ce71f8a58e984d045468ce83135fe)
hansegucker commented 2023-10-27 11:00:14 +02:00
Author
Owner
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>c2a4ccb8 - Bump version</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=35321&start_sha=fa1706c95433156e0fc8f25c0a924e5c7a3636e9)
hansegucker commented 2023-10-27 14:30:13 +02:00
Author
Owner
Copy link

created #218 to continue this discussion

created #218 to continue this discussion
hansegucker commented 2023-10-27 14:30:14 +02:00
Author
Owner
Copy link

mentioned in issue #218

mentioned in issue #218
hansegucker commented 2023-10-27 14:30:37 +02:00
Author
Owner
Copy link

created #219 to continue this discussion

created #219 to continue this discussion
hansegucker commented 2023-10-27 14:30:38 +02:00
Author
Owner
Copy link

mentioned in issue #219

mentioned in issue #219
hansegucker commented 2023-10-27 14:30:59 +02:00
Author
Owner
Copy link

created #220 to continue this discussion

created #220 to continue this discussion
hansegucker commented 2023-10-27 14:30:59 +02:00
Author
Owner
Copy link

mentioned in issue #220

mentioned in issue #220
hansegucker commented 2023-10-29 18:16:24 +01:00
Author
Owner
Copy link

added 2 commits

  • 3e10726d - Correctly show supervisions in the calendar
  • 315680b9 - Add supervisions to timetable

Compare with previous version

added 2 commits <ul><li>3e10726d - Correctly show supervisions in the calendar</li><li>315680b9 - Add supervisions to timetable</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=35337&start_sha=c2a4ccb8f3515c2ab09c8111697ab1d501b13cfd)
yuha commented 2023-11-28 21:49:41 +01:00
Member
Copy link

Use generalized core components (see https://edugit.org/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330) for timetable overview

Use generalized core components (see https://edugit.org/AlekSIS/official/AlekSIS-Core/-/merge_requests/1330) for timetable overview
hansegucker commented 2024-01-11 21:39:37 +01:00
Author
Owner
Copy link

changed this line in version 31 of the diff

changed this line in [version 31 of the diff](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=37998&start_sha=315680b9978f503ef87ca92982b268374211f40d#5d07e7d72637aa0d59c89d381fe6dc4cf46e2491_54_54)
hansegucker commented 2024-01-11 21:39:38 +01:00
Author
Owner
Copy link

added 33 commits

  • 315680b9...bdd25787 - 32 commits from branch master
  • efeed7b3 - Merge branch 'master' into new-model-based-on-calendar

Compare with previous version

added 33 commits <ul><li>315680b9...bdd25787 - 32 commits from branch <code>master</code></li><li>efeed7b3 - Merge branch &#39;master&#39; into new-model-based-on-calendar</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=37998&start_sha=315680b9978f503ef87ca92982b268374211f40d)
hansegucker commented 2024-01-11 21:46:45 +01:00
Author
Owner
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>e105841a - Fix migrations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=38000&start_sha=efeed7b3a614dd116b3fd0af16392dbe3394706c)
leuckeju commented 2024-01-17 01:16:09 +01:00
Member
Copy link

added 1 commit

  • 8b6465ed - Allow filtering LessonEvents by course

Compare with previous version

added 1 commit <ul><li>8b6465ed - Allow filtering LessonEvents by course</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=38131&start_sha=e105841a68b889cff7dcb6a6df371c087b96646b)
yuha commented 2024-01-17 01:43:11 +01:00
Member
Copy link

added 1 commit

  • 89e7d348 - Allow filtering LessonEvents by course

Compare with previous version

added 1 commit <ul><li>89e7d348 - Allow filtering LessonEvents by course</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=38132&start_sha=8b6465ed16fd4e0395ffd3073452c8e4a234b992)
yuha commented 2024-01-17 20:05:25 +01:00
Member
Copy link

added 1 commit

  • 65479f92 - Add course and documentation information to LessonEvent meta

Compare with previous version

added 1 commit <ul><li>65479f92 - Add course and documentation information to LessonEvent meta</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=38152&start_sha=89e7d34898016b0dedc3cb608c602506a1dd73b7)
yuha commented 2024-01-18 15:25:48 +01:00
Member
Copy link

added 1 commit

  • 6552e7fc - Add graphene type for LessonEvent

Compare with previous version

added 1 commit <ul><li>6552e7fc - Add graphene type for LessonEvent</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=38169&start_sha=65479f9201370e89f838dafdad9d6e4343476404)
yuha commented 2024-01-24 20:49:36 +01:00
Member
Copy link

Needs proper review & decision about how to deal with the legacy frontend

Needs proper review & decision about how to deal with the legacy frontend
hansegucker commented 2024-01-24 20:49:43 +01:00
Author
Owner
Copy link

requested review from @nik

requested review from @nik
hansegucker commented 2024-01-24 20:49:51 +01:00
Author
Owner
Copy link

assigned to @hansegucker

assigned to @hansegucker
yuha commented 2024-01-24 20:51:31 +01:00
Member
Copy link

@yuha do this!

@yuha do this!
nik commented 2024-01-24 21:01:46 +01:00
Owner
Copy link

Hard dependency on Cursus?

Hard dependency on Cursus?
nik commented 2024-01-24 21:01:46 +01:00
Owner
Copy link

Why?

Why?
nik commented 2024-01-24 21:01:46 +01:00
Owner
Copy link

Only teachers?

Only teachers?
nik commented 2024-01-24 21:01:46 +01:00
Owner
Copy link

No newline at end of file

No newline at end of file
nik commented 2024-01-24 21:01:46 +01:00
Owner
Copy link

No newline at end of file

No newline at end of file
hansegucker commented 2024-01-25 20:35:06 +01:00
Author
Owner
Copy link

.

.
hansegucker commented 2024-02-06 20:49:36 +01:00
Author
Owner
Copy link

Yes, that's correct. That's why Cursus is a separate app so we don't depend on Lesrooster.

Yes, that's correct. That's why Cursus is a separate app so we don't depend on Lesrooster.
hansegucker commented 2024-02-06 20:49:37 +01:00
Author
Owner
Copy link

Because this refetches the amended LessonEvent each time (the actual amends attribute always returns a normal CalendarEvent object).

Because this refetches the amended LessonEvent each time (the actual amends attribute always returns a normal `CalendarEvent` object).
hansegucker commented 2024-02-06 20:49:37 +01:00
Author
Owner
Copy link

There were some privacy concerns with sharing the students list over the calendar API.

There were some privacy concerns with sharing the students list over the calendar API.
hansegucker commented 2024-02-06 20:49:54 +01:00
Author
Owner
Copy link

changed this line in version 37 of the diff

changed this line in [version 37 of the diff](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=38901&start_sha=6552e7fc6f5ebb0d6d47b4c52a271482de0bca44#c120649c3166546ce6b43bb6312c11bdf790ec8c_2_2)
hansegucker commented 2024-02-06 20:49:55 +01:00
Author
Owner
Copy link

changed this line in version 37 of the diff

changed this line in [version 37 of the diff](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=38901&start_sha=6552e7fc6f5ebb0d6d47b4c52a271482de0bca44#2a8f1571aab6bf5ae1f3beadd4961878948ec5e3_6_6)
hansegucker commented 2024-02-06 20:49:55 +01:00
Author
Owner
Copy link

added 1 commit

  • 4a7d8da4 - Fix "No newline at end of file"

Compare with previous version

added 1 commit <ul><li>4a7d8da4 - Fix &quot;No newline at end of file&quot;</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=38901&start_sha=6552e7fc6f5ebb0d6d47b4c52a271482de0bca44)
yuha commented 2024-02-13 18:44:04 +01:00
Member
Copy link

added 1 commit

  • 750ff75a - Allow filtering for amended and amending LessonEvents in get_objects

Compare with previous version

added 1 commit <ul><li>750ff75a - Allow filtering for amended and amending LessonEvents in get_objects</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=39102&start_sha=4a7d8da4a5606d7d0ea3c1a470fde4345804f43a)
yuha commented 2024-02-17 16:32:46 +01:00
Member
Copy link

added 1 commit

  • d1af59cf - Allow filtering for own lessons as teacher

Compare with previous version

added 1 commit <ul><li>d1af59cf - Allow filtering for own lessons as teacher</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=39346&start_sha=750ff75a4a440c8b134772b0229ed7ea575569c7)
hansegucker commented 2024-02-17 19:57:38 +01:00
Author
Owner
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>fdd0d935 - Bump dev version</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=39356&start_sha=d1af59cf9643c8013e35dd153ffbcdeb35a98863)
hansegucker commented 2024-02-18 15:47:50 +01:00
Author
Owner
Copy link
            Q(lessons_count__gt=0)
            | Q(child_lessons_count__gt=0)
        )
```suggestion:-2+0 Q(lessons_count__gt=0) | Q(child_lessons_count__gt=0) ) ```
yuha commented 2024-02-19 01:17:40 +01:00
Member
Copy link

added 1 commit

  • cd66792e - Fix get_objects filtering for all/own lessons

Compare with previous version

added 1 commit <ul><li>cd66792e - Fix get_objects filtering for all/own lessons</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=39396&start_sha=fdd0d93587702847b5dec7200a1a54f260e7ef2b)
yuha commented 2024-02-19 01:28:58 +01:00
Member
Copy link

added 1 commit

  • e44a47c2 - Fix get_objects filtering for all/own lessons

Compare with previous version

added 1 commit <ul><li>e44a47c2 - Fix get_objects filtering for all/own lessons</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=39401&start_sha=cd66792e4cbd063e3ad85c1181858176e33dc81a)
yuha commented 2024-02-19 01:47:55 +01:00
Member
Copy link

added 1 commit

  • 9a7221e6 - Fix get_objects filtering for all/own lessons

Compare with previous version

added 1 commit <ul><li>9a7221e6 - Fix get_objects filtering for all/own lessons</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=39403&start_sha=e44a47c280408fbdfec47415f7e9b6191e637f78)
yuha commented 2024-02-19 01:56:39 +01:00
Member
Copy link

added 1 commit

  • f0e19ae2 - Fix get_objects filtering for all/own lessons

Compare with previous version

added 1 commit <ul><li>f0e19ae2 - Fix get_objects filtering for all/own lessons</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=39406&start_sha=9a7221e6f4144a5f2d516811f25a6c858bb9ae26)
yuha commented 2024-02-19 02:05:31 +01:00
Member
Copy link

added 1 commit

  • ae6f14ac - Fix get_objects filtering for all/own lessons

Compare with previous version

added 1 commit <ul><li>ae6f14ac - Fix get_objects filtering for all/own lessons</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=39408&start_sha=f0e19ae21d85430a355f7cf327edb04884e9441f)
hansegucker commented 2024-02-21 13:10:46 +01:00
Author
Owner
Copy link

added 2 commits

Compare with previous version

added 2 commits <ul><li>e1695a38 - Translate timetable types in frontend</li><li>e028f57d - Reformat</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=39497&start_sha=ae6f14aca30c62a83a2222c789080b84fcbef0e2)
hansegucker commented 2024-02-21 13:35:56 +01:00
Author
Owner
Copy link

changed this line in version 47 of the diff

changed this line in [version 47 of the diff](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=39499&start_sha=e028f57da993e43ba54f924bca770e64e8655101#d29e260234e8f51493408c2f159582b39a59f964_112_109)
hansegucker commented 2024-02-21 13:35:56 +01:00
Author
Owner
Copy link

added 1 commit

  • 63826a5d - Show all groups in timetable view

Compare with previous version

added 1 commit <ul><li>63826a5d - Show all groups in timetable view</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=39499&start_sha=e028f57da993e43ba54f924bca770e64e8655101)
leuckeju commented 2024-02-23 17:18:38 +01:00
Member
Copy link

Then why don't put the cursus stuff directly in chronos? is there a use case where one would use cursus without chronos?

Then why don't put the cursus stuff directly in chronos? is there a use case where one would use cursus without chronos?
leuckeju commented 2024-02-23 17:19:04 +01:00
Member
Copy link

mentioned in issue #226

mentioned in issue #226
leuckeju commented 2024-02-23 17:19:08 +01:00
Member
Copy link

added 1 commit

  • 955800d1 - Specify active icon for chronos

Compare with previous version

added 1 commit <ul><li>955800d1 - Specify active icon for chronos</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=39543&start_sha=63826a5d28c974779396fd37d7d510ffce3fa018)
hansegucker commented 2024-02-23 17:19:44 +01:00
Author
Owner
Copy link

Yes.

Yes.
hansegucker commented 2024-02-23 22:43:41 +01:00
Author
Owner
Copy link

This amended is never used again. @yuha

This `amended` is never used again. @yuha
hansegucker commented 2024-02-28 19:11:17 +01:00
Author
Owner
Copy link

added 2 commits

  • 29689fd6 - Fix select-timetable value prop type
  • dcc6a604 - Merge branch 'fix-select-timetable-prop' into 'new-model-based-on-calendar'

Compare with previous version

added 2 commits <ul><li>29689fd6 - Fix select-timetable value prop type</li><li>dcc6a604 - Merge branch &#39;fix-select-timetable-prop&#39; into &#39;new-model-based-on-calendar&#39;</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=39848&start_sha=955800d106cc11c4f7a6a089f058561a01b5be92)
yuha commented 2024-02-28 21:22:57 +01:00
Member
Copy link

@yuha wants to do that, but in a separate issue: https://edugit.org/AlekSIS/official/AlekSIS-App-Chronos/-/issues/230

@yuha wants to do that, but in a separate issue: https://edugit.org/AlekSIS/official/AlekSIS-App-Chronos/-/issues/230
yuha commented 2024-02-28 21:23:34 +01:00
Member
Copy link

Removal of frontend will happen in https://edugit.org/AlekSIS/official/AlekSIS-App-Chronos/-/issues/231

Removal of frontend will happen in https://edugit.org/AlekSIS/official/AlekSIS-App-Chronos/-/issues/231
hansegucker commented 2024-02-28 21:37:22 +01:00
Author
Owner
Copy link

https://github.com/jazzband/django-polymorphic/issues/437

https://github.com/jazzband/django-polymorphic/issues/437
hansegucker commented 2024-02-29 18:41:24 +01:00
Author
Owner
Copy link

changed this line in version 50 of the diff

changed this line in [version 50 of the diff](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=39965&start_sha=dcc6a604c0d05619b58cdbf70f3e8c9b54792fa9#aff889560e418df674a6887a541974fc95f8cd36_1438_1436)
hansegucker commented 2024-02-29 18:41:24 +01:00
Author
Owner
Copy link

added 1 commit

  • 037639b9 - Remove real_amends as its longer necessary (amends is fixed!)

Compare with previous version

added 1 commit <ul><li>037639b9 - Remove real_amends as its longer necessary (amends is fixed!)</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=39965&start_sha=dcc6a604c0d05619b58cdbf70f3e8c9b54792fa9)
hansegucker commented 2024-03-04 12:08:10 +01:00
Author
Owner
Copy link

Please investigate. I would like to close this MR.

Please investigate. I would like to close this MR.
hansegucker commented 2024-03-04 20:17:45 +01:00
Author
Owner
Copy link

added 1 commit

  • 92e3861c - Add docstrings and typing for lesson event, fix request handling

Compare with previous version

added 1 commit <ul><li>92e3861c - Add docstrings and typing for lesson event, fix request handling</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=40288&start_sha=037639b94d29c1be714e921beb0750298a175f90)
yuha commented 2024-03-07 01:15:09 +01:00
Member
Copy link

added 2 commits

Compare with previous version

added 2 commits <ul><li>00ac1913 - Fix managers</li><li>07bd0b50 - Reformat</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=40368&start_sha=92e3861cd29042b27afc3679bdcbc91dde589dab)
yuha commented 2024-03-07 01:15:26 +01:00
Member
Copy link

resolved all threads

resolved all threads
yuha commented 2024-03-07 01:15:54 +01:00
Member
Copy link

@hansegucker Everything should be solved by now. Please have a look again.

@hansegucker Everything should be solved by now. Please have a look again.
hansegucker commented 2024-03-07 11:25:10 +01:00
Author
Owner
Copy link

marked this merge request as ready

marked this merge request as **ready**
hansegucker commented 2024-03-07 11:27:39 +01:00
Author
Owner
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>47cc59ba - Update changelog</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/301/diffs?diff_id=40377&start_sha=07bd0b50b6dd1408a127254e6f8986d845c46de5)
hansegucker commented 2024-03-07 11:28:09 +01:00
Author
Owner
Copy link

mentioned in commit ccbc6ee085

mentioned in commit ccbc6ee085f2d7ab972ffe509fc7647f8910ba87
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
6 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!605
No description provided.