diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 04a508e..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/clubs.json b/clubs.json index 1d7ad1f..46bed31 100644 --- a/clubs.json +++ b/clubs.json @@ -7,7 +7,7 @@ { "name":"Iron Temple", "email": "admin@irontemple.com", - "points":"4" + "points":"47" }, { "name":"She Lifts", "email": "kate@shelifts.co.uk", diff --git a/server.py b/server.py index 0a12660..1818b65 100644 --- a/server.py +++ b/server.py @@ -1,5 +1,5 @@ import json -from flask import Flask,render_template,request,redirect,flash,url_for +from flask import Flask,render_template,request,redirect,flash,url_for,session def loadClubs(): @@ -48,23 +48,35 @@ def purchasePlaces(): competition = [c for c in competitions if c['name'] == request.form['competition']][0] club = [c for c in clubs if c['name'] == request.form['club']][0] placesRequired = int(request.form['places']) - points = int(club['points']) - if placesRequired <= points: - competition['numberOfPlaces'] = int(competition['numberOfPlaces']) - placesRequired - club['points'] = int(club['points']) - placesRequired - if competition['numberOfPlaces'] < 0: - competition['numberOfPlaces'] = 0 - flash('Great-booking complete!') + if competition['name'] in session: + places = {competition['name']: session[competition['name']] + placesRequired} else: - flash("You don't have enough points") + places = {competition['name']: placesRequired} + points = int(club['points']) + print("booked", places) + if placesRequired <= 12: + if places[competition['name']] <= 12: + if placesRequired <= points: + competition['numberOfPlaces'] = int(competition['numberOfPlaces']) - placesRequired + club['points'] = int(club['points']) - placesRequired + if not competition['name'] in session: + session[competition['name']] = placesRequired + flash('Great-booking complete!') + else: + flash("You don't have enough points") + else: + flash(f"You already booked 12 places for {competition['name']}") + else: + flash("You can't book more than 12 places") return render_template('welcome.html', club=club, competitions=competitions) - - # TODO: Add route for points display @app.route('/logout') def logout(): return redirect(url_for('index')) + +if (__name__ == "__main__"): + app.run(debug=True) diff --git a/templates/welcome.html b/templates/welcome.html index ff6b261..223f4b2 100644 --- a/templates/welcome.html +++ b/templates/welcome.html @@ -10,10 +10,10 @@ {% with messages = get_flashed_messages()%} {% if messages %} + {% endif%} Points available: {{club['points']}}

Competitions: