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

student opt program and courses, exams, and assessment tables and pagination updated #655

Merged
merged 3 commits into from
Oct 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions frontend/src/components/Header/BCHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -63,23 +63,29 @@

<v-app-bar v-if="!smallScreen" density="compact">
<v-toolbar>
<v-btn text v-for="link in menuLinks" :key="link.id" class="text-none">
<v-btn
text
v-for="link in menuLinks"
:key="link.id"
class="text-none"
density="compact"
>
<router-link
:to="link.route"
style="text-decoration: none; color: inherit"
>
{{ link.title }}
</router-link>
</v-btn>
<v-btn v-if="!profile.pen" class="text-none">
<v-btn v-if="!profile.pen" class="text-none" density="compact">
<a
id="profile-route"
class="text-decoration-none text-disabled"
:disabled="true"
>Profile (Student Not Loaded)</a
>
</v-btn>
<v-btn v-else>
<v-btn v-else density="compact">
<router-link
:to="`/student-profile/${profile.studentID}`"
id="profile-route"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
:headers="fields"
showFilter="true"
title="Assessments"
:items-per-page="'-1'"
:id="id"
>
<template
Expand Down
1 change: 1 addition & 0 deletions frontend/src/components/StudentProfile/StudentCourses.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
v-if="courses"
:items="courses"
:headers="fields"
:items-per-page="'-1'"
:id="id"
showFilter="true"
title="studentCourse"
Expand Down
17 changes: 8 additions & 9 deletions frontend/src/components/StudentProfile/StudentExams.vue
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
<template>
<div>
<v-alert info v-if="!exams">
<v-alert info v-if="!studentExams">
This student does not have any exams.
</v-alert>
<DisplayTable
:items="exams"
:fields="fields"
showFilter="true"
title="Assessments"
<v-data-table
:items="studentExams"
:headers="studentExamsHeaders"
:items-per-page="'-1'"
>
<template v-slot:item.sessionDate="{ item }">
{{ $filters.formatYYYYMMDate(item.sessionDate) }}
</template>
</DisplayTable>
</v-data-table>
</div>
</template>

Expand All @@ -25,15 +24,15 @@ export default {
props: {},
computed: {
...mapState(useStudentStore, {
exams: "getStudentExams",
studentExams: "getStudentExams",
}),
},
components: {
DisplayTable: DisplayTable,
},
data: function () {
return {
fields: [
studentExamsHeaders: [
// {
// key: "data-table-expand",
// title: "",
Expand Down
33 changes: 23 additions & 10 deletions frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,9 @@
hide-default-footer
>
<template v-slot:item.optionalProgramName="{ item }">
<div class="pt-2">
{{ item.optionalProgramName }} ({{ item.optionalProgramCode }})
<br />
{{ item.optionalProgramCompletionDate }}
</div>
{{ item.optionalProgramName }} ({{ item.optionalProgramCode }})
<br />
{{ item.optionalProgramCompletionDate }}
</template>

<template v-slot:item.optionalReqMet="{ item }">
Expand Down Expand Up @@ -569,22 +567,37 @@ export default {
{
key: "data-table-expand",
title: "",
sortable: true,
class: "text-left",
},
{
key: "programCode",
title: "Graduation Program",
class: "text-center",
cellProps: {
style: "vertical-align: baseline;",
class: "pt-5 pb-5",
},
},
{
key: "optionalProgramName",
title: "Optional Program",
cellProps: {
style: "vertical-align: baseline;",
class: "pt-5 pb-5",
},
},
{ key: "optionalProgramName", title: "Optional Program" },
{ key: "optionalReqMet", title: "Requirements Met" },
{ key: "optionalNonGradReasons", title: "Requirements Not Met" },
{
key: "optionalProgramCompletionDate",
title: "Optional Program Completion Date",
},
{ key: "actions", title: "Delete" },
{
key: "actions",
title: "Delete",
cellProps: {
style: "vertical-align: baseline;",
class: "pt-5 pb-5",
},
},
],
};
},
Expand Down
Loading