Yann/Projet11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Yann:main
Branches Tags
Yann:main Yann:QA Yann:feature/issue7 Yann:bug/issue6 Yann:bug/issue5 Yann:bug/issue4 Yann:bug/issue2 Yann:bug/issue1
...
compare: Yann:f323cd8310d495c58e6f6cf737391e7e24728f8c
Branches Tags
Yann:QA Yann:feature/issue7 Yann:bug/issue6 Yann:bug/issue5 Yann:bug/issue4 Yann:bug/issue2 Yann:bug/issue1 Yann:main

6 Commits
main ... f323cd8310

Author SHA1 Message Date
yann
f323cd8310 let this fix for issue6 2025-06-30 10:35:17 +02:00
yann
e6d4d05917 use session to memorize places/competition 2025-06-23 12:44:59 +02:00
Yann
5102e366e8 Merge pull request 'added checking and substracting points' (#2) from issue2 into main 
Reviewed-on: #2
 2025-06-20 13:18:14 +00:00
yann
b70f80f3cb added checking and substracting points 2025-06-20 15:12:59 +02:00
Yann
2317006de9 Merge pull request 'fixed list, handled wrong email case, adjusted template' (#1) from issue#1 into main 
Reviewed-on: #1
 2025-06-20 12:34:47 +00:00
yann
a50d1946ce fixed list, handled wrong email case, adjusted template 2025-06-20 12:13:50 +02:00
5 changed files with 45 additions and 13 deletions
Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

2
clubs.json
View File

@@ -7,7 +7,7 @@
{ {
"name":"Iron Temple", "name":"Iron Temple",
"email": "admin@irontemple.com", "email": "admin@irontemple.com",
"points":"4" "points":"47"
}, },
{ "name":"She Lifts", { "name":"She Lifts",
"email": "kate@shelifts.co.uk", "email": "kate@shelifts.co.uk",

40
server.py
View File

@@ -1,5 +1,5 @@
import json 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(): def loadClubs():
@@ -26,9 +26,11 @@ def index():
@app.route('/showSummary',methods=['POST']) @app.route('/showSummary',methods=['POST'])
def showSummary(): def showSummary():
club = [club for club in clubs if club['email'] == request.form['email']][0] club = [club for club in clubs if club['email'] == request.form['email']]
return render_template('welcome.html',club=club,competitions=competitions) if club:
return render_template('welcome.html', club=club[0], competitions=competitions)
flash("The email isn't found")
return redirect(url_for('index'))
@app.route('/book/<competition>/<club>') @app.route('/book/<competition>/<club>')
def book(competition,club): def book(competition,club):
@@ -46,14 +48,34 @@ def purchasePlaces():
competition = [c for c in competitions if c['name'] == request.form['competition']][0] 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] club = [c for c in clubs if c['name'] == request.form['club']][0]
placesRequired = int(request.form['places']) placesRequired = int(request.form['places'])
competition['numberOfPlaces'] = int(competition['numberOfPlaces'])-placesRequired if competition['name'] in session:
flash('Great-booking complete!') places = {competition['name']: session[competition['name']] + placesRequired}
return render_template('welcome.html', club=club, competitions=competitions) else:
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
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 # TODO: Add route for points display
@app.route('/logout') @app.route('/logout')
def logout(): def logout():
return redirect(url_for('index')) return redirect(url_for('index'))
if (__name__ == "__main__"):
app.run(debug=True)

12
templates/index.html
View File

@@ -6,6 +6,16 @@
</head> </head>
<body> <body>
<h1>Welcome to the GUDLFT Registration Portal!</h1> <h1>Welcome to the GUDLFT Registration Portal!</h1>
{% with messages = get_flashed_messages()%}
{% if messages %}
<ul>
{% for message in messages %}
<li>{{message}}</li>
{% endfor %}
</ul>
{% endif%}
{% endwith %}
Please enter your secretary email to continue: Please enter your secretary email to continue:
<form action="showSummary" method="post"> <form action="showSummary" method="post">
<label for="email">Email:</label> <label for="email">Email:</label>
@@ -13,4 +23,4 @@
<button type="submit">Enter</button> <button type="submit">Enter</button>
</form> </form>
</body> </body>
</html> </html>

4
templates/welcome.html
View File

@@ -10,10 +10,10 @@
{% with messages = get_flashed_messages()%} {% with messages = get_flashed_messages()%}
{% if messages %} {% if messages %}
<ul> <ul>
{% for message in messages %} {% for message in messages %}
<li>{{message}}</li> <li>{{message}}</li>
{% endfor %} {% endfor %}
</ul> </ul>
{% endif%} {% endif%}
Points available: {{club['points']}} Points available: {{club['points']}}
<h3>Competitions:</h3> <h3>Competitions:</h3>