From 754fc69331f5ee62d607931583c325804b296b39 Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Mon, 9 Nov 2020 10:39:49 +0800 Subject: [PATCH 1/6] Removed search function --- routes/__init__.py | 1 - templates/dashboard.html | 12 ------------ 2 files changed, 13 deletions(-) diff --git a/routes/__init__.py b/routes/__init__.py index 8ed905c..8b3c96b 100644 --- a/routes/__init__.py +++ b/routes/__init__.py @@ -2,7 +2,6 @@ from flask import Blueprint routes = Blueprint('routes', __name__) from .dashboard import * -from ._search import * from ._matches import * from ._hkfcD_motm import * from ._convenor import * diff --git a/templates/dashboard.html b/templates/dashboard.html index b9e4df6..fa1289e 100644 --- a/templates/dashboard.html +++ b/templates/dashboard.html @@ -12,18 +12,6 @@ Dashboard {% block body %}
-
- -
- General Match Search - Player Record Search - Team Record Search - Club Player Playing Record - Played for multiple teams -
-
- Cancel -

- - - From c24f65c7ec9e3419a58c8a495d2891a0fb726936 Mon Sep 17 00:00:00 2001 From: jenkins-x-bot Date: Mon, 9 Nov 2020 12:40:04 +0800 Subject: [PATCH 4/6] Fixing player edit function --- routes/_convenor.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/routes/_convenor.py b/routes/_convenor.py index 8d9f03b..cf74f75 100644 --- a/routes/_convenor.py +++ b/routes/_convenor.py @@ -1,4 +1,3 @@ -#import MySQLdb import pymysql import os from flask import render_template, request @@ -206,8 +205,6 @@ def convenorDeletePlayer(): @basic_auth.required def convenorEditPlayerResult(): try: -# _year = request.form['year'] - _year = "2018" _club = request.form['playerClub'] _team = request.form['playerTeam'] _playerForename = request.form['playerForenames'] @@ -222,7 +219,8 @@ def convenorEditPlayerResult(): _playerNumber = request.form['playerNumber'] _playerTelNumber = request.form['playerTelNumber'] 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 + "', playerChineseName='" + _playerChineseName_enc + "', playerEmail='" + _playerEmail + "', playerDob='" + _playerDob + "', playerHkid='" + _playerHkid + "', playerTelNumber='" + _playerTelNumber + "' WHERE playerNumber='" + _playerNumber + "'" + #sql = "UPDATE _" + _club + "_players SET playerTeam='" + _team + "', playerForenames='" + _playerForename + "', playerSurname='" + _playerSurname + "', playerNickname='" + _playerNickname + "', playerChineseName='" + _playerChineseName_enc + "', playerEmail='" + _playerEmail + "', playerDob='" + _playerDob + "', playerHkid='" + _playerHkid + "', playerTelNumber='" + _playerTelNumber + "' WHERE playerNumber='" + _playerNumber + "'" + sql = "UPDATE _" + _club + "_players SET playerTeam='" + _team + "' WHERE playerHkid='" + _playerHkid + "'" sql_write(sql) return render_template('_convenorEditPlayerResults.html', club=_club, firstname=_playerForename, nickname=_playerNickname, surname=_playerSurname, shirt=_playerNumber) except Exception as e: From 58b99d26c19c0c7b099b999090f63a15b77eda8d Mon Sep 17 00:00:00 2001 From: jenkins-x-bot Date: Mon, 9 Nov 2020 13:22:14 +0800 Subject: [PATCH 5/6] Remove Chinese Name from player info --- routes/_convenor.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/routes/_convenor.py b/routes/_convenor.py index cf74f75..3570c39 100644 --- a/routes/_convenor.py +++ b/routes/_convenor.py @@ -7,7 +7,7 @@ from dbWrite import sql_read, sql_write, sql_read_static, sql_write_static from forms import addPlayerForm, addTeamForm, addClubForm, playerDbCreateForm, squadListForm from tables import clubList, convenorSquadListTable, convenorFixtureList from . import routes - +from logging import error, info import json BASIC_AUTH_USERNAME = 'admin' @@ -133,9 +133,7 @@ def convenorAddPlayerResult(): _playerNumber = request.form['playerNumber'] _playerTelNumber = request.form['playerTelNumber'] if _team and _playerSurname and _playerHkid and _playerNumber and request.method == 'POST': - sql = "INSERT INTO _" + _club + "_players (playerTeam, playerForenames, playerSurname, playerNickname, playerChineseName, playerEmail, playerDob, playerHkid, playerNumber, playerTelNumber) VALUES ('" + _team + "', '" + _playerForename + "', '" + _playerSurname + "', '" + _playerNickname + "', '" + _playerChineseName_enc + "', '" + _playerEmail + "', '" + _playerDob + "', '" + _playerHkid + "', '" + _playerNumber + "', '" + _playerTelNumber + "')" - print(_team) - print(sql) + 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(sql) return render_template('_convenorPlayerAddResults.html', club=_club, firstname=_playerForename, nickname=_playerNickname, surname=_surname, shirt=_playerNumber) except Exception as e: From 219e892edcefad23d0a380f8fb19cbfef61b3fb1 Mon Sep 17 00:00:00 2001 From: jenkins-x-bot Date: Mon, 9 Nov 2020 13:52:38 +0800 Subject: [PATCH 6/6] Fixing player details --- routes/_convenor.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/routes/_convenor.py b/routes/_convenor.py index 3570c39..f927153 100644 --- a/routes/_convenor.py +++ b/routes/_convenor.py @@ -217,8 +217,7 @@ def convenorEditPlayerResult(): _playerNumber = request.form['playerNumber'] _playerTelNumber = request.form['playerTelNumber'] 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 + "', playerChineseName='" + _playerChineseName_enc + "', playerEmail='" + _playerEmail + "', playerDob='" + _playerDob + "', playerHkid='" + _playerHkid + "', playerTelNumber='" + _playerTelNumber + "' WHERE playerNumber='" + _playerNumber + "'" - sql = "UPDATE _" + _club + "_players SET playerTeam='" + _team + "' WHERE playerHkid='" + _playerHkid + "'" + sql = "UPDATE _" + _club + "_players SET playerTeam='" + _team + "', playerForenames='" + _playerForename + "', playerSurname='" + _playerSurname + "', playerNickname='" + _playerNickname + "', playerEmail='" + _playerEmail + "', playerTelNumber='" + _playerTelNumber + "' WHERE playerHkid='" + _playerHkid + "'" sql_write(sql) return render_template('_convenorEditPlayerResults.html', club=_club, firstname=_playerForename, nickname=_playerNickname, surname=_playerSurname, shirt=_playerNumber) except Exception as e: