Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch subject #240

Merged
merged 32 commits into from
May 23, 2024
Merged

Patch subject #240

merged 32 commits into from
May 23, 2024

Conversation

mattiscauwel
Copy link
Contributor

  • Herstructurering van subject modify pages patch en create
  • implementatie van patch pagina

@reyniersbram

in de file PatchSubjectView staat de code om de uiteindelijke PATCH request te submitten in commentaar, met dus de queries.

@mattiscauwel mattiscauwel added the frontend This is related to the frontend label May 21, 2024
@mattiscauwel mattiscauwel marked this pull request as ready for review May 22, 2024 19:58
@mattiscauwel
Copy link
Contributor Author

@reyniersbram er waren wat dingen gebroken door de veranderingen maar alles nu opgelost.

om een rare reden is bijvoorbeeld een instructor die in de bestaande instructors zat nie identiek met dezelfde instructor die toegevoegd wordt. Hierdoor kreeg je dus problemen met de removedInstructors set wanneer je instructor meerdere malen verwijderd en weer toegevoegd. Daarom toch weer met uid's gewerkt daar.

Voor de rest wat nullable problemen wat opgelost en ervoor gezorgt dat de instructor list niet update op het scherm terwijl de patch/post/delete requests bezig zijn

@mattiscauwel
Copy link
Contributor Author

mattiscauwel commented May 22, 2024

oh help zoveel merge conflicten ik bekijk zo meteen

# Conflicts:
#	frontend/src/components/subject/modify/header/ModifySubjectHeaderCard.vue
#	frontend/src/components/subject/subject/body/SubjectBody.vue
#	frontend/src/components/subject/subject/header/SubjectHeaderContainer.vue
#	frontend/src/components/subject/subjects/header/SubjectsHeaderContainer.vue
#	frontend/src/router/index.ts
#	frontend/src/views/subject/SubjectView.vue
#	frontend/src/views/subject/SubjectsView.vue
@@ -15,7 +15,7 @@
color="secondary"
variant="flat"
>
{{ `${academicYear}-${academicYear + 1}` }}
{{ `${academicYear - 2000}-${academicYear - 2000 + 1}` }}
Copy link
Contributor

@reyniersbram reyniersbram May 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ik vindt het niet zo intuïtief dat de knop van het geselecteerde jaar donker is, en de andere knop wit.

@reyniersbram reyniersbram merged commit ba1214e into dev May 23, 2024
4 checks passed
@reyniersbram reyniersbram deleted the patch_subject branch May 23, 2024 09:51
xerbalind pushed a commit that referenced this pull request May 23, 2024
* restructured files + first changes patch

* passed down name and academic year props

* null fix is in create

* fixed router

* title and academic year patch

* added and deleted instructors

* adding + deleting subject instructors

* implementation patch subject mutation + error fix

* fixes to form validation

* adding and removing works

* skeleton for query done

* small academic year fix

* slight cleanup

* create works with patch

* patch logic done

* subjects refactoring modify

* installed dialog component

* i18n

* lint format

* implement patch mutation

* fixes to broken patch page

* fix broken merge conflicts

* knoppen academie jaar subjects fix

* lint format

* fix van de fix van de academie jaar buttons

* changed location of subject files in tests because of refactoring

* add permission middleware

---------

Co-authored-by: Bram Reyniers <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
frontend This is related to the frontend
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants