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

WIP: Draft: Resolve "Rename Categories to Skills and introduce Skillset" #73

Draft
magicfelix wants to merge 18 commits from 15-rename-categories-to-skills-and-introduce-skillset into master
pull from: 15-rename-categories-to-skills-and-introduce-skillset
merge into: aleksis:master
Conversation 13 Commits 18 Files changed 40 +987 -370
magicfelix commented 2025-05-27 13:48:06 +02:00 (Migrated from edugit.org)
Copy link

Closes #15

Closes #15
magicfelix commented 2025-05-27 16:06:41 +02:00 (Migrated from edugit.org)
Copy link

added 4 commits

  • 19776883 - Migrate all models to ExtensibleModel
  • 7c08ffa6 - Fix some permissions and adapt schema to current core changes and ExtensibleModel
  • 0362c8a4 - Adapt migration to fixed UUID default
  • 04fe63b7 - WIP: Add skillset migration

Compare with previous version

added 4 commits <ul><li>19776883 - Migrate all models to ExtensibleModel</li><li>7c08ffa6 - Fix some permissions and adapt schema to current core changes and ExtensibleModel</li><li>0362c8a4 - Adapt migration to fixed UUID default</li><li>04fe63b7 - WIP: Add skillset migration</li></ul> [Compare with previous version](/Teckids/Indiedact/AlekSIS-App-Paeda/-/merge_requests/31/diffs?diff_id=63167&start_sha=6efc4c0992b42882f9d8fb4c2901f1ab8caf3cf5)
magicfelix commented 2025-05-28 10:07:02 +02:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • 24d29358 - Migrate category m2m relationships to skillsets

Compare with previous version

added 1 commit <ul><li>24d29358 - Migrate category m2m relationships to skillsets</li></ul> [Compare with previous version](/Teckids/Indiedact/AlekSIS-App-Paeda/-/merge_requests/31/diffs?diff_id=63219&start_sha=04fe63b726b8678323bf536b57c80105fc58d500)
magicfelix commented 2025-05-28 13:26:25 +02:00 (Migrated from edugit.org)
Copy link

added 2 commits

  • 05eb6ba8 - Rename Category to Skill
  • f0919102 - WIP: Adjust frontend to skillset

Compare with previous version

added 2 commits <ul><li>05eb6ba8 - Rename Category to Skill</li><li>f0919102 - WIP: Adjust frontend to skillset</li></ul> [Compare with previous version](/Teckids/Indiedact/AlekSIS-App-Paeda/-/merge_requests/31/diffs?diff_id=63242&start_sha=24d293582aaad803a85933707383d6a700968ec1)
magicfelix commented 2025-05-30 12:22:10 +02:00 (Migrated from edugit.org)
Copy link

added 3 commits

  • 70d2d4fa - Adjust frontend to category renaming
  • ebcf7a8c - Add frontend for skillset
  • 173c5cda - Adjust permissions

Compare with previous version

added 3 commits <ul><li>70d2d4fa - Adjust frontend to category renaming</li><li>ebcf7a8c - Add frontend for skillset</li><li>173c5cda - Adjust permissions</li></ul> [Compare with previous version](/Teckids/Indiedact/AlekSIS-App-Paeda/-/merge_requests/31/diffs?diff_id=63357&start_sha=f091910235a76c612a3c4b24fe85d1a7487064b1)
magicfelix commented 2025-06-02 14:20:12 +02:00 (Migrated from edugit.org)
Copy link

added 13 commits

  • d03a0d64 - 1 commit from branch master
  • d03a0d64...d7bd3fed - 2 earlier commits
  • 5b6b07ed - Adjust frontend to category renaming
  • bd5d4765 - Add frontend for skillset
  • a4df82f4 - Adjust permissions
  • d49a4d69 - Adjust schema and frontend queries to skillset
  • aacffca6 - Add messages for skillset
  • 6b2c755a - Adjust SkillSetCRUDList
  • c6caa264 - Adapt more parts of frontend
  • 0fbf17a1 - Fix skillsets occurence
  • 933fb31b - Fix ProfileCRUDList
  • b5ccc7f3 - Fix Qualification CRUD list

Compare with previous version

