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

Member/Admin suspends activity fixes #156

Merged
merged 4 commits into from
Jul 14, 2024
Merged

Member/Admin suspends activity fixes #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f9a7966
fix: multiple lines in activity suspension justification
joaogreg Jul 13, 2024
a59676e
fix: hide suspend button if actifity is already suspended
joaogreg Jul 13, 2024
50ef3a5
fix: show suspend justification tooltip in admin and member
joaogreg Jul 13, 2024
affa29a
fix: justification tooltip in admin
joaogreg Jul 14, 2024
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: 1 addition & 0 deletions frontend/src/models/activity/Activity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export default class Activity {
this.formattedApplicationDeadline = ISOtoString(
jsonObj.applicationDeadline,
);
this.suspensionJustification = jsonObj.suspensionJustification;
}
}
}
10 changes: 9 additions & 1 deletion frontend/src/views/admin/AdminActivitiesView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,15 @@
{{ item.state }}
</v-chip>
<v-chip v-else>
{{ item.state }}
<v-tooltip bottom>
<template v-slot:activator="{ on }">

Check warning on line 45 in frontend/src/views/admin/AdminActivitiesView.vue

View workflow job for this annotation

GitHub Actions / test 

Insert `·`
<v-chip

Check warning on line 46 in frontend/src/views/admin/AdminActivitiesView.vue

View workflow job for this annotation

GitHub Actions / test 

Replace `⏎·················v-on="on"⏎··············>{{·item.state·}}⏎·············` with `·v-on="on">{{·item.state·}}`
v-on="on"
>{{ item.state }}
</v-chip>
</template>

Check warning on line 50 in frontend/src/views/admin/AdminActivitiesView.vue

View workflow job for this annotation

GitHub Actions / test 

Insert `·`
<span>Justification: {{ item.suspensionJustification }}</span>

Check warning on line 51 in frontend/src/views/admin/AdminActivitiesView.vue

View workflow job for this annotation

GitHub Actions / test 

Insert `·`
</v-tooltip>

Check warning on line 52 in frontend/src/views/admin/AdminActivitiesView.vue

View workflow job for this annotation

GitHub Actions / test 

Insert `·`
</v-chip>
</template>
<template v-slot:[`item.action`]="{ item }">
Expand Down
13 changes: 12 additions & 1 deletion frontend/src/views/member/InstitutionActivitiesView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,17 @@
{{ theme.completeName }}
</v-chip>
</template>
<template v-slot:[`item.state`]="{ item }">
<v-tooltip bottom>

Check warning on line 32 in frontend/src/views/member/InstitutionActivitiesView.vue

View workflow job for this annotation

GitHub Actions / test 

Insert `·`
<template v-slot:activator="{ on }">

Check warning on line 33 in frontend/src/views/member/InstitutionActivitiesView.vue

View workflow job for this annotation

GitHub Actions / test 

Insert `·`
<v-chip

Check warning on line 34 in frontend/src/views/member/InstitutionActivitiesView.vue

View workflow job for this annotation

GitHub Actions / test 

Replace `⏎···············v-on="on"⏎············>{{·item.state·}}⏎···········` with `·v-on="on">{{·item.state·}}`
v-on="on"
>{{ item.state }}
</v-chip>
</template>

Check warning on line 38 in frontend/src/views/member/InstitutionActivitiesView.vue

View workflow job for this annotation

GitHub Actions / test 

Insert `·`
<span>Justification: {{ item.suspensionJustification }}</span>

Check warning on line 39 in frontend/src/views/member/InstitutionActivitiesView.vue

View workflow job for this annotation

GitHub Actions / test 

Insert `·`
</v-tooltip>
</template>
<template v-slot:[`item.action`]="{ item }">
<v-tooltip bottom>
<template v-slot:activator="{ on }">
Expand All @@ -52,7 +63,7 @@
</template>
<span>Show Applications</span>
</v-tooltip>
<v-tooltip bottom>
<v-tooltip bottom v-if="item.state != 'SUSPENDED'">
<template v-slot:activator="{ on }">
<v-icon
class="mr-2 action-button"
Expand Down
6 changes: 4 additions & 2 deletions frontend/src/views/member/SuspendActivityDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<v-form ref="form" lazy-validation>
<v-row>
<v-col cols="12">
<v-text-field
<v-textarea
label="*Suspension reason"
:rules="[(v) =>
{
Expand All @@ -24,9 +24,11 @@
}
]"
required
auto-grow
rows="1"
v-model="activity.suspensionJustification"
data-cy="suspensionReasonInput"
></v-text-field>
></v-textarea>
</v-col>
</v-row>
</v-form>
Expand Down
Loading