Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Bugfix/cannot book completed competition #238

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
47df654
first commit : purchase fix
githubstevemas Jul 13, 2024
6a03829
Fixed max purchase limit
githubstevemas Jul 15, 2024
6db6b83
Merge pull request #1 from githubstevemas/bugfix/max-purchase-places
githubstevemas Jul 15, 2024
3da7f19
Fixed purchase when insufficiant club points
githubstevemas Jul 15, 2024
0e3df6e
Merge pull request #2 from githubstevemas/bugfix/purchase-with-insuff…
githubstevemas Jul 15, 2024
17287a6
Fixed update available club point after purchase
githubstevemas Jul 15, 2024
540ef67
Merge pull request #3 from githubstevemas/bugfix/update-available-clu…
githubstevemas Jul 15, 2024
5b708aa
Fixed wrong email login
githubstevemas Jul 15, 2024
34d8de5
Merge pull request #4 from githubstevemas/bugfix/wrong-email-login
githubstevemas Jul 15, 2024
4f7fa8a
Update test_server.py
githubstevemas Jul 16, 2024
e350c66
Merge pull request #5 from githubstevemas/bugfix/update-available-clu…
githubstevemas Jul 16, 2024
2d98a60
Display when competition is full
githubstevemas Jul 16, 2024
59d2611
Merge branch 'master' into enhancement/display-full-booked-message
githubstevemas Jul 16, 2024
acf85f6
Merge pull request #6 from githubstevemas/enhancement/display-full-bo…
githubstevemas Jul 16, 2024
83a43e9
Added public display of points
githubstevemas Jul 17, 2024
dcf9168
Merge branch 'master' into feature/public-display-points-table
githubstevemas Jul 17, 2024
6ab9a66
Merge pull request #7 from githubstevemas/feature/public-display-poin…
githubstevemas Jul 17, 2024
28200be
Fixed purchase on completed competition
githubstevemas Jul 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
first commit : purchase fix
  • Loading branch information
githubstevemas committed Jul 13, 2024
commit 47df6543357d80159969dfc7bc973de9a8e2a72b
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@ bin
include
lib
.Python
tests/
.envrc
__pycache__
__pycache__
/env
.idea/
41 changes: 25 additions & 16 deletions server.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import json
from flask import Flask,render_template,request,redirect,flash,url_for
from flask import Flask, render_template, request, redirect, flash, url_for


def loadClubs():
with open('clubs.json') as c:
listOfClubs = json.load(c)['clubs']
return listOfClubs
listOfClubs = json.load(c)['clubs']
return listOfClubs


def loadCompetitions():
with open('competitions.json') as comps:
listOfCompetitions = json.load(comps)['competitions']
return listOfCompetitions
listOfCompetitions = json.load(comps)['competitions']
return listOfCompetitions


app = Flask(__name__)
@@ -20,40 +20,49 @@ def loadCompetitions():
competitions = loadCompetitions()
clubs = loadClubs()


@app.route('/')
def index():
return render_template('index.html')

@app.route('/showSummary',methods=['POST'])

@app.route('/showSummary', methods=['POST'])
def showSummary():
club = [club for club in clubs if club['email'] == request.form['email']][0]
return render_template('welcome.html',club=club,competitions=competitions)
club = [club for club in clubs if club['email'] == request.form['email']][
0]
return render_template('welcome.html', club=club,
competitions=competitions)


@app.route('/book/<competition>/<club>')
def book(competition,club):
def book(competition, club):
foundClub = [c for c in clubs if c['name'] == club][0]
foundCompetition = [c for c in competitions if c['name'] == competition][0]
if foundClub and foundCompetition:
return render_template('booking.html',club=foundClub,competition=foundCompetition)
return render_template('booking.html', club=foundClub,
competition=foundCompetition)
else:
flash("Something went wrong-please try again")
return render_template('welcome.html', club=club, competitions=competitions)
return render_template('welcome.html', club=club,
competitions=competitions)


@app.route('/purchasePlaces',methods=['POST'])
@app.route('/purchasePlaces', methods=['POST'])
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]
placesRequired = int(request.form['places'])
competition['numberOfPlaces'] = int(competition['numberOfPlaces'])-placesRequired
competition['numberOfPlaces'] = int(
competition['numberOfPlaces']) - placesRequired
flash('Great-booking complete!')
return render_template('welcome.html', club=club, competitions=competitions)
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'))
return redirect(url_for('index'))
Empty file added tests/__init__.py
Empty file.
5 changes: 5 additions & 0 deletions tests/test_server.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@


class PurchasePlaces:
def test_purchase_places(self):
assert False