added 13 commits <ul><li>d03a0d64 - 1 commit from branch <code>master</code></li><li>d03a0d64...d7bd3fed - 2 earlier commits</li><li>5b6b07ed - Adjust frontend to category renaming</li><li>bd5d4765 - Add frontend for skillset</li><li>a4df82f4 - Adjust permissions</li><li>d49a4d69 - Adjust schema and frontend queries to skillset</li><li>aacffca6 - Add messages for skillset</li><li>6b2c755a - Adjust SkillSetCRUDList</li><li>c6caa264 - Adapt more parts of frontend</li><li>0fbf17a1 - Fix skillsets occurence</li><li>933fb31b - Fix ProfileCRUDList</li><li>b5ccc7f3 - Fix Qualification CRUD list</li></ul> [Compare with previous version](/Teckids/Indiedact/AlekSIS-App-Paeda/-/merge_requests/31/diffs?diff_id=63464&start_sha=173c5cda31cf56a36edb88ddc32d4faa3d0013cc)
magicfelix commented 2025-06-02 14:56:24 +02:00 (Migrated from edugit.org)
Copy link

added 3 commits

  • 4bd9d591 - Fix editing profiles
  • 9408d26a - Fix subset relationship
  • c8396b00 - Fix skillset selects

Compare with previous version

added 3 commits <ul><li>4bd9d591 - Fix editing profiles</li><li>9408d26a - Fix subset relationship</li><li>c8396b00 - Fix skillset selects</li></ul> [Compare with previous version](/Teckids/Indiedact/AlekSIS-App-Paeda/-/merge_requests/31/diffs?diff_id=63466&start_sha=b5ccc7f35a3b87383954bbc0c96aa08b73a06a0a)
magicfelix commented 2025-06-03 08:56:10 +02:00 (Migrated from edugit.org)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>ef928dc0 - Fix skillset selects</li></ul> [Compare with previous version](/Teckids/Indiedact/AlekSIS-App-Paeda/-/merge_requests/31/diffs?diff_id=63482&start_sha=c8396b00bb5a77265f15d642031695d0914f4682)
magicfelix commented 2025-06-03 09:00:17 +02:00 (Migrated from edugit.org)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>c8df59b5 - Reformat</li></ul> [Compare with previous version](/Teckids/Indiedact/AlekSIS-App-Paeda/-/merge_requests/31/diffs?diff_id=63486&start_sha=ef928dc0afbe22f480b69037f594fd2ed9fe0873)
magicfelix commented 2025-06-03 10:25:28 +02:00 (Migrated from edugit.org)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>0ef3f7ae - Fix skillset migration</li></ul> [Compare with previous version](/Teckids/Indiedact/AlekSIS-App-Paeda/-/merge_requests/31/diffs?diff_id=63501&start_sha=c8df59b5f1623fad9ea8a04287e8ba0450c46df8)
magicfelix commented 2025-06-03 10:25:59 +02:00 (Migrated from edugit.org)
Copy link

marked this merge request as ready

marked this merge request as **ready**
magicfelix commented 2025-06-03 10:26:07 +02:00 (Migrated from edugit.org)
Copy link

assigned to @nik

assigned to @nik
magicfelix commented 2025-09-25 16:02:57 +02:00 (Migrated from edugit.org)
Copy link

added 10 commits

  • 0ef3f7ae...c8db6a5f - 9 commits from branch master
  • 6386394b - Merge branch 'master' into 15-rename-categories-to-skills-and-introduce-skillset

Compare with previous version

added 10 commits <ul><li>0ef3f7ae...c8db6a5f - 9 commits from branch <code>master</code></li><li>6386394b - Merge branch &#39;master&#39; into 15-rename-categories-to-skills-and-introduce-skillset</li></ul> [Compare with previous version](/Teckids/Indiedact/AlekSIS-App-Paeda/-/merge_requests/31/diffs?diff_id=71701&start_sha=0ef3f7ae76ca300a5ac7fc9f9208b05ee388e9b8)
hansegucker commented 2026-06-28 15:27:51 +02:00 (Migrated from edugit.org)
Copy link

marked this merge request as draft

marked this merge request as **draft**
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 15-rename-categories-to-skills-and-introduce-skillset:15-rename-categories-to-skills-and-introduce-skillset
git switch 15-rename-categories-to-skills-and-introduce-skillset
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!73
No description provided.