jonny/gcp-hockey-results
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SQL statement cleanup

Browse Source
This commit is contained in:
Jonathan Ervine 2020-12-11 10:31:57 +08:00
parent 4f9d54e855
commit 7545f0cdce
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
routes/_convenor.py
View File

@ -76,8 +76,8 @@ def convenorAddTeamResult():
@routes.route('/convenor/playerDbCreate') @routes.route('/convenor/playerDbCreate')
def playerDbCreate(): def playerDbCreate():
sql = "SELECT club FROM _clubTeams GROUP BY club ORDER BY club" club_lookup = "SELECT club FROM _clubTeams GROUP BY club ORDER BY club"
clubs = sql_read(sql) clubs = sql_read(club_lookup)
form = playerDbCreateForm() form = playerDbCreateForm()
return render_template('_convenorPlayerDbCreate.html', data=clubs, form=form) return render_template('_convenorPlayerDbCreate.html', data=clubs, form=form)
@ -87,9 +87,9 @@ def playerDbCreateResults():
_club = request.form['clubName'] _club = request.form['clubName']
# _year = request.form['year'] # _year = request.form['year']
_year = "2018" _year = "2018"
playerTable_create = "CREATE TABLE IF NOT EXISTS _" + _club + "_players (playerTeam varchar(6) NOT NULL, playerForenames varchar(50) NOT NULL, playerSurname varchar(30) NOT NULL, playerNickName varchar(30), playerChineseName varchar(10) CHARACTER SET utf8, playerEmail varchar(255) NOT NULL, playerDob DATE NOT NULL, playerHkid varchar(20) NOT NULL, playerNumber smallint NOT NULL, playerTelNumber varchar(30) NOT NULL, PRIMARY KEY (playerNumber))"
if _club and request.method == 'POST': if _club and request.method == 'POST':
sql = "CREATE TABLE IF NOT EXISTS _" + _club + "_players (playerTeam varchar(6) NOT NULL, playerForenames varchar(50) NOT NULL, playerSurname varchar(30) NOT NULL, playerNickName varchar(30), playerChineseName varchar(10) CHARACTER SET utf8, playerEmail varchar(255) NOT NULL, playerDob DATE NOT NULL, playerHkid varchar(20) NOT NULL, playerNumber smallint NOT NULL, playerTelNumber varchar(30) NOT NULL, PRIMARY KEY (playerNumber))" sql_write(playerTable_create)
sql_write(sql)
return render_template('_convenorPlayerDbCreateResults.html', club=_club, year=_year) return render_template('_convenorPlayerDbCreateResults.html', club=_club, year=_year)
except Exception as e: except Exception as e:
print(e) print(e)
@ -97,8 +97,8 @@ def playerDbCreateResults():
@routes.route('/convenor/playerAdd') @routes.route('/convenor/playerAdd')
def convenorAddPlayer(): def convenorAddPlayer():
sql = "SELECT hockeyClub, logoURL FROM mensHockeyClubs ORDER BY hockeyClub" clubLogo_lookup = "SELECT hockeyClub, logoURL FROM mensHockeyClubs ORDER BY hockeyClub"
clubs = sql_read_static(sql) clubs = sql_read_static(clubLogo_lookup)
form = addPlayerForm() form = addPlayerForm()
form.playerClub.choices = [(club['hockeyClub'], club['hockeyClub']) for club in clubs] form.playerClub.choices = [(club['hockeyClub'], club['hockeyClub']) for club in clubs]
clubLogo = clubs[0]['logoURL'] clubLogo = clubs[0]['logoURL']
@ -122,9 +122,9 @@ def convenorAddPlayerResult():
_playerHkid = request.form['playerHkid'] _playerHkid = request.form['playerHkid']
_playerNumber = request.form['playerNumber'] _playerNumber = request.form['playerNumber']
_playerTelNumber = request.form['playerTelNumber'] _playerTelNumber = request.form['playerTelNumber']
playerRecord_create = "INSERT INTO _" + _club + "_players (playerTeam, playerForenames, playerSurname, playerNickname, playerEmail, playerDob, playerHkid, playerNumber, playerTelNumber) VALUES ('" + _team + "', '" + _playerForename + "', '" + _playerSurname + "', '" + _playerNickname + "', '" + _playerEmail + "', '" + _playerDob + "', '" + _playerHkid + "', '" + _playerNumber + "', '" + _playerTelNumber + "')"
if _team and _playerSurname and _playerHkid and _playerNumber and request.method == 'POST': if _team and _playerSurname and _playerHkid and _playerNumber and request.method == 'POST':
sql = "INSERT INTO _" + _club + "_players (playerTeam, playerForenames, playerSurname, playerNickname, playerEmail, playerDob, playerHkid, playerNumber, playerTelNumber) VALUES ('" + _team + "', '" + _playerForename + "', '" + _playerSurname + "', '" + _playerNickname + "', '" + _playerEmail + "', '" + _playerDob + "', '" + _playerHkid + "', '" + _playerNumber + "', '" + _playerTelNumber + "')" sql_write(playerRecord_create)
sql_write(sql)
return render_template('_convenorPlayerAddResults.html', club=_club, firstname=_playerForename, nickname=_playerNickname, surname=_surname, shirt=_playerNumber) return render_template('_convenorPlayerAddResults.html', club=_club, firstname=_playerForename, nickname=_playerNickname, surname=_surname, shirt=_playerNumber)
except Exception as e: except Exception as e:
print(e) print(e)
@ -132,8 +132,8 @@ def convenorAddPlayerResult():
@routes.route('/convenor/squadList') @routes.route('/convenor/squadList')
def convenorSquadList(): def convenorSquadList():
sql = "SELECT team FROM _clubTeams WHERE club='HKFC' ORDER BY team" team_lookup = "SELECT team FROM _clubTeams WHERE club='HKFC' ORDER BY team"
teams = sql_read(sql) teams = sql_read(team_lookup)
form = squadListForm() form = squadListForm()
return render_template('_convenorSquadList.html', data=teams, form=form) return render_template('_convenorSquadList.html', data=teams, form=form)
@ -141,9 +141,9 @@ def convenorSquadList():
def convenorSquadListResults(): def convenorSquadListResults():
try: try:
_team = request.form['teamName'] _team = request.form['teamName']
teamPlayer_lookup = "SELECT playerForenames, playerSurname, playerNickname, playerChineseName, playerEmail, playerDob, playerHkid, playerNumber, playerTelNumber FROM _HKFC_players WHERE (playerTeam='" + _team + "') ORDER BY playerNumber"
# validate that this data has been entered # validate that this data has been entered
if _team and request.method == 'POST': if _team and request.method == 'POST':
sql = "SELECT playerForenames, playerSurname, playerNickname, playerChineseName, playerEmail, playerDob, playerHkid, playerNumber, playerTelNumber FROM _HKFC_players WHERE (playerTeam='" + _team + "') ORDER BY playerNumber"
rows = sql_read(sql) rows = sql_read(sql)
table = convenorSquadListTable(rows) table = convenorSquadListTable(rows)
table.border = True table.border = True
@ -158,11 +158,10 @@ def convenorSquadListResults():
@routes.route('/convenor/editPlayer', methods=['POST']) @routes.route('/convenor/editPlayer', methods=['POST'])
def convenorEditPlayer(): def convenorEditPlayer():
_playerNumber = request.args['playerNumber'] _playerNumber = request.args['playerNumber']
sql = "SELECT playerTeam, playerForenames, playerSurname, playerNickname, playerChineseName, playerEmail, playerDob, playerHkid, playerNumber, playerTelNumber FROM _HKFC_players WHERE playerNumber='" + _playerNumber + "'" player_lookup = "SELECT playerTeam, playerForenames, playerSurname, playerNickname, playerChineseName, playerEmail, playerDob, playerHkid, playerNumber, playerTelNumber FROM _HKFC_players WHERE playerNumber='" + _playerNumber + "'"
sql2 = "SELECT hockeyClub, logoURL FROM mensHockeyClubs ORDER BY hockeyClub" clubLogo_lookup = "SELECT hockeyClub, logoURL FROM mensHockeyClubs ORDER BY hockeyClub"
playerData = sql_read(sql) playerData = sql_read(player_lookup)
print(playerData) clubs = sql_read_static(clubLogo_lookup)
clubs = sql_read_static(sql2)
form = addPlayerForm() form = addPlayerForm()
form.playerClub.choices = [(club['hockeyClub'], club['hockeyClub']) for club in clubs] form.playerClub.choices = [(club['hockeyClub'], club['hockeyClub']) for club in clubs]
form.playerForenames.data = playerData[0]['playerForenames'] form.playerForenames.data = playerData[0]['playerForenames']
@ -180,8 +179,8 @@ def convenorEditPlayer():
@routes.route('/convenor/deletePlayer', methods=['POST']) @routes.route('/convenor/deletePlayer', methods=['POST'])
def convenorDeletePlayer(): def convenorDeletePlayer():
_playerNumber = request.args['playerNumber'] _playerNumber = request.args['playerNumber']
sql = "DELETE FROM _HKFC_players WHERE playerNumber=" + _playerNumber + "" player_delete = "DELETE FROM _HKFC_players WHERE playerNumber=" + _playerNumber + ""
sql_write(sql) sql_write(player_delete)
return render_template('_hkfcPlayerDeleted.html', number=_playerNumber) return render_template('_hkfcPlayerDeleted.html', number=_playerNumber)
@ -201,9 +200,9 @@ def convenorEditPlayerResult():
_playerHkid = request.form['playerHkid'] _playerHkid = request.form['playerHkid']
_playerNumber = request.form['playerNumber'] _playerNumber = request.form['playerNumber']
_playerTelNumber = request.form['playerTelNumber'] _playerTelNumber = request.form['playerTelNumber']
player_update = "UPDATE _" + _club + "_players SET playerTeam='" + _team + "', playerForenames='" + _playerForename + "', playerSurname='" + _playerSurname + "', playerNickname='" + _playerNickname + "', playerEmail='" + _playerEmail + "', playerTelNumber='" + _playerTelNumber + "' WHERE playerHkid='" + _playerHkid + "'"
if _team and _playerSurname and _playerHkid and _playerNumber and request.method == 'POST': if _team and _playerSurname and _playerHkid and _playerNumber and request.method == 'POST':
sql = "UPDATE _" + _club + "_players SET playerTeam='" + _team + "', playerForenames='" + _playerForename + "', playerSurname='" + _playerSurname + "', playerNickname='" + _playerNickname + "', playerEmail='" + _playerEmail + "', playerTelNumber='" + _playerTelNumber + "' WHERE playerHkid='" + _playerHkid + "'" sql_write(player_update)
sql_write(sql)
return render_template('_convenorEditPlayerResults.html', club=_club, firstname=_playerForename, nickname=_playerNickname, surname=_playerSurname, shirt=_playerNumber) return render_template('_convenorEditPlayerResults.html', club=_club, firstname=_playerForename, nickname=_playerNickname, surname=_playerSurname, shirt=_playerNumber)
except Exception as e: except Exception as e:
print(e) print(e)
@ -211,8 +210,8 @@ def convenorEditPlayerResult():
@routes.route('/convenor/fixtureList') @routes.route('/convenor/fixtureList')
def convenorFixturesList(): def convenorFixturesList():
sql = "SELECT date, division, homeTeam, awayTeam, venue, time, umpire1, umpire2 FROM hockeyFixtures" fixtures_lookup = "SELECT date, division, homeTeam, awayTeam, venue, time, umpire1, umpire2 FROM hockeyFixtures"
rows = sql_read(sql) rows = sql_read(fixtures_lookup)
table = convenorFixtureList(rows) table = convenorFixtureList(rows)
table.border = True table.border = True
table.classes = ['table-striped', 'table-condensed', 'table-hover'] table.classes = ['table-striped', 'table-condensed', 'table-hover']