make grade field optional in grade view, make login form handle white…

…spaces in email
spz-signup · Jun 26, 2024 · 25226a1 · 25226a1
1 parent 07eeaa4
commit 25226a1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/spz/forms/__init__.py b/src/spz/forms/__init__.py
@@ -1059,7 +1059,7 @@ class GradeForm(FlaskForm):
     for applicant in applicants:
         field_name = f'grade_{applicant.id}'
         setattr(GradeForm, field_name,
-                IntegerField("Note", validators=[validators.NumberRange(min=0, max=100)],
+                IntegerField("Note", validators=[validators.Optional(), validators.NumberRange(min=0, max=100)],
                              default=applicant.grade))
 
     return GradeForm

diff --git a/src/spz/templates/internal/administration/edit_grade_view.html b/src/spz/templates/internal/administration/edit_grade_view.html
@@ -43,7 +43,9 @@ <h3>Schritt 2:</h3>
                             {{ applicant.ects_points }}
                         </td>
                         <td>
-                            {% if applicant.grade >= 50 %}
+                            {% if applicant.grade is none %}
+                                -
+                            {% elif applicant.grade >= 50 %}
                                 <select name="view_{{ applicant.id }}" class="ui dropdown">
                                     <option value="0" {% if applicant.hide_grade %}selected{% endif %}>
                                         bestanden

diff --git a/src/spz/views.py b/src/spz/views.py
@@ -1282,13 +1282,14 @@ def login():
     form = forms.LoginForm()
 
     if form.validate_on_submit():
-        user = models.User.get_by_login(form.user.data, form.password.data)
+        cleaned_email = form.user.data.strip()
+        user = models.User.get_by_login(cleaned_email, form.password.data)
         if user:
             login_user(user, remember=True)
             if current_user.is_teacher:
                 return redirect(url_for('teacher'))
             return redirect(url_for('internal'))
-        flash(_('Du kommst hier net rein!'), 'negative')
+        flash(_('Login war nicht erfolgreich.'), 'negative')
 
     return dict(form=form)