From 4aa5d9b1f1436aeebb3abcb800ea160075dd4781 Mon Sep 17 00:00:00 2001
From: Liam Driscoll <driscolll4@cardiff.ac.uk>
Date: Tue, 6 Dec 2022 13:25:42 +0000
Subject: [PATCH] Changes to search functionality.
---
project_server.py | 36 +++++++++++++++-------------
static/JS/Manage_Coworking_Spaces.js | 11 +++++++++
2 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/project_server.py b/project_server.py
index e82e33e..5f8da17 100644
--- a/project_server.py
+++ b/project_server.py
@@ -10,29 +10,31 @@ ALLOWED_EXTENSIONS = set(['txt', 'pdf', 'png', 'jpg', 'jpeg', 'gif'])
@app.route("/", methods=['GET'])
def returnIndex():
- return render_template("test.html")
+ if (request.method == 'GET'):
+ return render_template("test.html")
@app.route("/Manage_Coworking_Spaces", methods=['GET'])
def returnManageCoworkingSpaces():
- return render_template("Manage_Coworking_Spaces.html")
+ if (request.method == 'GET'):
+ return render_template("Manage_Coworking_Spaces.html")
-@app.route("/SearchRecord", methods=['POST'])
+@app.route("/SearchRecord", methods=['POST', 'GET'])
def searchRecord():
- if request.method =='POST':
- try:
- recordName = request.form.get('recordName', default="Error")
- conn = sqlite3.connect(DATABASE)
- cur = conn.cursor()
- cur.execute("SELECT * FROM coworking_spaces WHERE Name=?;", [recordName])
- recordData = cur.fetchall()
- except:
- print(f"Error: {recordData}")
- conn.close()
- finally:
- conn.close()
- print(f"{str(recordData)} Record found.")
- return str(recordData)
+ try:
+ recordName = request.form.get('recordName', default="Error")
+ conn = sqlite3.connect(DATABASE)
+ cur = conn.cursor()
+ cur.execute("SELECT * FROM coworking_spaces WHERE Name=?;", [recordName])
+ recordData = cur.fetchall()
+
+ except:
+ print(f"Error: {recordData}")
+ conn.close()
+ finally:
+ conn.close()
+ print(f"{recordData} Record found.")
+ return (recordData)
# Adds a record to the CSV file.
@app.route("/AddRecord", methods=['POST'])
diff --git a/static/JS/Manage_Coworking_Spaces.js b/static/JS/Manage_Coworking_Spaces.js
index c20755b..2e11d79 100644
--- a/static/JS/Manage_Coworking_Spaces.js
+++ b/static/JS/Manage_Coworking_Spaces.js
@@ -52,6 +52,17 @@ function searchRecord(e) {
xhttp.onreadystatechange = function() {
if (xhttp.readyState === 4 && xhttp.status === 200) {
console.log(xhttp.responseText);
+ serverResponse = JSON.parse(xhttp.responseText);
+ document.getElementById("recordName").value = serverResponse[0][0];
+ document.getElementById("recordAddress").value = serverResponse[0][1];
+ document.getElementById("recordMainPhotos").value = serverResponse[0][2];
+ document.getElementById("recordAdditionalPhotos").value = serverResponse[0][3];
+ document.getElementById("recordDescription").value = serverResponse[0][4];
+ document.getElementById("recordWebsite").value = serverResponse[0][5];
+ document.getElementById("recordEmail").value = serverResponse[0][6];
+ document.getElementById("recordPhoneNumber").value = serverResponse[0][7];
+ document.getElementById("recordOpeningHours").value = serverResponse[0][8];
+ document.getElementById("recordCheckinInstructions").value = serverResponse[0][9];
document.getElementById("DEBUGserverMessage").innerHTML = xhttp.responseText;
} else {
console.error(`Status Text: ${xhttp.statusText}.`);
--
GitLab