diff --git a/project_server.py b/project_server.py
index e82e33e8ba2eeff3fabb2b41bcae982fb22101ae..dc4d679637735ebd12bb91418b8244e531f01210 100644
--- a/project_server.py
+++ b/project_server.py
@@ -10,29 +10,32 @@ 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/CSS/Manage_Coworking_Spaces.css b/static/CSS/Manage_Coworking_Spaces.css
index b9b1e4a439d856607d7bba1fe3a0af72c13b3a42..ec63a924db40d6c8803af1687a3d011d2410288c 100644
--- a/static/CSS/Manage_Coworking_Spaces.css
+++ b/static/CSS/Manage_Coworking_Spaces.css
@@ -19,6 +19,11 @@ overflow, float, display
body {
margin: 0;
padding: 0;
+
+ /* Below styling used for footer position. */
+ display: flex;
+ min-height: 100vh;
+ flex-direction: column;
}
ul, li {
@@ -48,6 +53,7 @@ a {
header #pageHeader
div #headerDiv
+ a #headerText #headerImg
nav #headerNav .navBar
ul .Right, ul .Left
li a
@@ -71,11 +77,11 @@ header #pageHeader
#headerText {
width: 100%;
- margin-left: -220px;
+ margin-left: -240px;
}
#headerImg {
- width: 180px;
+ width: 200px;
height: 65px;
margin-top: -10px;
margin-right: 20px;
@@ -93,11 +99,6 @@ header #pageHeader
padding: 7.5px 10px;
}
-#headerNav img {
- width: 55px;
- height: 20px;
-}
-
/* [#2] Page navigation styling. Used in [#1] and [#4]. */
.navBar {
@@ -130,7 +131,10 @@ main #pageMain
*/
-#pageMain {}
+#pageMain {
+ /* Below styling used for footer position. */
+ flex: 1;
+}
#recordForm {
margin-left: 5px;
diff --git a/static/JS/Manage_Coworking_Spaces.js b/static/JS/Manage_Coworking_Spaces.js
index c20755b76708e03d8d46a91898f0b26f2b98ca6a..ab9371b3050e68921c68d7142d571daba878dbfb 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}.`);
@@ -61,7 +72,6 @@ function searchRecord(e) {
xhttp.send(params);
}
-
// Adds a record to the database.
function addRecord(e) {
// Removes the standard form processing.
diff --git a/templates/Manage_Coworking_Spaces.html b/templates/Manage_Coworking_Spaces.html
index 4daddcc1d7cbb43e10a747f90edd331c74e35084..4787b82564fe77078367f733eb3aac27c2fda7fa 100644
--- a/templates/Manage_Coworking_Spaces.html
+++ b/templates/Manage_Coworking_Spaces.html
@@ -2,55 +2,31 @@
{%block headblock%}
<title> Manage Coworking Spaces </title>
- <link rel="stylesheet" href="/static/CSS/Manage_Coworking_Spaces.css">
-{%endblock%}
-
-{%block onLoadblock%}
- pageLoad()
{%endblock%}
{%block headerblock%}
- <div id="headerDiv">
- <a href="Manage_Coworking_Spaces.html">
- <img id="headerImg" class="headerImg"
- src="/static/Media/Tramshed-Logo-Main-Black.png"></img></a>
- <a id="headerText" class="headerText"
+ <a id="headerText"
href="Manage_Coworking_Spaces">
Manage Coworking Spaces</a>
- </div>
- <nav id="headerNav" class="navBar">
- <ul class="Left">
- <li><a href="Manage_Coworking_Spaces">Home</a></li>
- <li><a href="Locations">Locations</a></li>
- </ul>
- <ul class="Right">
- <li><a href="Manage_Coworking_Spaces">Manage</a></li>
- <li><a href="Manage_Coworking_Spaces">Login</a></li>
- <li><div class="navHamburger">
- <span></span>
- <span></span>
- <span></span>
- </div></li>
- </ul>
- </nav>
{%endblock%}
{%block mainblock%}
<form id="recordForm" title="Record Form">
<label>Name: <input id="recordName" class="formTextInput"
- name="record_name" type="text"></label><br>
+ name="record_name" type="text"></label>
+ <button id="searchButton" type="submit">Search</button><br>
<label>Address: <input id="recordAddress" class="formTextInput"
name="record_address" type="text"></label><br>
<label>Main Photograph: <input id="recordMainPhotos" class="formTextInput"
- name="record_MP" type="text"></label><br>
+ name="record_MP" type="url"></label><br>
<label>Additional Photographs: <input id="recordAdditionalPhotos" class="formTextInput"
- name="record_AP" type="text"></label><br>
+ name="record_AP" type="url"></label><br>
<label>Description: <input id="recordDescription" class="formTextInput"
name="record_description" type="text"></label><br>
<label>Website: <input id="recordWebsite" class="formTextInput"
- name="record_website" type="text"></label><br>
+ name="record_website" type="url"></label><br>
<label>Email: <input id="recordEmail" class="formTextInput"
- name="record_email" type="text"></label><br>
+ name="record_email" type="email"></label><br>
<label>Phone Number: <input id="recordPhoneNumber" class="formTextInput"
name="record_PN" type="text"></label><br>
<label>Opening Hours: <input id="recordOpeningHours" class="formTextInput"
@@ -59,32 +35,14 @@
name="record_CI" type="text"></label>
<br><br>
- <button id="searchButton" type="submit">Search</button>
<button id="addButton" type="submit">Add</button>
<button id="editButton" type="submit">Edit</button>
<button id="deleteButton" type="submit">Delete</button>
+ <button id="clearButton" type="reset">Clear</button>
</form>
<br>
<span id="DEBUGserverMessage"> </span>
- <br><br><br><br><br><br><br><br><br><br><br><br>
- <br><br><br><br><br><br><br><br><br><br><br><br>
- <br><br><br><br><br><br><br><br><br><br><br><br>
- <br><br><br><br><br><br><br><br><br><br><br><br>
-{%endblock%}
-
-{%block footerblock%}
- <nav id="footerNav" class="navBar">
- <ul class="Center">
- <li><a href="Manage_Coworking_Spaces.html">Left</a></li>
- </ul>
- <ul class="Center">
- <li><a href="Manage_Coworking_Spaces.html">Center</a></li>
- </ul>
- <ul class="Center">
- <li><a href="Manage_Coworking_Spaces.html">Right</a></li>
- </ul>
- </nav>
{%endblock%}
{%block jsblock%}
diff --git a/templates/base_template.html b/templates/base_template.html
index 6460c1ffceb45aa080041be4dc7c93f60104bbce..63f880bf675d0295129064140fa0d116cfba53e4 100644
--- a/templates/base_template.html
+++ b/templates/base_template.html
@@ -4,12 +4,33 @@
<meta charSet="UTF-8">
{%block headblock%}
{%endblock%}
+ <link rel="stylesheet" href="/static/CSS/Manage_Coworking_Spaces.css">
</head>
- <body onLoad="{%block onLoadblock%}{%endblock%}">
+ <body onLoad="pageLoad()">
<header id="pageHeader" class="pageHeader">
- {%block headerblock%}
- {%endblock%}
+ <div id="headerDiv">
+ <a href="Manage_Coworking_Spaces.html">
+ <img id="headerImg" class="headerImg"
+ src="/static/Media/Tramshed-Logo-Main-Black.png"></img></a>
+ {%block headerblock%}
+ {%endblock%}
+ </div>
+ <nav id="headerNav" class="navBar">
+ <ul class="Left">
+ <li><a href="/static/landingpage.html">Home</a></li>
+ <li><a href="/static/locations.html">Locations</a></li>
+ </ul>
+ <ul class="Right">
+ <li><a href="Manage_Coworking_Spaces">Manage</a></li>
+ <li><a href="/static/login.html">Login</a></li>
+ <li><div class="navHamburger">
+ <span></span>
+ <span></span>
+ <span></span>
+ </div></li>
+ </ul>
+ </nav>
</header>
<main id="pageMain">
@@ -18,8 +39,17 @@
</main>
<footer id="pageFooter">
- {%block footerblock%}
- {%endblock%}
+ <nav id="footerNav" class="navBar">
+ <ul class="Center">
+ <li><a href="Manage_Coworking_Spaces">Left</a></li>
+ </ul>
+ <ul class="Center">
+ <li><a href="Manage_Coworking_Spaces">Center</a></li>
+ </ul>
+ <ul class="Center">
+ <li><a href="Manage_Coworking_Spaces">Right</a></li>
+ </ul>
+ </nav>
</footer>
<script src="{%block jsblock%}{%endblock%}"></script>