ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Add error message and add styling

This commit is contained in:
Ramon Wenger 2020-02-24 18:32:43 +01:00
parent a59733b2f1
commit 2e1d7b46bc
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
client/src/pages/joinClass.vue
View File

@ -2,17 +2,21 @@
<div> <div>
<h1>Zugangscode eingeben</h1> <h1>Zugangscode eingeben</h1>
<div> <div>
<div v-if="error">
{{error}}
</div>
<div class="skillboxform-input"> <div class="skillboxform-input">
<label for="join-code" class="skillboxform-input__label">Zugangscode</label> <label for="join-code" class="skillboxform-input__label">Zugangscode</label>
<input <input
id="join-code" id="join-code"
class="skillbox-input skillboxform-input__input" class="skillbox-input skillboxform-input__input"
:class="{'skillboxform-input__input--error': error}"
data-cy="input-class-code" data-cy="input-class-code"
:value="code" :value="code"
@input="updateCode"> @input="updateCode">
<small
v-if="error"
class="skillboxform-input__error"
data-cy="email-local-errors"
>{{ error }}
</small>
</div> </div>
<div> <div>
@ -65,8 +69,11 @@
}) })
.catch(e => { .catch(e => {
console.debug(e); console.debug(e);
console.error(e.message); if (e.message.indexOf('[CAJ]') > -1) {
this.error = 'Code ist nicht gültig'; this.error = 'Klasse bereits beigetreten';
} else {
this.error = 'Code ist nicht gültig';
}
}) })
}, },
cancel() { cancel() {

10
server/users/mutations.py
View File

@ -120,13 +120,17 @@ class JoinClass(relay.ClientIDMutation):
user = info.context.user user = info.context.user
code = kwargs.get('code') code = kwargs.get('code')
try: try:
school_class = SchoolClass.objects.get(Q(code__iexact=code) & ~Q(users=user)) school_class = SchoolClass.objects.get(Q(code__iexact=code))
school_class.users.add(user)
if user not in list(school_class.users.all()):
school_class.users.add(user)
else:
raise CodeNotFoundException('[CAJ] Schüler ist bereits in Klasse') # CAJ = Class Already Joined
return cls(success=True, school_class=school_class) return cls(success=True, school_class=school_class)
except SchoolClass.DoesNotExist: except SchoolClass.DoesNotExist:
raise CodeNotFoundException('Code ist nicht gültig') raise CodeNotFoundException('[CNV] Code ist nicht gültig') # CAV = Code Not Valid
class ProfileMutations: class ProfileMutations: