aleksis/AlekSIS-App-Paeda
8
0
Fork 0
Code Issues 15 Pull requests 2 Projects Releases Packages Activity Actions

WIP: Draft: Resolve "Introduce Todo relationships" #74

Draft
magicfelix wants to merge 42 commits from 28-introduce-todo-relationships into master
pull from: 28-introduce-todo-relationships
merge into: aleksis:master
Conversation 18 Commits 42 Files changed 47 +2195 -371
magicfelix commented 2025-06-03 10:56:37 +02:00 (Migrated from edugit.org)
Copy link

Closes #28

Closes #28
magicfelix commented 2025-06-03 11:44:54 +02:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • 8f987352 - Implement Todo relationship models

Compare with previous version

added 1 commit <ul><li>8f987352 - Implement Todo relationship models</li></ul> [Compare with previous version](/Teckids/Indiedact/AlekSIS-App-Paeda/-/merge_requests/32/diffs?diff_id=63504&start_sha=d03a0d6493e6d78bd31138d7e405f8ef0ecda012)
magicfelix commented 2025-06-03 13:30:25 +02:00 (Migrated from edugit.org)
Copy link

added 3 commits

  • a21953f4 - Add GraphQL schema for relationship models
  • bb54633c - Add basic permissions
  • 436a6339 - Add predicate for TodoRelationships

Compare with previous version

added 3 commits <ul><li>a21953f4 - Add GraphQL schema for relationship models</li><li>bb54633c - Add basic permissions</li><li>436a6339 - Add predicate for TodoRelationships</li></ul> [Compare with previous version](/Teckids/Indiedact/AlekSIS-App-Paeda/-/merge_requests/32/diffs?diff_id=63505&start_sha=8f9873524500b3e85c3a6b42f535f54ee5683df1)
magicfelix commented 2025-06-04 09:17:46 +02:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • f66d2a9c - Add missing import

Compare with previous version

added 1 commit <ul><li>f66d2a9c - Add missing import</li></ul> [Compare with previous version](/Teckids/Indiedact/AlekSIS-App-Paeda/-/merge_requests/32/diffs?diff_id=64301&start_sha=436a6339efc3d496bbe966f704fc8e06b019f5a6)
magicfelix commented 2025-06-04 11:46:08 +02:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • 935dc77a - Add queries

Compare with previous version

added 1 commit <ul><li>935dc77a - Add queries</li></ul> [Compare with previous version](/Teckids/Indiedact/AlekSIS-App-Paeda/-/merge_requests/32/diffs?diff_id=64311&start_sha=f66d2a9c54aa8c49e41f6d3191346d57d2f0f3dd)
magicfelix commented 2025-06-05 14:24:23 +02:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • 66c771e8 - Add PaedaTodo model

Compare with previous version

added 1 commit <ul><li>66c771e8 - Add PaedaTodo model</li></ul> [Compare with previous version](/Teckids/Indiedact/AlekSIS-App-Paeda/-/merge_requests/32/diffs?diff_id=64525&start_sha=935dc77a69d13d8522218ad015ee505f888c961a)
magicfelix commented 2025-06-05 15:17:01 +02:00 (Migrated from edugit.org)
Copy link

added 25 commits

  • 66c771e8...ef928dc0 - 15 earlier commits
  • c8df59b5 - Reformat
  • 0ef3f7ae - Fix skillset migration
  • f241d5e1 - Implement Todo relationship models
  • c27df8fc - Add GraphQL schema for relationship models
  • 8f4c337d - Add basic permissions
  • 5843c95a - Add predicate for TodoRelationships
  • 24193d8b - Add missing import
  • 7e2f25f0 - Add queries
  • a70a1c12 - Add PaedaTodo model
  • afbeda3c - Add skillset relationships to TodoRoleRelationship

Compare with previous version

added 25 commits <ul><li>66c771e8...ef928dc0 - 15 earlier commits</li><li>c8df59b5 - Reformat</li><li>0ef3f7ae - Fix skillset migration</li><li>f241d5e1 - Implement Todo relationship models</li><li>c27df8fc - Add GraphQL schema for relationship models</li><li>8f4c337d - Add basic permissions</li><li>5843c95a - Add predicate for TodoRelationships</li><li>24193d8b - Add missing import</li><li>7e2f25f0 - Add queries</li><li>a70a1c12 - Add PaedaTodo model</li><li>afbeda3c - Add skillset relationships to TodoRoleRelationship</li></ul> [Compare with previous version](/Teckids/Indiedact/AlekSIS-App-Paeda/-/merge_requests/32/diffs?diff_id=64540&start_sha=66c771e83c233c67a51740341b7d7f2e475b094b)
magicfelix commented 2025-06-10 10:54:37 +02:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • f8058e84 - Add schema for PaedaTodo and adjust rules

Compare with previous version

added 1 commit <ul><li>f8058e84 - Add schema for PaedaTodo and adjust rules</li></ul> [Compare with previous version](/Teckids/Indiedact/AlekSIS-App-Paeda/-/merge_requests/32/diffs?diff_id=65038&start_sha=afbeda3c27698b12cae2a90f3c087ba1173e1112)
magicfelix commented 2025-06-10 13:01:42 +02:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • fd4806f5 - Add todo context and use in meta and get_objects

