From e41d760c13af057bdbd9c5b1fcb08b5fef28a856 Mon Sep 17 00:00:00 2001
From: Rhiannon Austin <austinrp@cardiff.ac.uk>
Date: Tue, 14 Dec 2021 02:22:35 +0000
Subject: [PATCH] Fixing location html + adding to database workspaces
---
database.db | Bin 16384 -> 20480 bytes
database.db-journal | Bin 0 -> 4616 bytes
database.sqbpro | 1 +
templates/Locations.html | 5 +----
4 files changed, 2 insertions(+), 4 deletions(-)
create mode 100644 database.db-journal
create mode 100644 database.sqbpro
diff --git a/database.db b/database.db
index 9292b0f6037f43c030bb0c3216357b8ded2d15dd..4ae74a654169246e7ee2dacc6a8f5d8756c172ab 100644
GIT binary patch
delta 1320
zcmd5+&u`pB6t?4pG$Cs%f~9Jkz^f2~!g_yX^RtIWNg9<%OAxJB<$_?=e%T$ZJ+qn_
zC+q<w+lV{CM-Y?~s=}p>)TmPbgq~3ky>R8qKhWnSz2wHFs->~yd2inP-uHc;y*+#H
zzWvjc$qSZcjnI1aI0vPA@q$%eeqNxh;fZ6*ec;|L@QLGxgSCk-29@E_i@tB)n>4Hy
z<4P1M)H;w2W*Sno&wr1s-Ckb_)*)C~ZLGujX!f`;pH;m}@5Ri-bQ%nPZ(#Gw05+SA
z#<e3}_+@C^8GB^8x86P+d-QPd-)O=4%bFh8_bP+sjpbVQ>(t+0ug%`v0Iq=v;37<0
z%t!^M!whsV?rAC-b|92Vj|q+%+Dh(}C^-V7Si}vNg2m8EH5W7qC2%3+HZz$0HVvN|
z)6>^0l^tXXLuOdq*QP90`?J~EPpa2u7GbHnP=|%ZYBl@)gDZh$4UN-!%PO8>+~0Ow
ztH{srt_;4-(Vie)V@WU7C8*c@`XYRlA_}-;6rw4?=V=_%yIF%;vzh%fb?^oad3m>~
zk@!Wxgz*^IsRcl8L9ZhPf=H7Vk^&M!7E`=~EIQ%4C1n>FM5wzZh|xfT&=qnA`ZE1k
zA%z0P65YXwB6*D;FAcfYG?BOe1BsoJmn%>s2?B0N&5&qg%AhKp@~7dpWKjuLG2UXD
zcw7zYuyivZ2D4ot1y4N^VGl)wf)a!@{+3jJPsuHAfP|&8n&qZ|9jUrJH>GSNjjMnX
zPv&kbBzq`mOG(X8(2tPkF*2DD7#hM)c1u#hO+Tk4=3Vr66HYy&SMHK3H(HK|a4764
z6qqVbPQ+09nnuLr)WqcMoa`?4AyRys`clc09ilGAs7*ppW0~~xf}2w1SOsh-jLGEX
z&Y6R=Kc_GLKQ~{FUz^bT^Y+of)MNW+7#?@LW6OKy{p%ecO~M23qjwy~A3J|@xVCfE
zzDok>9t%-B*^A1Do|E5Lj$5?6Z`>ztk&chL&fuz(J-u<?c8;FhxMh#$DYkcLd50AK
m!yCP0k5~hHF8l8N>+jCZm6v80YV$Mol3y>+RO?GKi!T8!Ijx2O
delta 149
zcmZozz}V2hI6+#Fg@J(qgkgYbqK>gJ3xl42EiX`rnKzSxZzW$iZ{}t}h3`C@GkIq-
zaWL`pG4Q$b^Z|vMc$k~bm^ORKZDZW*F1MGFgNgqP1OFNRS3tRC{1Ycg3Ggv8D>8=X
o7iAY0Bqpa8GflpuuguE?GMkBSCj);h-%g;?wS1d*+PO0V03G%tc>n+a
diff --git a/database.db-journal b/database.db-journal
new file mode 100644
index 0000000000000000000000000000000000000000..931772b91248f9b17fa63029d518269c632bb142
GIT binary patch
literal 4616
zcmeHJ-HzKt6n1w70xDKqv=<0fI(G#TJN}6`2@+b`?3P6QYzql3Ql-_{b7Bv%XUxnv
zAs1XME8c;3fGb{zSK&;y+eNAb7f2N<wiM4eXXH8O`#EFJyS{Eced8B;dd>6pXn5y3
z(9K?D1oqyh>h|CK-8=a7=C3q#SBF4{K!-qwK!-qw!2bb({olMh=Qn=ppC8SRqI>7>
zO%%ub%;41sCtS#^)kWEZWXNE`jI9vns5Q&6_t)^rG=li#^U~VJeAMrYniXgQ^L@)S
znub>UIhR4M>VB@IMQQu%sGp{TWSqny4zh4Lj<b{>=7W5c^`kUQ$8i+KNisb2AKsfT
zj;G(8o_;p__QBxEqleSe(|$Tmqc|RigV9-n2~Wdio<(OW_^v6AmP*&memqRW&17&q
z17Uzk5HfEwW|an8G7BYEjRA{!36xgDq(B3OR+}Cz=3q7B!U`o>1zBr^L}O@ykW#Ig
z#o(&a&1MtWQW#-!LN6oqT$RtGNcHE;vTAE=pmg!!VDNtUK|F$SI80zT3d1jy<ZKH*
zJkWwBJs7i^p3<hC(+Bxm^n2aA{fwoH_5Oi(TRdm%%$2t*al-1RHAGY7CnI>&B1-t$
zYDC+EX<JovUqlcs7FU^d3|%U9^KTeh7$h+vV9i7YjB^sZ0kwptR1!h9b%rE21v#rI
zULxZ=ab-%afB{Fd>OqATYJ`<k8`!G$u0{&YHLFdDoFeWWKfk+o;N2nOFMixv^=$G?
zQ*&WSxj8Y;v_;*!q~5?+it!%Y$7)HQrO7;j@$vjWNB(1~)z$0V$+1DYNlI5L>ywH7
zMysW;K)#_O4RdycjnXS23qrL(!d?R{+>uadBx7nQl%mp6vaE9J7};A&%q@XQ&a7K0
z?ACEqi52>_+m~P2T50ESmky<&vC$~8)q+|8=E^tZVXQB^2elMO{0g_gwOG@(^v2yk
zL}P`#AW_i1s@}R6eyOxeRl-bTMcw6PbdQ&&&5Oeuq)peMirJC>Y91qx@$MQSb6pjG
zXey<53M2uL8Y}L&H<k?8HYN!EiCiWnD?fSh%%GzIq9lU!FoZY^lfO9_Tyw~;yMqB!
hs+RI_XDiDsOm};LJGRIuFEpr1kdS$B>*>uu{sgA$tg8S3
literal 0
HcmV?d00001
diff --git a/database.sqbpro b/database.sqbpro
new file mode 100644
index 0000000..f8394f0
--- /dev/null
+++ b/database.sqbpro
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><sqlb_project><db path="C:/Users/c21054715/OneDrive - Cardiff University/Documents/Client Project 2021/client-project-15/database.db" readonly="0" foreign_keys="1" case_sensitive_like="0" temp_store="0" wal_autocheckpoint="1000" synchronous="2"/><attached/><window><main_tabs open="structure browser pragmas query" current="1"/></window><tab_structure><column_width id="0" width="300"/><column_width id="1" width="0"/><column_width id="2" width="150"/><column_width id="3" width="2792"/><column_width id="4" width="0"/><expanded_item id="0" parent="1"/><expanded_item id="1" parent="1"/><expanded_item id="2" parent="1"/><expanded_item id="3" parent="1"/></tab_structure><tab_browse><current_table name="4,10:mainWorkspaces"/><default_encoding codec=""/><browse_table_settings><table schema="main" name="AdditionalPhotos" show_row_id="0" encoding="" plot_x_axis="" unlock_view_pk="_rowid_"><sort/><column_widths><column index="1" value="61"/><column index="2" value="300"/><column index="3" value="153"/></column_widths><filter_values/><conditional_formats/><row_id_formats/><display_formats/><hidden_columns/><plot_y_axes/><global_filter/></table><table schema="main" name="Workspaces" show_row_id="0" encoding="" plot_x_axis="" unlock_view_pk="_rowid_"><sort/><column_widths><column index="1" value="61"/><column index="2" value="95"/><column index="3" value="300"/><column index="4" value="300"/><column index="5" value="300"/><column index="6" value="299"/><column index="7" value="264"/><column index="8" value="172"/><column index="9" value="258"/><column index="10" value="300"/></column_widths><filter_values/><conditional_formats/><row_id_formats/><display_formats/><hidden_columns/><plot_y_axes/><global_filter/></table></browse_table_settings></tab_browse><tab_sql><sql name="SQL 1"></sql><current_tab id="0"/></tab_sql></sqlb_project>
diff --git a/templates/Locations.html b/templates/Locations.html
index 62fcfb7..0e39ae8 100644
--- a/templates/Locations.html
+++ b/templates/Locations.html
@@ -7,11 +7,7 @@
<button class="btn" onclick="filterSelection('North-England')"> North England</button>
<button class="btn" onclick="filterSelection('South-West-England')"> South West England</button>
<button class="btn" onclick="filterSelection('Midlands')"> Midlands</button>
-<<<<<<< HEAD
<button class="btn" onclick="filterSelection('Scotland')"> Scotland</button>
-=======
- <button class="btn" onclick="filterSelection('Scotland')"> Scotland<button>
->>>>>>> eee8f2dbda7bb480a8543f73de8f7278a1aed2e0
</div>
<div class="container">
@@ -28,3 +24,4 @@
<div class="filterDiv Scotland">Location 11</div>
<div class="filterDiv Scotland">Location 12</div>
</div>
+{% endblock %}
--
GitLab