programmeerles-ouderen

commit 3e9c41becd80978b4c8bb38622097b55f81bf1d1
parent 539868c25ac41de9ef73d401bf5a7466943ce15b
Author: Friedel Schön <[email protected]>
Date:   Sat, 16 Apr 2022 04:28:28 +0200

fixed some typos

Diffstat:
M
pgmles/forms.py
 | 
2
+-
M
pgmles/routes.py
 | 
16
++++++++--------
M
pgmles/site.db
 | 
0

A
pgmles/static/profile_pics/43ed4d3be14daf90.jpg
 | 
0

M
pgmles/templates/course.html
 | 
10
+++++-----

5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/pgmles/forms.py b/pgmles/forms.py
@@ -48,7 +48,7 @@ class NewCourseForm(FlaskForm):
     description = TextAreaField('Beschrijving', validators=[ DataRequired() ])
     teacher_id = SelectField('Docent', validators=[ DataRequired() ], coerce=int)
     weekday = SelectField('Weekdag', choices=list(enumerate([ 'Maandag', 'Dinsdag', 'Woensdag', 'Donderdag', 'Vrijdag', 'Zaterdag', 'Zondag' ])))
-    start = StringField('Begim', validators=[ DataRequired() ])
+    start = StringField('Begin', validators=[ DataRequired() ])
     end = StringField('Einde', validators=[ DataRequired() ])
     location = StringField('Locatie', validators=[ DataRequired(), Length(min=1, max=100) ])
     submit = SubmitField('Bewerken')
diff --git a/pgmles/routes.py b/pgmles/routes.py
@@ -167,28 +167,28 @@ def update_course(course_id):
 
 @app.route("/course/<int:course_id>", methods=[ 'GET', 'POST' ])
 def course(course_id):
-    form = SubscribeForm()
-    form2 = UnsubscribeForm()
+    sub_form = SubscribeForm()
+    unsub_form = UnsubscribeForm()
     teachers = User.query.filter_by(type='teacher')
     subscribed = None
     if current_user.is_authenticated:
         subscribed = CourseMember.query.filter_by(user_id=current_user.id, course_id=course_id).first()
 
-    if form.validate_on_submit() and not subscribed:
+    if sub_form.validate_on_submit() and not subscribed:
         course = CourseMember(user_id=current_user.id, course_id=course_id)
         db.session.add(course)
         db.session.commit()
         flash('U bent nu ingeschreven!', 'success')
         return redirect('/')
 
-    if form2.validate_on_submit() and subscribed:
+    if unsub_form.validate_on_submit() and subscribed:
         db.session.delete(subscribed)
         db.session.commit()
         flash('U bent nu uitgeschreven!', 'success')
         return redirect('/')
 
     course = Course.query.get_or_404(course_id)
-    return render_template('course.html', calendar=make_calendar(), title=course.name, course=course, form=form, form2=form2, show=not subscribed, teachers=teachers)
+    return render_template('course.html', calendar=make_calendar(), title=course.name, course=course, sub_form=sub_form, unsub_form=unsub_form, subscribed=subscribed is not None, teachers=teachers)
 
 @app.route("/delete_course/<int:course_id>", methods=['GET','POST'])
 @login_required
@@ -198,7 +198,7 @@ def delete_course(course_id):
     course = Course.query.get_or_404(course_id)
     db.session.delete(course)
     db.session.commit()
-    return redirect('/')
+    return redirect(url_for('course_overview'))
 
 @app.route("/permissions", methods=['GET','POST'])
 @login_required
@@ -212,12 +212,12 @@ def permissions():
             flash(f'Geen gebruker gevonden: {form.username.data}', 'danger')
         else:
             flash(f'Gebruiker gevonden: {form.username.data}', 'success')
-            return redirect(url_for('updatePermissions', user_id= user.id))
+            return redirect(url_for('update_permissions', user_id= user.id))
     return render_template('permissions.html', calendar=make_calendar(), form=form)
 
 @app.route("/permissions/update/<int:user_id>", methods=['GET','POST'])
 @login_required
-def updatePermissions(user_id):
+def update_permissions(user_id):
     if current_user.type != "admin":
         abort(403)
     form = PermissionForm()
diff --git a/pgmles/site.db b/pgmles/site.db
Binary files differ.
diff --git a/pgmles/static/profile_pics/43ed4d3be14daf90.jpg b/pgmles/static/profile_pics/43ed4d3be14daf90.jpg
Binary files differ.
diff --git a/pgmles/templates/course.html b/pgmles/templates/course.html
@@ -12,18 +12,18 @@
         </div>
         <div class="article-metadata">
             {% if current_user.is_authenticated %}
-                {% if show %}
+                {% if not subscribed %}
                 <form method="POST" action="">
-                    {{ form.hidden_tag() }}
+                    {{ sub_form.hidden_tag() }}
                     <div class="form-group">
-                        {{ form.submit(class="btn btn-outline-info") }}
+                        {{ sub_form.submit(class="btn btn-outline-info") }}
                     </div>
                 </form>
                 {% else %}
                 <form method="POST" action="">
-                    {{ form2.hidden_tag() }}
+                    {{ unsub_form.hidden_tag() }}
                     <div class="form-group">
-                        {{ form2.submit(class="btn btn-outline-info") }}
+                        {{ unsub_form.submit(class="btn btn-outline-info") }}
                     </div>
                 </form>
                 {%endif%}