Compare with previous version

added 1 commit <ul><li>fd4806f5 - Add todo context and use in meta and get_objects</li></ul> [Compare with previous version](/Teckids/Indiedact/AlekSIS-App-Paeda/-/merge_requests/32/diffs?diff_id=65043&start_sha=f8058e84bd9f8daeda768d649674e8cada590b7c)
magicfelix commented 2025-06-11 10:03:47 +02:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • db7727f0 - Add attendee to paeda todo

Compare with previous version

added 1 commit <ul><li>db7727f0 - Add attendee to paeda todo</li></ul> [Compare with previous version](/Teckids/Indiedact/AlekSIS-App-Paeda/-/merge_requests/32/diffs?diff_id=65079&start_sha=fd4806f5a3b6b94150d4589ff96f01df4c1f4af5)
magicfelix commented 2025-06-11 10:29:59 +02:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • 15338948 - Add attendee to paeda todo

Compare with previous version

added 1 commit <ul><li>15338948 - Add attendee to paeda todo</li></ul> [Compare with previous version](/Teckids/Indiedact/AlekSIS-App-Paeda/-/merge_requests/32/diffs?diff_id=65081&start_sha=db7727f06436baf5362ea36f0494f2c9bca66443)
magicfelix commented 2025-06-11 10:57:41 +02:00 (Migrated from edugit.org)
Copy link

added 2 commits

  • 070fe8cc - Include attendees in meta
  • e27086e6 - Add todo list item copied from personal todo

Compare with previous version

added 2 commits <ul><li>070fe8cc - Include attendees in meta</li><li>e27086e6 - Add todo list item copied from personal todo</li></ul> [Compare with previous version](/Teckids/Indiedact/AlekSIS-App-Paeda/-/merge_requests/32/diffs?diff_id=65082&start_sha=153389485687f0f8aef5d0495d5e72bf093a8834)
magicfelix commented 2025-06-11 13:45:11 +02:00 (Migrated from edugit.org)
Copy link

added 4 commits

  • fb947f77 - Add context to schema
  • 41226647 - Fix mutation names
  • 8a1d2fbf - Allow creating todos only for context members
  • b1707b5d - Add permission checks for todo patch

Compare with previous version

added 4 commits <ul><li>fb947f77 - Add context to schema</li><li>41226647 - Fix mutation names</li><li>8a1d2fbf - Allow creating todos only for context members</li><li>b1707b5d - Add permission checks for todo patch</li></ul> [Compare with previous version](/Teckids/Indiedact/AlekSIS-App-Paeda/-/merge_requests/32/diffs?diff_id=65100&start_sha=e27086e6ef9b43bfed67529fd14633fbbd064ba7)
magicfelix commented 2025-06-12 10:23:22 +02:00 (Migrated from edugit.org)
Copy link

added 2 commits

  • e3a8de03 - Add permission checks for todo patch
  • 0a314a2c - Allow creating todo person relationship based on predicates

Compare with previous version

added 2 commits <ul><li>e3a8de03 - Add permission checks for todo patch</li><li>0a314a2c - Allow creating todo person relationship based on predicates</li></ul> [Compare with previous version](/Teckids/Indiedact/AlekSIS-App-Paeda/-/merge_requests/32/diffs?diff_id=65144&start_sha=b1707b5d28b30d6bdcbc5a387665705aa98b87df)
magicfelix commented 2025-06-12 11:49:57 +02:00 (Migrated from edugit.org)
Copy link

added 2 commits

  • 99dda6c4 - Allow creating todo person relationship based on predicates
  • 553d6a5a - Respect TodoRoleRelationships in predicate

Compare with previous version

added 2 commits <ul><li>99dda6c4 - Allow creating todo person relationship based on predicates</li><li>553d6a5a - Respect TodoRoleRelationships in predicate</li></ul> [Compare with previous version](/Teckids/Indiedact/AlekSIS-App-Paeda/-/merge_requests/32/diffs?diff_id=65147&start_sha=0a314a2caf50fd343944bf189955931a133f39a3)
magicfelix commented 2025-06-12 12:27:30 +02:00 (Migrated from edugit.org)
Copy link

added 2 commits

  • 193e25a6 - Prevent assigning other persons to todos
  • 48c1b980 - Check if user is allowed to edit TodoPersonRelationship

Compare with previous version

added 2 commits <ul><li>193e25a6 - Prevent assigning other persons to todos</li><li>48c1b980 - Check if user is allowed to edit TodoPersonRelationship</li></ul> [Compare with previous version](/Teckids/Indiedact/AlekSIS-App-Paeda/-/merge_requests/32/diffs?diff_id=65154&start_sha=553d6a5a54685253886108630be35534c69cc938)
magicfelix commented 2025-06-12 13:38:23 +02:00 (Migrated from edugit.org)
Copy link

added 2 commits

  • 582eda24 - Return all group role relationships
  • c8c2f713 - Add frontend for GroupRoleRelationship

