Skip to content
Snippets Groups Projects
Commit 4fd11de1 authored by Dominik Seeger's avatar Dominik Seeger
Browse files

subscription ended message clarification

parent 96b2ff31
No related branches found
No related tags found
1 merge request!150Resolve "subscription ended on submit"
This commit is part of merge request !150. Comments created here will be created in the context of that merge request.
<template> <template>
<v-card class="mx-auto center-page" id="subscription-ended"> <v-card class="mx-auto center-page" id="subscription-ended">
<v-card-title class="title"> <v-card-title class="title">
It seems like your subscription has (temporarily) ended. No submissions left
</v-card-title> </v-card-title>
<v-card-text> <v-card-text>
If you've been validating feedback or resolving conflicts those subscriptions might become active again.<br/> All submissions for <b> {{ submissionTypeName() }} </b> in the current stage have been corrected. If you've
If that happens they'll become clickable in the sidebar. been validating feedback or <br/>
resolving conflicts some submissions may become active again.
If that is the case they will appear clickable in the sidebar again.
</v-card-text> </v-card-text>
<v-card-actions class="text-xs-center"> <v-card-actions class="text-xs-center">
<v-btn to="/home"> <v-btn to="/home">
...@@ -18,10 +20,21 @@ ...@@ -18,10 +20,21 @@
</v-card> </v-card>
</template> </template>
<script> <script lang="ts">
export default {
name: 'subscription-ended' import Vue from 'vue'
import Component from 'vue-class-component'
import store from '@/store/store'
@Component
export default class SubscriptionEnded extends Vue {
get submissionTypes () { return store.state.submissionTypes }
submissionTypeName () {
return this.submissionTypes[this.$route.params.typePk].name
}
} }
</script> </script>
<style scoped> <style scoped>
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
<script> <script>
import SubmissionCorrection from '@/components/submission_notes/SubmissionCorrection' import SubmissionCorrection from '@/components/submission_notes/SubmissionCorrection'
import { SubmissionNotes } from '@/store/modules/submission-notes'
import SubmissionType from '@/components/SubmissionType' import SubmissionType from '@/components/SubmissionType'
import store from '@/store/store' import store from '@/store/store'
import SubmissionTests from '@/components/SubmissionTests' import SubmissionTests from '@/components/SubmissionTests'
...@@ -107,7 +108,8 @@ export default { ...@@ -107,7 +108,8 @@ export default {
currentAssignment (val) { currentAssignment (val) {
this.$vuetify.goTo(0, { duration: 200, easing: 'easeInOutCubic' }) this.$vuetify.goTo(0, { duration: 200, easing: 'easeInOutCubic' })
if (val === undefined) { if (val === undefined) {
this.$router.replace('ended') const typePk = SubmissionNotes.state.submission.type
this.$router.replace(typePk + '/ended')
Subscriptions.removeActiveSubscription() Subscriptions.removeActiveSubscription()
Subscriptions.getSubscriptions() Subscriptions.getSubscriptions()
} }
......
...@@ -80,17 +80,17 @@ const router = new Router({ ...@@ -80,17 +80,17 @@ const router = new Router({
name: 'home', name: 'home',
component: StartPageSelector component: StartPageSelector
}, },
{
path: 'subscription/ended',
name: 'subscription-ended',
component: SubscriptionEnded
},
{ {
path: 'subscription/:pk', path: 'subscription/:pk',
name: 'subscription', name: 'subscription',
beforeEnter: tutorOrReviewerOnly, beforeEnter: tutorOrReviewerOnly,
component: SubscriptionWorkPage component: SubscriptionWorkPage
}, },
{
path: 'subscription/:typePk/ended',
name: 'subscription-ended',
component: SubscriptionEnded
},
{ {
path: 'feedback', path: 'feedback',
beforeEnter: tutorOrReviewerOnly, beforeEnter: tutorOrReviewerOnly,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment