Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
ProjectClient_Y1S1_tramshedTech_team15
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Arianne Bayliss
ProjectClient_Y1S1_tramshedTech_team15
Merge requests
!44
Updating functions.
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
Closed
Updating functions.
13-as-a-moderator-i-want-to-be-able-to-amend-and-remove-existing-locations-spaces-features
into
development
Overview
0
Commits
4
Changes
1
Closed
Updating functions.
Liam Driscoll
requested to merge
13-as-a-moderator-i-want-to-be-able-to-amend-and-remove-existing-locations-spaces-features
into
development
Dec 6, 2022
Overview
0
Commits
4
Changes
1
Closes
#13 (closed)
0
0
Merge request reports
Compare
development
version 2
447d1e30
Dec 6, 2022
version 1
ac6fc809
Dec 6, 2022
development (base)
and
version 2
latest version
c76795c2
4 commits,
Dec 6, 2022
version 2
447d1e30
2 commits,
Dec 6, 2022
version 1
ac6fc809
1 commit,
Dec 6, 2022
1 file
+
61
−
35
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
project_server.py
+
61
−
35
View file @ 447d1e30
Edit in single-file editor
Open in Web IDE
Show full file
@@ -7,6 +7,15 @@ DATABASE = "project_db.db"
ALLOWED_EXTENSIONS
=
set
([
'
txt
'
,
'
pdf
'
,
'
png
'
,
'
jpg
'
,
'
jpeg
'
,
'
gif
'
])
#Error handling for common database connection.
#Parameter optional. Defaults to DATABASE.
def
connect_db
(
db_file
=
DATABASE
):
conn
=
None
try
:
conn
=
sqlite3
.
connect
(
db_file
)
except
:
print
(
"
Error connecting to database.
"
)
return
conn
@app.route
(
"
/
"
,
methods
=
[
'
GET
'
])
def
returnIndex
():
@@ -20,69 +29,86 @@ def returnManageCoworkingSpaces():
def
searchRecord
():
if
request
.
method
==
'
POST
'
:
recordName
=
request
.
form
.
get
(
'
recordName
'
,
default
=
"
Error
"
)
print
(
f
"
Searching for
'
{
recordName
}
'
in database.
"
)
try
:
recordName
=
request
.
form
.
get
(
'
recordName
'
,
default
=
"
Error
"
)
conn
=
sqlite3
.
connect
(
DATABASE
)
conn
=
connect_db
()
cur
=
conn
.
cursor
()
cur
.
execute
(
"
SELECT * FROM coworking_spaces WHERE Name=?;
"
,
[
recordName
])
recordData
=
cur
.
fetchall
()
except
:
print
(
f
"
Error
:
{
record
Data
}
"
)
conn
.
close
()
print
(
f
"
Error
searching for
record
.
"
)
finally
:
conn
.
close
()
print
(
f
"
{
str
(
recordData
)
}
Record found.
"
)
return
str
(
recordData
)
# Adds a record to the CSV file.
if
not
recordData
:
#If recordData is an empty list...
print
(
f
"'
{
recordName
}
'
not found.
"
)
return
(
f
"'
{
recordName
}
'
not found.
"
)
else
:
print
(
f
"
Found:
{
recordData
}
"
)
return
(
str
(
recordData
))
@app.route
(
"
/AddRecord
"
,
methods
=
[
'
POST
'
])
def
addRecord
():
print
(
'
Processing record.
'
)
infoMessage
=
(
'
Add record failed.
'
)
if
(
request
.
method
==
'
POST
'
):
recordName
=
request
.
form
[
'
recordName
'
]
recordAddress
=
request
.
form
[
'
recordAddress
'
]
recordMainPhotos
=
request
.
form
[
'
recordMainPhotos
'
]
recordAdditionalPhotos
=
request
.
form
[
'
recordAdditionalPhotos
'
]
recordDescription
=
request
.
form
[
'
recordDescription
'
]
recordWebsite
=
request
.
form
[
'
recordWebsite
'
]
recordEmail
=
request
.
form
[
'
recordEmail
'
]
recordPhoneNumber
=
request
.
form
[
'
recordPhoneNumber
'
]
recordOpeningHours
=
request
.
form
[
'
recordOpeningHours
'
]
recordCheckinInstructions
=
request
.
form
[
'
recordCheckinInstructions
'
]
recordName
=
request
.
form
.
get
(
'
recordName
'
,
default
=
"
Error
"
)
recordAddress
=
request
.
form
.
get
(
'
recordAddress
'
,
default
=
"
Error
"
)
recordMainPhotos
=
request
.
form
.
get
(
'
recordMainPhotos
'
,
default
=
"
Error
"
)
recordAdditionalPhotos
=
request
.
form
.
get
(
'
recordAdditionalPhotos
'
,
default
=
"
Error
"
)
recordDescription
=
request
.
form
.
get
(
'
recordDescription
'
,
default
=
"
Error
"
)
recordWebsite
=
request
.
form
.
get
(
'
recordWebsite
'
,
default
=
"
Error
"
)
recordEmail
=
request
.
form
.
get
(
'
recordEmail
'
,
default
=
"
Error
"
)
recordPhoneNumber
=
request
.
form
.
get
(
'
recordPhoneNumber
'
,
default
=
"
Error
"
)
recordOpeningHours
=
request
.
form
.
get
(
'
recordOpeningHours
'
,
default
=
"
Error
"
)
recordCheckinInstructions
=
request
.
form
.
get
(
'
recordCheckinInstructions
'
,
default
=
"
Error
"
)
recordData
=
[
recordName
,
recordAddress
,
recordMainPhotos
,
recordAdditionalPhotos
,
recordDescription
,
recordWebsite
,
recordEmail
,
recordPhoneNumber
,
recordOpeningHours
,
recordCheckinInstructions
]
print
(
f
"
Adding
'
{
recordName
}
'
to database.
"
)
conn
=
sqlite3
.
connect
(
DATABASE
)
cur
=
conn
.
cursor
()
cur
.
execute
(
"
INSERT INTO coworking_spaces (
'
Name
'
,
'
Address
'
,
'
Main_Photo
'
,
'
Additional_Photos
'
,
'
Description
'
,
'
Website
'
,
'
Email
'
,
'
Phone_Number
'
,
'
Opening_Hours
'
,
'
Checkin_Instructions
'
)
\
VALUES (?,?,?,?,?,?,?,?,?,?)
"
,
(
recordName
,
recordAddress
,
recordMainPhotos
,
recordAdditionalPhotos
,
recordDescription
,
recordWebsite
,
recordEmail
,
recordPhoneNumber
,
recordOpeningHours
,
recordCheckinInstructions
))
conn
.
commit
()
conn
.
close
()
try
:
conn
=
connect_db
()
cur
=
conn
.
cursor
()
cur
.
execute
(
"
INSERT INTO coworking_spaces (
'
Name
'
,
'
Address
'
,
'
Main_Photo
'
,
'
Additional_Photos
'
,
'
Description
'
,
'
Website
'
,
'
Email
'
,
'
Phone_Number
'
,
'
Opening_Hours
'
,
'
Checkin_Instructions
'
)
\
VALUES (?,?,?,?,?,?,?,?,?,?)
"
,
(
recordName
,
recordAddress
,
recordMainPhotos
,
recordAdditionalPhotos
,
recordDescription
,
recordWebsite
,
recordEmail
,
recordPhoneNumber
,
recordOpeningHours
,
recordCheckinInstructions
))
conn
.
commit
()
infoMessage
=
(
f
"
Added:
{
recordData
}
"
)
infoMessage
=
(
f
'
{
recordData
}
Record added.
'
)
except
:
conn
.
rollback
()
infoMessage
=
(
f
"
Error adding record.
"
)
print
(
infoMessage
)
return
(
infoMessage
)
finally
:
conn
.
close
()
print
(
infoMessage
)
return
(
infoMessage
)
@app.route
(
"
/DeleteRecord
"
,
methods
=
[
'
POST
'
])
def
deleteRecord
():
if
request
.
method
==
'
POST
'
:
recordName
=
request
.
form
.
get
(
'
recordName
'
,
default
=
"
Error
"
)
print
(
f
"
Deleting
'
{
recordName
}
'
from database.
"
)
try
:
recordName
=
request
.
form
.
get
(
'
recordName
'
,
default
=
"
Error
"
)
conn
=
sqlite3
.
connect
(
DATABASE
)
cur
=
conn
.
cursor
()
cur
.
execute
(
"
DELETE FROM coworking_spaces WHERE Name=?;
"
,
[
recordName
])
conn
.
commit
()
infoMessage
=
(
f
"
Deleted:
'
{
recordName
}
'
.
"
)
except
:
print
(
f
"
Error:
{
recordData
}
"
)
conn
.
close
()
conn
.
rollback
()
infoMessage
=
(
f
"
Error deleting record.
"
)
finally
:
conn
.
close
()
print
(
"
Record deleted.
"
)
return
(
"
Record deleted.
"
)
print
(
infoMessage
)
return
(
infoMessage
)
@app.route
(
"
/EditRecord
"
,
methods
=
[
'
POST
'
])
def
editRecord
():
@@ -109,7 +135,7 @@ def editRecord():
conn
.
commit
()
conn
.
close
()
infoMessage
=
(
f
'
{
recordData
}
Record amended.
'
)
infoMessage
=
(
f
'
Updated:
{
recordData
}
'
)
print
(
infoMessage
)
return
(
infoMessage
)
Loading