Compare with previous version

added 2 commits <ul><li>582eda24 - Return all group role relationships</li><li>c8c2f713 - Add frontend for GroupRoleRelationship</li></ul> [Compare with previous version](/Teckids/Indiedact/AlekSIS-App-Paeda/-/merge_requests/32/diffs?diff_id=65160&start_sha=48c1b9801928165dd0514a89cf2431c4980f756c)
magicfelix commented 2025-06-12 14:05:32 +02:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • 6b2a290e - Create managed role in migration

Compare with previous version

added 1 commit <ul><li>6b2a290e - Create managed role in migration</li></ul> [Compare with previous version](/Teckids/Indiedact/AlekSIS-App-Paeda/-/merge_requests/32/diffs?diff_id=65163&start_sha=c8c2f7136f463a8cc3a21f8a309aeb337d408a08)
magicfelix commented 2025-09-25 16:17:22 +02:00 (Migrated from edugit.org)
Copy link

added 34 commits

  • 6b2a290e...c8db6a5f - 9 commits from branch master
  • c8db6a5f...43bdcc49 - 15 earlier commits
  • ea4b900f - Fix mutation names
  • af298c27 - Allow creating todos only for context members
  • c1d6b1f4 - Add permission checks for todo patch
  • 649a127c - Allow creating todo person relationship based on predicates
  • 4050b4af - Respect TodoRoleRelationships in predicate
  • 0a1ac9d9 - Prevent assigning other persons to todos
  • 9933f955 - Check if user is allowed to edit TodoPersonRelationship
  • 906cc344 - Return all group role relationships
  • 370964ad - Add frontend for GroupRoleRelationship
  • 3a36d431 - Create managed role in migration

Compare with previous version

added 34 commits <ul><li>6b2a290e...c8db6a5f - 9 commits from branch <code>master</code></li><li>c8db6a5f...43bdcc49 - 15 earlier commits</li><li>ea4b900f - Fix mutation names</li><li>af298c27 - Allow creating todos only for context members</li><li>c1d6b1f4 - Add permission checks for todo patch</li><li>649a127c - Allow creating todo person relationship based on predicates</li><li>4050b4af - Respect TodoRoleRelationships in predicate</li><li>0a1ac9d9 - Prevent assigning other persons to todos</li><li>9933f955 - Check if user is allowed to edit TodoPersonRelationship</li><li>906cc344 - Return all group role relationships</li><li>370964ad - Add frontend for GroupRoleRelationship</li><li>3a36d431 - Create managed role in migration</li></ul> [Compare with previous version](/Teckids/Indiedact/AlekSIS-App-Paeda/-/merge_requests/32/diffs?diff_id=71703&start_sha=6b2a290e4db0d566f899c92b81eb1d9752d7a1e4)
This pull request has changes conflicting with the target branch.
  • aleksis/apps/paeda/frontend/components/ImpulseNoteCRUDList.vue
  • aleksis/apps/paeda/frontend/components/PedagogicPersonOverview.vue
  • aleksis/apps/paeda/frontend/components/ProfileCRUDList.vue
  • aleksis/apps/paeda/frontend/components/ProfileForm.vue
  • aleksis/apps/paeda/frontend/components/Qualification.vue
  • aleksis/apps/paeda/frontend/components/QualificationField.vue
  • aleksis/apps/paeda/frontend/components/SkillCRUDList.vue
  • aleksis/apps/paeda/frontend/components/SkillChip.vue
  • aleksis/apps/paeda/frontend/components/SkillDetails.vue
  • aleksis/apps/paeda/frontend/components/SkillField.vue
  • aleksis/apps/paeda/frontend/components/qualification.graphql
  • aleksis/apps/paeda/frontend/components/queries.graphql
  • aleksis/apps/paeda/frontend/index.js
  • aleksis/apps/paeda/frontend/messages/en.json
  • aleksis/apps/paeda/frontend/mixins/qualificationFieldsMixin.js
  • aleksis/apps/paeda/locale/ar/LC_MESSAGES/django.po
  • aleksis/apps/paeda/locale/de_DE/LC_MESSAGES/django.po
  • aleksis/apps/paeda/locale/fr/LC_MESSAGES/django.po
  • aleksis/apps/paeda/locale/la/LC_MESSAGES/django.po
  • aleksis/apps/paeda/locale/nb_NO/LC_MESSAGES/django.po
  • aleksis/apps/paeda/locale/tr_TR/LC_MESSAGES/django.po
  • aleksis/apps/paeda/schema/__init__.py
  • aleksis/apps/paeda/schema/impulse_note.py
  • aleksis/apps/paeda/schema/qualification.py
  • aleksis/apps/paeda/schema/skill.py
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 28-introduce-todo-relationships:28-introduce-todo-relationships
git switch 28-introduce-todo-relationships
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Doing

   
Security

   
TeX
Needs LaTeX template

  
auto-update
  
board
done

  
board
ready

  
board
todo

  
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
Doing
Security
TeX
auto-update
board
done
board
ready
board
todo
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
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-Paeda!74
No description provided.