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.

Sign up for GitHub

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

Jump to bottom

Subjects #169

Merged
merged 73 commits into from
May 18, 2024
Merged

Subjects #169

merged 73 commits into from
May 18, 2024

Conversation

mattiscauwel
Copy link
Contributor

Vakken overzicht

  • Vak bij juiste academiejaar
  • Academiejaren niet hardcoded in script
  • Academie jaar knoppen toggle functionaliteit
  • Klikken naast vak disablen
  • 2e kolom sorteren van vakken

Vak overzicht

  • Terugknop naar vakken
  • Cards langer maken
  • Knop project aanmaken voor teacher
  • Knop generate inschrijvings link
  • Pr request feedback uitvoeren

@mattiscauwel
fixed some skeleton loaders and grid layout
a3caff3
@mattiscauwel
fixed scrolling
3269564
@mattiscauwel
changed color of project card and fixed title router link
a2b6c92
@mattiscauwel
fixed tab scrolling
56b45a7
@mattiscauwel
bug fix v-tabs fixed
f3694c5
@mattiscauwel
reverted css button styling removed
662398a
@mattiscauwel
fixed router link signature
7086dbb
@mattiscauwel
added isTeacher hook in header
2d40e89
@mattiscauwel
Merge remote-tracking branch 'origin/dev' into subjects
36e0f66
@mattiscauwel
added basic buttons to view pages
1fa75f2
@mattiscauwel
router link to create project
c012631
@mattiscauwel
fetched subject_uuid
380fe88
@mattiscauwel
added snackbar for register link
bdad1b1
@mattiscauwel
generated academic years
d8c34ce
@mattiscauwel
buttons now dynamic on academic years
310f744
@mattiscauwel
fixed academic years period
fbca96a
@mattiscauwel
only subjects showing up right academic year
d3a9b7c
@mattiscauwel
error fix filter changed
d1780de
@mattiscauwel
implemented register link button
dd5adb6
@mattiscauwel
added i18n
94fb425
@mattiscauwel
linting
394abc3
@mattiscauwel
Merge remote-tracking branch 'origin/dev' into subjects
24fe18c
@mattiscauwel
run formating
61c2baf
reyniersbram
reyniersbram requested changes May 6, 2024
View reviewed changes
frontend/src/views/subject/SubjectView.vue Outdated Show resolved Hide resolved
frontend/src/views/subject/SubjectsView.vue Outdated Show resolved Hide resolved
frontend/src/views/subject/SubjectsView.vue Outdated Show resolved Hide resolved
frontend/src/components/subject/body/projects/SubjectProjectsPage.vue Outdated Show resolved Hide resolved
@mattiscauwel
Copy link
Contributor Author

er is nog een wijziging geweest met uuid bij de vue queries da ik over het hoofd gezien heb en nog moet oplossen

@mattiscauwel mattiscauwel reopened this May 17, 2024
@mattiscauwel
Copy link
Contributor Author

De Grote Subjects PR

Sinds de laatste keer dat deze branch gereviewed is is er bijgekomen:

  1. De merge conflicten door de grote Queries refactor PR zijn opgelost
  2. De permissions van alle actie knoppen zijn nu gerespecteerd (zoals projecten/vakken aanmaken, register link delen, ...)
  3. De vakken overzicht pagina bevat nu filterknoppen die tevoorschijn komen als je zowel instructor als student bent, met deze knoppen kun je de student- en instructor vakken filteren
  4. Elk vak wordt nu geïdentificeerd door een icoontje, ofwel ben je student ofwel instructor
  5. Er is html rendering toegepast bij de projectopgaves
  6. De ronde hoeken van alle cards zijn verwijderd

@mattiscauwel mattiscauwel requested a review from reyniersbram May 17, 2024 23:32
masinnae
masinnae approved these changes May 18, 2024
View reviewed changes
Copy link
Contributor

@masinnae masinnae left a comment

Choose a reason for hiding this comment

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

ziet er nice uit!

@mattiscauwel
Copy link
Contributor Author

Kleine fix voor de edit vak knop permissions

reyniersbram
reyniersbram requested changes May 18, 2024
View reviewed changes
Copy link
Contributor

@reyniersbram reyniersbram left a comment

Choose a reason for hiding this comment

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

Ziet er over het algemeen wel goed uit

frontend/src/components/subject/subjectsview/SubjectCard.vue Outdated Show resolved Hide resolved
frontend/src/components/subject/subjectsview/SubjectsHeaderContainer.vue Outdated Show resolved Hide resolved
frontend/src/components/subject/subjectsview/SubjectsHeaderContainer.vue Outdated Show resolved Hide resolved
frontend/src/components/subject/subjectsview/SubjectsHeaderCard.vue Outdated Show resolved Hide resolved
frontend/src/views/subject/SubjectView.vue Show resolved Hide resolved
frontend/src/views/subject/SubjectView.vue Outdated Show resolved Hide resolved
frontend/src/i18n/locales/nl.ts Outdated Show resolved Hide resolved
frontend/src/components/subject/subjectview/header/SubjectHeaderCard.vue
</v-card-text>
</v-col>
<v-col v-if="isAdmin || (isInstructor && isTeacher)" cols="2">
<router-link to="" class="link">
Copy link
Contributor

Choose a reason for hiding this comment

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

@DRIESASTER niet vergeten dat deze link nog ingevuld zal moeten worden om naar de correcte pagina te gaan

frontend/src/queries/Subject.ts Outdated Show resolved Hide resolved
@mattiscauwel mattiscauwel merged commit d301892 into dev May 18, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@masinnae masinnae masinnae approved these changes

@pieterjanin pieterjanin pieterjanin left review comments

@reyniersbram reyniersbram reyniersbram approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mattiscauwel @reyniersbram @pieterjanin @masinnae