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

Vuetify sl #664

Merged
merged 4 commits into from
Oct 31, 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
1 change: 0 additions & 1 deletion frontend/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
<!-- You can display more user info here or switch roles -->
<p>Username: {{ userInfoGet.userName }}</p>
<p>Current Role: {{ roles }}</p>
<v-btn @click="switchRole">Switch Role</v-btn>
</v-card-text>

<v-card-actions>
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/components/Batch/BatchJobErrorResults.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<v-card :title="'Batch Job #' + selectedErrorId + ' Error(s)'">
<v-card>
<div class="d-flex justify-space-between align-center">
<v-card-title> Batch Job #{{ selectedErrorId }} Error(s) </v-card-title>

Expand All @@ -18,6 +18,7 @@
id="id"
:showFilter="false"
:pagination="true"
class="p-3"
>
<template v-slot:item.pen="{ item }">
<v-btn
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/Batch/BatchJobSearchResults.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<v-card>
<v-card class="p-3">
<div class="d-flex justify-space-between align-center">
<v-card-title> Batch Job #{{ selectedBatchId }} students </v-card-title>

Expand All @@ -20,7 +20,7 @@
There are no results to display.<br />
Please select another Job Execution ID.
</p>
{{ getBatchRequest }}

<v-data-table-server
v-model:items-per-page="itemsPerPage"
:headers="batchDataFields"
Expand Down
19 changes: 16 additions & 3 deletions frontend/src/components/Batch/BatchRuns.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@
<v-btn
variant="plain"
v-bind="props"
class="no-outline-btn v-btn-link"
:class="
item.jobExecutionId == adminSelectedBatchId
? 'no-outline-btn v-btn-link selected'
: 'no-outline-btn v-btn-link'
"
>
{{ item.jobExecutionId }}
</v-btn>
Expand Down Expand Up @@ -176,7 +180,10 @@
variant="outlined"
class="text-none mr-3"
density="default"
@click="isBatchShowing ^= true"
@click="
isBatchShowing ^= true;
adminSelectedBatchId = '';
"
>
Close
</v-btn></template
Expand All @@ -191,7 +198,10 @@
variant="outlined"
class="text-none mr-3"
density="default"
@click="isErrorShowing ^= true"
@click="
isErrorShowing ^= true;
adminSelectedBatchId = '';
"
>
Close
</v-btn>
Expand Down Expand Up @@ -454,4 +464,7 @@ input {
text-decoration: underline;
/* You can add more styles as needed to make it look like a link */
}
.v-btn-link.selected {
font-weight: bold;
}
</style>
16 changes: 10 additions & 6 deletions frontend/src/views/Programs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@
>
</template>
<v-list>
<v-list-item to="/programs/programs">Programs</v-list-item>
<v-list-item to="/programs/program-rules"
<v-list-item @click="tab = 1" to="/programs/programs"
>Programs</v-list-item
>
<v-list-item @click="tab = 1" to="/programs/program-rules"
>Program Rules</v-list-item
>
<v-list-item to="/programs/transcript-message"
<v-list-item @click="tab = 1" to="/programs/transcript-message"
>Transcript Messaging</v-list-item
>
</v-list>
Expand All @@ -44,10 +46,12 @@
>
</template>
<v-list>
<v-list-item to="/programs/optional-programs"
<v-list-item @click="tab = 2" to="/programs/optional-programs"
>Optional Programs</v-list-item
>
<v-list-item to="/programs/optional-program-rules"
<v-list-item
@click="tab = 2"
to="/programs/optional-program-rules"
>Optional Program Rules</v-list-item
>
</v-list>
Expand Down Expand Up @@ -75,7 +79,7 @@ export default {
name: "graduationPrograms",
data() {
return {
tab: 1,
tab: 0,
};
},
methods: {},
Expand Down
Loading