diff --git a/download/__pycache__/models.cpython-38.pyc b/download/__pycache__/models.cpython-38.pyc
index a4fe4df..7d4ef18 100644
Binary files a/download/__pycache__/models.cpython-38.pyc and b/download/__pycache__/models.cpython-38.pyc differ
diff --git a/download/__pycache__/views.cpython-38.pyc b/download/__pycache__/views.cpython-38.pyc
index cdaa44a..51e73f9 100644
Binary files a/download/__pycache__/views.cpython-38.pyc and b/download/__pycache__/views.cpython-38.pyc differ
diff --git a/download/migrations/0006_auto_20201024_2123.py b/download/migrations/0006_auto_20201024_2123.py
new file mode 100644
index 0000000..9f55d45
--- /dev/null
+++ b/download/migrations/0006_auto_20201024_2123.py
@@ -0,0 +1,32 @@
+# Generated by Django 3.1.2 on 2020-10-24 21:23
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('download', '0005_auto_20201024_2028'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Address',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('address', models.CharField(max_length=128)),
+ ('city', models.CharField(max_length=32)),
+ ],
+ ),
+ migrations.RemoveField(
+ model_name='pdf',
+ name='address_string',
+ ),
+ migrations.AddField(
+ model_name='pdf',
+ name='address',
+ field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.CASCADE, related_name='uploads', to='download.address'),
+ preserve_default=False,
+ ),
+ ]
diff --git a/download/migrations/0007_pdf_upload_date.py b/download/migrations/0007_pdf_upload_date.py
new file mode 100644
index 0000000..a5060f1
--- /dev/null
+++ b/download/migrations/0007_pdf_upload_date.py
@@ -0,0 +1,20 @@
+# Generated by Django 3.1.2 on 2020-10-24 21:34
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('download', '0006_auto_20201024_2123'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='pdf',
+ name='upload_date',
+ field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+ preserve_default=False,
+ ),
+ ]
diff --git a/download/migrations/__pycache__/0006_auto_20201024_2123.cpython-38.pyc b/download/migrations/__pycache__/0006_auto_20201024_2123.cpython-38.pyc
new file mode 100644
index 0000000..9eecfe3
Binary files /dev/null and b/download/migrations/__pycache__/0006_auto_20201024_2123.cpython-38.pyc differ
diff --git a/download/migrations/__pycache__/0007_pdf_upload_date.cpython-38.pyc b/download/migrations/__pycache__/0007_pdf_upload_date.cpython-38.pyc
new file mode 100644
index 0000000..83696a1
Binary files /dev/null and b/download/migrations/__pycache__/0007_pdf_upload_date.cpython-38.pyc differ
diff --git a/download/models.py b/download/models.py
index aa0b47e..8e266ef 100644
--- a/download/models.py
+++ b/download/models.py
@@ -3,8 +3,14 @@ from core.models import CalgaryAddress
from .validators import RestrictedFileField
# Create your models here.
+class Address(models.Model):
+ address = models.CharField(max_length=128)
+ # TODO: add validation columns in relation to city
+ city = models.CharField(max_length=32)
+
class PDF(models.Model):
path = models.CharField(max_length=64)
code = models.CharField(max_length=8)
- address_string = models.CharField(max_length=128)
- upload_file = RestrictedFileField(max_upload_size=1024*1024*1024*50, content_types=['pdf', 'application/pdf'], upload_to='uploads/%Y/%m/%d/')
+ upload_file = RestrictedFileField(max_upload_size=1024*1024*50, content_types=['pdf', 'application/pdf'], upload_to='uploads/%Y/%m/%d/')
+ address = models.ForeignKey(Address, on_delete=models.CASCADE, related_name='uploads')
+ upload_date = models.DateTimeField(auto_now_add=True, editable=False, null=False, blank=False)
diff --git a/download/templates/download/download-page.html b/download/templates/download/download-page.html
index e11dd00..f5a5c2d 100644
--- a/download/templates/download/download-page.html
+++ b/download/templates/download/download-page.html
@@ -2,6 +2,6 @@
{% block body %}
Download Your Quote
{% for thing in things %}
- {{ thing.address_string }}
+ {{ thing.address }}
{% endfor %}
{% endblock %}
diff --git a/download/views.py b/download/views.py
index 3d94f9e..84a0190 100644
--- a/download/views.py
+++ b/download/views.py
@@ -1,23 +1,24 @@
from django.shortcuts import render, HttpResponse
from django.http import FileResponse
-from .models import PDF
+from .models import Address, PDF
from .forms import CodeForm
# Create your views here.
def starter(request):
- print(list(PDF.objects.all()))
return render(request, 'download/download-page.html', {
- 'things': list(PDF.objects.all())
+ 'things': list(Address.objects.all())
})
def download(request, pdfid):
if request.method == 'POST':
form = CodeForm(request.POST)
if form.is_valid():
- pdfs = PDF.objects.filter(id=pdfid)
- if len(pdfs) == 0:
+ addr = Address.objects.filter(id=pdfid)
+ if len(addr) == 0:
return render(request, 'common/not-found.html')
- pdf = pdfs.filter(code=form.cleaned_data['code'])
+ addr = addr[0]
+ # TODO: If same address + different code, the old file is still visible if the old code is still known
+ pdf = PDF.objects.filter(address=addr, code=form.cleaned_data['code']).order_by('upload_date').reverse()
if len(pdf) == 0:
return render(request, 'common/password-incorrect.html')
pdf = pdf[0]
diff --git a/upload/__pycache__/views.cpython-38.pyc b/upload/__pycache__/views.cpython-38.pyc
index ca3c0d9..55bdf17 100644
Binary files a/upload/__pycache__/views.cpython-38.pyc and b/upload/__pycache__/views.cpython-38.pyc differ
diff --git a/upload/views.py b/upload/views.py
index a10f18f..9eb1869 100644
--- a/upload/views.py
+++ b/upload/views.py
@@ -1,6 +1,6 @@
from sodapy import Socrata
from core.models import CalgaryAddress
-from download.models import PDF
+from download.models import PDF, Address
from django.shortcuts import render, HttpResponse
import json
from .forms import PDFForm
@@ -43,22 +43,33 @@ def upload(request):
print(pdf_file)
filename = pdf_file.name
code = filename.split(".")[0].split(" ")[-1]
+ city = filename.split(".")[0].split(" ")[-2]
address = ' '.join(filename.split(" ")[:-1])
name = 'quote_'+code+'.pdf'
- possible_match = PDF.objects.filter(address_string=address)
+ possible_match = Address.objects.filter(address=address)
# if address already entered
if len(possible_match) > 0:
- # update file
- possible_match[0].upload_file = pdf_file
- possible_match[0].save()
+ pdf = PDF.objects.create(
+ path=name,
+ code=code,
+ upload_file=pdf_file,
+ address=possible_match[0]
+ )
+ pdf.save()
else:
# Save new address
+ addr = Address.objects.create(
+ address=address,
+ city=city
+ )
+ # code is currently changable per file
pdf = PDF.objects.create(
path=name,
- address_string=address,
code=code,
- upload_file=pdf_file
+ upload_file=pdf_file,
+ address=addr
)
+ addr.save()
pdf.save()
return HttpResponse("File(s) saved") # TODO: "x Files Saved"
elif request.method == "GET":
diff --git a/uploads/2020/10/15/CPRG311_Assignment1_Battleship_XgAUrt3.pdf b/uploads/2020/10/15/CPRG311_Assignment1_Battleship_XgAUrt3.pdf
deleted file mode 100644
index 7880378..0000000
Binary files a/uploads/2020/10/15/CPRG311_Assignment1_Battleship_XgAUrt3.pdf and /dev/null differ
diff --git a/uploads/2020/10/15/CPRG311_Assignment1_Battleship_nLGfLQz.pdf b/uploads/2020/10/15/CPRG311_Assignment1_Battleship_nLGfLQz.pdf
deleted file mode 100644
index 7880378..0000000
Binary files a/uploads/2020/10/15/CPRG311_Assignment1_Battleship_nLGfLQz.pdf and /dev/null differ
diff --git a/uploads/2020/10/15/CPRG311_Assignment1_Battleship_nPobqep.pdf b/uploads/2020/10/15/CPRG311_Assignment1_Battleship_nPobqep.pdf
deleted file mode 100644
index 7880378..0000000
Binary files a/uploads/2020/10/15/CPRG311_Assignment1_Battleship_nPobqep.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/1140_Lake_Huron_Crescent_SE_Calgary_128J40.pdf b/uploads/2020/10/24/1140_Lake_Huron_Crescent_SE_Calgary_128J40_LESxKa1.pdf
similarity index 100%
rename from uploads/2020/10/24/1140_Lake_Huron_Crescent_SE_Calgary_128J40.pdf
rename to uploads/2020/10/24/1140_Lake_Huron_Crescent_SE_Calgary_128J40_LESxKa1.pdf
diff --git a/uploads/2020/10/24/1140_Lake_Huron_Crescent_SE_Calgary_128J40_JyMgeMS.pdf b/uploads/2020/10/24/1140_Lake_Huron_Crescent_SE_Calgary_128J40_yeGd0XJ.pdf
similarity index 100%
rename from uploads/2020/10/24/1140_Lake_Huron_Crescent_SE_Calgary_128J40_JyMgeMS.pdf
rename to uploads/2020/10/24/1140_Lake_Huron_Crescent_SE_Calgary_128J40_yeGd0XJ.pdf
diff --git a/uploads/2020/10/24/1140_Lake_Huron_Crescent_SE_Calgary_128J40_zY17iDu.pdf b/uploads/2020/10/24/1140_Lake_Huron_Crescent_SE_Calgary_128J40_zY17iDu.pdf
deleted file mode 100644
index abc42da..0000000
Binary files a/uploads/2020/10/24/1140_Lake_Huron_Crescent_SE_Calgary_128J40_zY17iDu.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/1199_Lake_Huron_Crescent_SE_Calgary_127J99.pdf b/uploads/2020/10/24/1199_Lake_Huron_Crescent_SE_Calgary_127J99_mCWtvnz.pdf
similarity index 100%
rename from uploads/2020/10/24/1199_Lake_Huron_Crescent_SE_Calgary_127J99.pdf
rename to uploads/2020/10/24/1199_Lake_Huron_Crescent_SE_Calgary_127J99_mCWtvnz.pdf
diff --git a/uploads/2020/10/24/1199_Lake_Huron_Crescent_SE_Calgary_127J99_v2Kl33X.pdf b/uploads/2020/10/24/1199_Lake_Huron_Crescent_SE_Calgary_127J99_v2Kl33X.pdf
deleted file mode 100644
index 7bbe405..0000000
Binary files a/uploads/2020/10/24/1199_Lake_Huron_Crescent_SE_Calgary_127J99_v2Kl33X.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/1199_Lake_Huron_Crescent_SE_Calgary_127J99_I9qDIKu.pdf b/uploads/2020/10/24/1199_Lake_Huron_Crescent_SE_Calgary_127J99_xCvaUam.pdf
similarity index 100%
rename from uploads/2020/10/24/1199_Lake_Huron_Crescent_SE_Calgary_127J99_I9qDIKu.pdf
rename to uploads/2020/10/24/1199_Lake_Huron_Crescent_SE_Calgary_127J99_xCvaUam.pdf
diff --git a/uploads/2020/10/24/12112_Lake_Michigan_Road_SE_Calgary_123J12.pdf b/uploads/2020/10/24/12112_Lake_Michigan_Road_SE_Calgary_123J12_3stUVQp.pdf
similarity index 100%
rename from uploads/2020/10/24/12112_Lake_Michigan_Road_SE_Calgary_123J12.pdf
rename to uploads/2020/10/24/12112_Lake_Michigan_Road_SE_Calgary_123J12_3stUVQp.pdf
diff --git a/uploads/2020/10/24/12112_Lake_Michigan_Road_SE_Calgary_123J12_GksODNK.pdf b/uploads/2020/10/24/12112_Lake_Michigan_Road_SE_Calgary_123J12_JlB4wrI.pdf
similarity index 100%
rename from uploads/2020/10/24/12112_Lake_Michigan_Road_SE_Calgary_123J12_GksODNK.pdf
rename to uploads/2020/10/24/12112_Lake_Michigan_Road_SE_Calgary_123J12_JlB4wrI.pdf
diff --git a/uploads/2020/10/24/12112_Lake_Michigan_Road_SE_Calgary_123J12_hRX1JuT.pdf b/uploads/2020/10/24/12112_Lake_Michigan_Road_SE_Calgary_123J12_hRX1JuT.pdf
deleted file mode 100644
index 1be0441..0000000
Binary files a/uploads/2020/10/24/12112_Lake_Michigan_Road_SE_Calgary_123J12_hRX1JuT.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/1304_Lake_Michigan_Crescent_SE_Calgary_121J04_LPvwzF2.pdf b/uploads/2020/10/24/1304_Lake_Michigan_Crescent_SE_Calgary_121J04_LPvwzF2.pdf
deleted file mode 100644
index 32d17e2..0000000
Binary files a/uploads/2020/10/24/1304_Lake_Michigan_Crescent_SE_Calgary_121J04_LPvwzF2.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/1304_Lake_Michigan_Crescent_SE_Calgary_121J04.pdf b/uploads/2020/10/24/1304_Lake_Michigan_Crescent_SE_Calgary_121J04_OtkhoiU.pdf
similarity index 100%
rename from uploads/2020/10/24/1304_Lake_Michigan_Crescent_SE_Calgary_121J04.pdf
rename to uploads/2020/10/24/1304_Lake_Michigan_Crescent_SE_Calgary_121J04_OtkhoiU.pdf
diff --git a/uploads/2020/10/24/1304_Lake_Michigan_Crescent_SE_Calgary_121J04_S5ARAds.pdf b/uploads/2020/10/24/1304_Lake_Michigan_Crescent_SE_Calgary_121J04_S5ARAds.pdf
deleted file mode 100644
index 32d17e2..0000000
Binary files a/uploads/2020/10/24/1304_Lake_Michigan_Crescent_SE_Calgary_121J04_S5ARAds.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/1304_Lake_Michigan_Crescent_SE_Calgary_121J04_oyQFMCp.pdf b/uploads/2020/10/24/1304_Lake_Michigan_Crescent_SE_Calgary_121J04_oyQFMCp.pdf
deleted file mode 100644
index 32d17e2..0000000
Binary files a/uploads/2020/10/24/1304_Lake_Michigan_Crescent_SE_Calgary_121J04_oyQFMCp.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/1304_Lake_Michigan_Crescent_SE_Calgary_121J04_1KJBZbW.pdf b/uploads/2020/10/24/1304_Lake_Michigan_Crescent_SE_Calgary_121J04_tPQwQzZ.pdf
similarity index 100%
rename from uploads/2020/10/24/1304_Lake_Michigan_Crescent_SE_Calgary_121J04_1KJBZbW.pdf
rename to uploads/2020/10/24/1304_Lake_Michigan_Crescent_SE_Calgary_121J04_tPQwQzZ.pdf
diff --git a/uploads/2020/10/24/1332_Lake_Michigan_Crescent_SE_Calgary_121J32.pdf b/uploads/2020/10/24/1332_Lake_Michigan_Crescent_SE_Calgary_121J32_G5X0uRa.pdf
similarity index 100%
rename from uploads/2020/10/24/1332_Lake_Michigan_Crescent_SE_Calgary_121J32.pdf
rename to uploads/2020/10/24/1332_Lake_Michigan_Crescent_SE_Calgary_121J32_G5X0uRa.pdf
diff --git a/uploads/2020/10/24/1332_Lake_Michigan_Crescent_SE_Calgary_121J32_TtmqIrG.pdf b/uploads/2020/10/24/1332_Lake_Michigan_Crescent_SE_Calgary_121J32_TtmqIrG.pdf
deleted file mode 100644
index 80c8c4a..0000000
Binary files a/uploads/2020/10/24/1332_Lake_Michigan_Crescent_SE_Calgary_121J32_TtmqIrG.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/1332_Lake_Michigan_Crescent_SE_Calgary_121J32_Vo1A8pt.pdf b/uploads/2020/10/24/1332_Lake_Michigan_Crescent_SE_Calgary_121J32_Vo1A8pt.pdf
deleted file mode 100644
index 80c8c4a..0000000
Binary files a/uploads/2020/10/24/1332_Lake_Michigan_Crescent_SE_Calgary_121J32_Vo1A8pt.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/1332_Lake_Michigan_Crescent_SE_Calgary_121J32_X9jnJ9G.pdf b/uploads/2020/10/24/1332_Lake_Michigan_Crescent_SE_Calgary_121J32_X9jnJ9G.pdf
deleted file mode 100644
index 80c8c4a..0000000
Binary files a/uploads/2020/10/24/1332_Lake_Michigan_Crescent_SE_Calgary_121J32_X9jnJ9G.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/1332_Lake_Michigan_Crescent_SE_Calgary_121J32_HraACjM.pdf b/uploads/2020/10/24/1332_Lake_Michigan_Crescent_SE_Calgary_121J32_nJoc0Lk.pdf
similarity index 100%
rename from uploads/2020/10/24/1332_Lake_Michigan_Crescent_SE_Calgary_121J32_HraACjM.pdf
rename to uploads/2020/10/24/1332_Lake_Michigan_Crescent_SE_Calgary_121J32_nJoc0Lk.pdf
diff --git a/uploads/2020/10/24/1344_Lake_Michigan_Crescent_SE_Calgary_121J44_iLTS973.pdf b/uploads/2020/10/24/1344_Lake_Michigan_Crescent_SE_Calgary_121J44_iLTS973.pdf
deleted file mode 100644
index 5caca5e..0000000
Binary files a/uploads/2020/10/24/1344_Lake_Michigan_Crescent_SE_Calgary_121J44_iLTS973.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/1344_Lake_Michigan_Crescent_SE_Calgary_121J44_jRT1b1t.pdf b/uploads/2020/10/24/1344_Lake_Michigan_Crescent_SE_Calgary_121J44_jRT1b1t.pdf
deleted file mode 100644
index 5caca5e..0000000
Binary files a/uploads/2020/10/24/1344_Lake_Michigan_Crescent_SE_Calgary_121J44_jRT1b1t.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/1344_Lake_Michigan_Crescent_SE_Calgary_121J44_lc14y6n.pdf b/uploads/2020/10/24/1344_Lake_Michigan_Crescent_SE_Calgary_121J44_lc14y6n.pdf
deleted file mode 100644
index 5caca5e..0000000
Binary files a/uploads/2020/10/24/1344_Lake_Michigan_Crescent_SE_Calgary_121J44_lc14y6n.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/1344_Lake_Michigan_Crescent_SE_Calgary_121J44.pdf b/uploads/2020/10/24/1344_Lake_Michigan_Crescent_SE_Calgary_121J44_ushnLDn.pdf
similarity index 100%
rename from uploads/2020/10/24/1344_Lake_Michigan_Crescent_SE_Calgary_121J44.pdf
rename to uploads/2020/10/24/1344_Lake_Michigan_Crescent_SE_Calgary_121J44_ushnLDn.pdf
diff --git a/uploads/2020/10/24/1344_Lake_Michigan_Crescent_SE_Calgary_121J44_SYei4HV.pdf b/uploads/2020/10/24/1344_Lake_Michigan_Crescent_SE_Calgary_121J44_z3ZZIOX.pdf
similarity index 100%
rename from uploads/2020/10/24/1344_Lake_Michigan_Crescent_SE_Calgary_121J44_SYei4HV.pdf
rename to uploads/2020/10/24/1344_Lake_Michigan_Crescent_SE_Calgary_121J44_z3ZZIOX.pdf
diff --git a/uploads/2020/10/24/1344_Lake_Michigan_Crescent_SE_Calgary_121J44_zauOKhW.pdf b/uploads/2020/10/24/1344_Lake_Michigan_Crescent_SE_Calgary_121J44_zauOKhW.pdf
deleted file mode 100644
index 5caca5e..0000000
Binary files a/uploads/2020/10/24/1344_Lake_Michigan_Crescent_SE_Calgary_121J44_zauOKhW.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/1352_Lake_Michigan_Crescent_SE_Calgary_121J52.pdf b/uploads/2020/10/24/1352_Lake_Michigan_Crescent_SE_Calgary_121J52_C1t8sZ6.pdf
similarity index 100%
rename from uploads/2020/10/24/1352_Lake_Michigan_Crescent_SE_Calgary_121J52.pdf
rename to uploads/2020/10/24/1352_Lake_Michigan_Crescent_SE_Calgary_121J52_C1t8sZ6.pdf
diff --git a/uploads/2020/10/24/1352_Lake_Michigan_Crescent_SE_Calgary_121J52_KskiDjH.pdf b/uploads/2020/10/24/1352_Lake_Michigan_Crescent_SE_Calgary_121J52_KskiDjH.pdf
deleted file mode 100644
index 5e2dcb3..0000000
Binary files a/uploads/2020/10/24/1352_Lake_Michigan_Crescent_SE_Calgary_121J52_KskiDjH.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/1352_Lake_Michigan_Crescent_SE_Calgary_121J52_P6nUYwh.pdf b/uploads/2020/10/24/1352_Lake_Michigan_Crescent_SE_Calgary_121J52_P6nUYwh.pdf
deleted file mode 100644
index 5e2dcb3..0000000
Binary files a/uploads/2020/10/24/1352_Lake_Michigan_Crescent_SE_Calgary_121J52_P6nUYwh.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/1352_Lake_Michigan_Crescent_SE_Calgary_121J52_WwPD5fr.pdf b/uploads/2020/10/24/1352_Lake_Michigan_Crescent_SE_Calgary_121J52_WwPD5fr.pdf
deleted file mode 100644
index 5e2dcb3..0000000
Binary files a/uploads/2020/10/24/1352_Lake_Michigan_Crescent_SE_Calgary_121J52_WwPD5fr.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/1352_Lake_Michigan_Crescent_SE_Calgary_121J52_94AUNmV.pdf b/uploads/2020/10/24/1352_Lake_Michigan_Crescent_SE_Calgary_121J52_hDaHaYJ.pdf
similarity index 100%
rename from uploads/2020/10/24/1352_Lake_Michigan_Crescent_SE_Calgary_121J52_94AUNmV.pdf
rename to uploads/2020/10/24/1352_Lake_Michigan_Crescent_SE_Calgary_121J52_hDaHaYJ.pdf
diff --git a/uploads/2020/10/24/1419_Lake_Michigan_Crescent_SE_Calgary_129J19.pdf b/uploads/2020/10/24/1419_Lake_Michigan_Crescent_SE_Calgary_129J19_FTwxoxQ.pdf
similarity index 100%
rename from uploads/2020/10/24/1419_Lake_Michigan_Crescent_SE_Calgary_129J19.pdf
rename to uploads/2020/10/24/1419_Lake_Michigan_Crescent_SE_Calgary_129J19_FTwxoxQ.pdf
diff --git a/uploads/2020/10/24/1419_Lake_Michigan_Crescent_SE_Calgary_129J19_WkjDMjs.pdf b/uploads/2020/10/24/1419_Lake_Michigan_Crescent_SE_Calgary_129J19_WkjDMjs.pdf
deleted file mode 100644
index 9c8c1b1..0000000
Binary files a/uploads/2020/10/24/1419_Lake_Michigan_Crescent_SE_Calgary_129J19_WkjDMjs.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/1419_Lake_Michigan_Crescent_SE_Calgary_129J19_8plLlId.pdf b/uploads/2020/10/24/1419_Lake_Michigan_Crescent_SE_Calgary_129J19_aVONIVx.pdf
similarity index 100%
rename from uploads/2020/10/24/1419_Lake_Michigan_Crescent_SE_Calgary_129J19_8plLlId.pdf
rename to uploads/2020/10/24/1419_Lake_Michigan_Crescent_SE_Calgary_129J19_aVONIVx.pdf
diff --git a/uploads/2020/10/24/1419_Lake_Michigan_Crescent_SE_Calgary_129J19_q3bKIPO.pdf b/uploads/2020/10/24/1419_Lake_Michigan_Crescent_SE_Calgary_129J19_q3bKIPO.pdf
deleted file mode 100644
index 9c8c1b1..0000000
Binary files a/uploads/2020/10/24/1419_Lake_Michigan_Crescent_SE_Calgary_129J19_q3bKIPO.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/1432_Lake_Michigan_Crescent_SE_Calgary_121J32.pdf b/uploads/2020/10/24/1432_Lake_Michigan_Crescent_SE_Calgary_121J32_a08rnKX.pdf
similarity index 100%
rename from uploads/2020/10/24/1432_Lake_Michigan_Crescent_SE_Calgary_121J32.pdf
rename to uploads/2020/10/24/1432_Lake_Michigan_Crescent_SE_Calgary_121J32_a08rnKX.pdf
diff --git a/uploads/2020/10/24/1432_Lake_Michigan_Crescent_SE_Calgary_121J32_iNCbUbF.pdf b/uploads/2020/10/24/1432_Lake_Michigan_Crescent_SE_Calgary_121J32_iNCbUbF.pdf
deleted file mode 100644
index 516d585..0000000
Binary files a/uploads/2020/10/24/1432_Lake_Michigan_Crescent_SE_Calgary_121J32_iNCbUbF.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/1432_Lake_Michigan_Crescent_SE_Calgary_121J32_idDRmJm.pdf b/uploads/2020/10/24/1432_Lake_Michigan_Crescent_SE_Calgary_121J32_idDRmJm.pdf
deleted file mode 100644
index 516d585..0000000
Binary files a/uploads/2020/10/24/1432_Lake_Michigan_Crescent_SE_Calgary_121J32_idDRmJm.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/1432_Lake_Michigan_Crescent_SE_Calgary_121J32_MVtfCS0.pdf b/uploads/2020/10/24/1432_Lake_Michigan_Crescent_SE_Calgary_121J32_n6oidFS.pdf
similarity index 100%
rename from uploads/2020/10/24/1432_Lake_Michigan_Crescent_SE_Calgary_121J32_MVtfCS0.pdf
rename to uploads/2020/10/24/1432_Lake_Michigan_Crescent_SE_Calgary_121J32_n6oidFS.pdf
diff --git a/uploads/2020/10/24/1434_Lake_Michigan_Drive_SE_Calgary_122J34.pdf b/uploads/2020/10/24/1434_Lake_Michigan_Drive_SE_Calgary_122J34_9CyzvYn.pdf
similarity index 100%
rename from uploads/2020/10/24/1434_Lake_Michigan_Drive_SE_Calgary_122J34.pdf
rename to uploads/2020/10/24/1434_Lake_Michigan_Drive_SE_Calgary_122J34_9CyzvYn.pdf
diff --git a/uploads/2020/10/24/1434_Lake_Michigan_Drive_SE_Calgary_122J34_LWmQtfd.pdf b/uploads/2020/10/24/1434_Lake_Michigan_Drive_SE_Calgary_122J34_LWmQtfd.pdf
deleted file mode 100644
index 9b366a7..0000000
Binary files a/uploads/2020/10/24/1434_Lake_Michigan_Drive_SE_Calgary_122J34_LWmQtfd.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/1434_Lake_Michigan_Drive_SE_Calgary_122J34_RtLeAl9.pdf b/uploads/2020/10/24/1434_Lake_Michigan_Drive_SE_Calgary_122J34_RtLeAl9.pdf
deleted file mode 100644
index 9b366a7..0000000
Binary files a/uploads/2020/10/24/1434_Lake_Michigan_Drive_SE_Calgary_122J34_RtLeAl9.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/1434_Lake_Michigan_Drive_SE_Calgary_122J34_FMIYduL.pdf b/uploads/2020/10/24/1434_Lake_Michigan_Drive_SE_Calgary_122J34_koBQiVX.pdf
similarity index 100%
rename from uploads/2020/10/24/1434_Lake_Michigan_Drive_SE_Calgary_122J34_FMIYduL.pdf
rename to uploads/2020/10/24/1434_Lake_Michigan_Drive_SE_Calgary_122J34_koBQiVX.pdf
diff --git a/uploads/2020/10/24/1440_Lake_Michigan_Crescent_SE_Calgary_129J40.pdf b/uploads/2020/10/24/1440_Lake_Michigan_Crescent_SE_Calgary_129J40_ENSAK3q.pdf
similarity index 100%
rename from uploads/2020/10/24/1440_Lake_Michigan_Crescent_SE_Calgary_129J40.pdf
rename to uploads/2020/10/24/1440_Lake_Michigan_Crescent_SE_Calgary_129J40_ENSAK3q.pdf
diff --git a/uploads/2020/10/24/1440_Lake_Michigan_Crescent_SE_Calgary_129J40_ThOLVfi.pdf b/uploads/2020/10/24/1440_Lake_Michigan_Crescent_SE_Calgary_129J40_ThOLVfi.pdf
deleted file mode 100644
index 7e8deb8..0000000
Binary files a/uploads/2020/10/24/1440_Lake_Michigan_Crescent_SE_Calgary_129J40_ThOLVfi.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/1440_Lake_Michigan_Crescent_SE_Calgary_129J40_j7t3N6I.pdf b/uploads/2020/10/24/1440_Lake_Michigan_Crescent_SE_Calgary_129J40_j7t3N6I.pdf
deleted file mode 100644
index 7e8deb8..0000000
Binary files a/uploads/2020/10/24/1440_Lake_Michigan_Crescent_SE_Calgary_129J40_j7t3N6I.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/1440_Lake_Michigan_Crescent_SE_Calgary_129J40_6gwAYZm.pdf b/uploads/2020/10/24/1440_Lake_Michigan_Crescent_SE_Calgary_129J40_qPEiNiA.pdf
similarity index 100%
rename from uploads/2020/10/24/1440_Lake_Michigan_Crescent_SE_Calgary_129J40_6gwAYZm.pdf
rename to uploads/2020/10/24/1440_Lake_Michigan_Crescent_SE_Calgary_129J40_qPEiNiA.pdf
diff --git a/uploads/2020/10/24/1447_Lake_Michigan_Crescent_SE_Calgary_129J47.pdf b/uploads/2020/10/24/1447_Lake_Michigan_Crescent_SE_Calgary_129J47_QwS2pKL.pdf
similarity index 100%
rename from uploads/2020/10/24/1447_Lake_Michigan_Crescent_SE_Calgary_129J47.pdf
rename to uploads/2020/10/24/1447_Lake_Michigan_Crescent_SE_Calgary_129J47_QwS2pKL.pdf
diff --git a/uploads/2020/10/24/1447_Lake_Michigan_Crescent_SE_Calgary_129J47_KtRZJ56.pdf b/uploads/2020/10/24/1447_Lake_Michigan_Crescent_SE_Calgary_129J47_gWT5fs5.pdf
similarity index 100%
rename from uploads/2020/10/24/1447_Lake_Michigan_Crescent_SE_Calgary_129J47_KtRZJ56.pdf
rename to uploads/2020/10/24/1447_Lake_Michigan_Crescent_SE_Calgary_129J47_gWT5fs5.pdf
diff --git a/uploads/2020/10/24/1447_Lake_Michigan_Crescent_SE_Calgary_129J47_hpYrTwy.pdf b/uploads/2020/10/24/1447_Lake_Michigan_Crescent_SE_Calgary_129J47_hpYrTwy.pdf
deleted file mode 100644
index 5f4a83d..0000000
Binary files a/uploads/2020/10/24/1447_Lake_Michigan_Crescent_SE_Calgary_129J47_hpYrTwy.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/1480_Lake_Michigan_Crescent_SE_Calgary_121J80_AmbvHGm.pdf b/uploads/2020/10/24/1480_Lake_Michigan_Crescent_SE_Calgary_121J80_AmbvHGm.pdf
deleted file mode 100644
index 59dc18e..0000000
Binary files a/uploads/2020/10/24/1480_Lake_Michigan_Crescent_SE_Calgary_121J80_AmbvHGm.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/1480_Lake_Michigan_Crescent_SE_Calgary_121J80.pdf b/uploads/2020/10/24/1480_Lake_Michigan_Crescent_SE_Calgary_121J80_DUBf1GB.pdf
similarity index 100%
rename from uploads/2020/10/24/1480_Lake_Michigan_Crescent_SE_Calgary_121J80.pdf
rename to uploads/2020/10/24/1480_Lake_Michigan_Crescent_SE_Calgary_121J80_DUBf1GB.pdf
diff --git a/uploads/2020/10/24/1480_Lake_Michigan_Crescent_SE_Calgary_121J80_04AJRUk.pdf b/uploads/2020/10/24/1480_Lake_Michigan_Crescent_SE_Calgary_121J80_bJfGC1H.pdf
similarity index 100%
rename from uploads/2020/10/24/1480_Lake_Michigan_Crescent_SE_Calgary_121J80_04AJRUk.pdf
rename to uploads/2020/10/24/1480_Lake_Michigan_Crescent_SE_Calgary_121J80_bJfGC1H.pdf
diff --git a/uploads/2020/10/24/16_Lake_Huron_Place_SE_Calgary_129J16.pdf b/uploads/2020/10/24/16_Lake_Huron_Place_SE_Calgary_129J16_NmTHlvL.pdf
similarity index 100%
rename from uploads/2020/10/24/16_Lake_Huron_Place_SE_Calgary_129J16.pdf
rename to uploads/2020/10/24/16_Lake_Huron_Place_SE_Calgary_129J16_NmTHlvL.pdf
diff --git a/uploads/2020/10/24/16_Lake_Huron_Place_SE_Calgary_129J16_Ep3FmVZ.pdf b/uploads/2020/10/24/16_Lake_Huron_Place_SE_Calgary_129J16_WR7lDv0.pdf
similarity index 100%
rename from uploads/2020/10/24/16_Lake_Huron_Place_SE_Calgary_129J16_Ep3FmVZ.pdf
rename to uploads/2020/10/24/16_Lake_Huron_Place_SE_Calgary_129J16_WR7lDv0.pdf
diff --git a/uploads/2020/10/24/16_Lake_Huron_Place_SE_Calgary_129J16_oeLiGGp.pdf b/uploads/2020/10/24/16_Lake_Huron_Place_SE_Calgary_129J16_oeLiGGp.pdf
deleted file mode 100644
index 1c64cb8..0000000
Binary files a/uploads/2020/10/24/16_Lake_Huron_Place_SE_Calgary_129J16_oeLiGGp.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/18_Lake_Huron_Place_SE_Calgary_129J18.pdf b/uploads/2020/10/24/18_Lake_Huron_Place_SE_Calgary_129J18_SsViPe6.pdf
similarity index 100%
rename from uploads/2020/10/24/18_Lake_Huron_Place_SE_Calgary_129J18.pdf
rename to uploads/2020/10/24/18_Lake_Huron_Place_SE_Calgary_129J18_SsViPe6.pdf
diff --git a/uploads/2020/10/24/18_Lake_Huron_Place_SE_Calgary_129J18_agglzQy.pdf b/uploads/2020/10/24/18_Lake_Huron_Place_SE_Calgary_129J18_agglzQy.pdf
deleted file mode 100644
index 46d85c1..0000000
Binary files a/uploads/2020/10/24/18_Lake_Huron_Place_SE_Calgary_129J18_agglzQy.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/18_Lake_Huron_Place_SE_Calgary_129J18_pWnmbSu.pdf b/uploads/2020/10/24/18_Lake_Huron_Place_SE_Calgary_129J18_pWnmbSu.pdf
deleted file mode 100644
index 46d85c1..0000000
Binary files a/uploads/2020/10/24/18_Lake_Huron_Place_SE_Calgary_129J18_pWnmbSu.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/18_Lake_Huron_Place_SE_Calgary_129J18_pwJS6q5.pdf b/uploads/2020/10/24/18_Lake_Huron_Place_SE_Calgary_129J18_pwJS6q5.pdf
deleted file mode 100644
index 46d85c1..0000000
Binary files a/uploads/2020/10/24/18_Lake_Huron_Place_SE_Calgary_129J18_pwJS6q5.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/18_Lake_Huron_Place_SE_Calgary_129J18_SOt1bxK.pdf b/uploads/2020/10/24/18_Lake_Huron_Place_SE_Calgary_129J18_vvWy95y.pdf
similarity index 100%
rename from uploads/2020/10/24/18_Lake_Huron_Place_SE_Calgary_129J18_SOt1bxK.pdf
rename to uploads/2020/10/24/18_Lake_Huron_Place_SE_Calgary_129J18_vvWy95y.pdf
diff --git a/uploads/2020/10/24/18_Lake_Huron_Place_SE_Calgary_XYZ.pdf b/uploads/2020/10/24/18_Lake_Huron_Place_SE_Calgary_XYZ.pdf
deleted file mode 100644
index 7880378..0000000
Binary files a/uploads/2020/10/24/18_Lake_Huron_Place_SE_Calgary_XYZ.pdf and /dev/null differ
diff --git a/uploads/2020/10/15/CPRG311_Assignment1_Battleship.pdf b/uploads/2020/10/24/18_Lake_Huron_Place_SE_Calgary_XYZ_ZvR0OxD.pdf
similarity index 100%
rename from uploads/2020/10/15/CPRG311_Assignment1_Battleship.pdf
rename to uploads/2020/10/24/18_Lake_Huron_Place_SE_Calgary_XYZ_ZvR0OxD.pdf
diff --git a/uploads/2020/10/24/48_Lake_Huron_Place_SE_Calgary_429J48.pdf b/uploads/2020/10/24/48_Lake_Huron_Place_SE_Calgary_429J48_H0mgj73.pdf
similarity index 100%
rename from uploads/2020/10/24/48_Lake_Huron_Place_SE_Calgary_429J48.pdf
rename to uploads/2020/10/24/48_Lake_Huron_Place_SE_Calgary_429J48_H0mgj73.pdf
diff --git a/uploads/2020/10/24/48_Lake_Huron_Place_SE_Calgary_429J48_AXCnlH3.pdf b/uploads/2020/10/24/48_Lake_Huron_Place_SE_Calgary_429J48_uknJ01x.pdf
similarity index 100%
rename from uploads/2020/10/24/48_Lake_Huron_Place_SE_Calgary_429J48_AXCnlH3.pdf
rename to uploads/2020/10/24/48_Lake_Huron_Place_SE_Calgary_429J48_uknJ01x.pdf
diff --git a/uploads/2020/10/24/48_Lake_Huron_Place_SE_Calgary_429J48_vgMM0q3.pdf b/uploads/2020/10/24/48_Lake_Huron_Place_SE_Calgary_429J48_vgMM0q3.pdf
deleted file mode 100644
index a907ec8..0000000
Binary files a/uploads/2020/10/24/48_Lake_Huron_Place_SE_Calgary_429J48_vgMM0q3.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/54_Lake_Huron_Place_SE_Calgary_529J54.pdf b/uploads/2020/10/24/54_Lake_Huron_Place_SE_Calgary_529J54_Gba7GLK.pdf
similarity index 100%
rename from uploads/2020/10/24/54_Lake_Huron_Place_SE_Calgary_529J54.pdf
rename to uploads/2020/10/24/54_Lake_Huron_Place_SE_Calgary_529J54_Gba7GLK.pdf
diff --git a/uploads/2020/10/24/54_Lake_Huron_Place_SE_Calgary_529J54_rJVfht5.pdf b/uploads/2020/10/24/54_Lake_Huron_Place_SE_Calgary_529J54_Pm58eGr.pdf
similarity index 100%
rename from uploads/2020/10/24/54_Lake_Huron_Place_SE_Calgary_529J54_rJVfht5.pdf
rename to uploads/2020/10/24/54_Lake_Huron_Place_SE_Calgary_529J54_Pm58eGr.pdf
diff --git a/uploads/2020/10/24/54_Lake_Huron_Place_SE_Calgary_529J54_yZEpY7I.pdf b/uploads/2020/10/24/54_Lake_Huron_Place_SE_Calgary_529J54_yZEpY7I.pdf
deleted file mode 100644
index 75fbeda..0000000
Binary files a/uploads/2020/10/24/54_Lake_Huron_Place_SE_Calgary_529J54_yZEpY7I.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/72_Lake_Huron_Place_SE_Calgary_729J72.pdf b/uploads/2020/10/24/72_Lake_Huron_Place_SE_Calgary_729J72_1EglVm0.pdf
similarity index 100%
rename from uploads/2020/10/24/72_Lake_Huron_Place_SE_Calgary_729J72.pdf
rename to uploads/2020/10/24/72_Lake_Huron_Place_SE_Calgary_729J72_1EglVm0.pdf
diff --git a/uploads/2020/10/24/72_Lake_Huron_Place_SE_Calgary_729J72_YH7WUEm.pdf b/uploads/2020/10/24/72_Lake_Huron_Place_SE_Calgary_729J72_MjcFBRy.pdf
similarity index 100%
rename from uploads/2020/10/24/72_Lake_Huron_Place_SE_Calgary_729J72_YH7WUEm.pdf
rename to uploads/2020/10/24/72_Lake_Huron_Place_SE_Calgary_729J72_MjcFBRy.pdf
diff --git a/uploads/2020/10/24/72_Lake_Huron_Place_SE_Calgary_729J72_tTsks1J.pdf b/uploads/2020/10/24/72_Lake_Huron_Place_SE_Calgary_729J72_tTsks1J.pdf
deleted file mode 100644
index a973617..0000000
Binary files a/uploads/2020/10/24/72_Lake_Huron_Place_SE_Calgary_729J72_tTsks1J.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/74_Lake_Huron_Place_SE_Calgary_729J74.pdf b/uploads/2020/10/24/74_Lake_Huron_Place_SE_Calgary_729J74_0pM04lI.pdf
similarity index 100%
rename from uploads/2020/10/24/74_Lake_Huron_Place_SE_Calgary_729J74.pdf
rename to uploads/2020/10/24/74_Lake_Huron_Place_SE_Calgary_729J74_0pM04lI.pdf
diff --git a/uploads/2020/10/24/74_Lake_Huron_Place_SE_Calgary_729J74_C4EvYEc.pdf b/uploads/2020/10/24/74_Lake_Huron_Place_SE_Calgary_729J74_C4EvYEc.pdf
deleted file mode 100644
index 61dab31..0000000
Binary files a/uploads/2020/10/24/74_Lake_Huron_Place_SE_Calgary_729J74_C4EvYEc.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/74_Lake_Huron_Place_SE_Calgary_729J74_08PxQd6.pdf b/uploads/2020/10/24/74_Lake_Huron_Place_SE_Calgary_729J74_MWw0HcC.pdf
similarity index 100%
rename from uploads/2020/10/24/74_Lake_Huron_Place_SE_Calgary_729J74_08PxQd6.pdf
rename to uploads/2020/10/24/74_Lake_Huron_Place_SE_Calgary_729J74_MWw0HcC.pdf
diff --git a/uploads/2020/10/24/CPRG311_Assignment1_Battleship_1.pdf b/uploads/2020/10/24/CPRG311_Assignment1_Battleship_1.pdf
deleted file mode 100644
index 7880378..0000000
Binary files a/uploads/2020/10/24/CPRG311_Assignment1_Battleship_1.pdf and /dev/null differ
diff --git a/uploads/2020/10/24/CPRG311_Assignment1_Battleship_1_lTgCfdi.pdf b/uploads/2020/10/24/CPRG311_Assignment1_Battleship_1_lTgCfdi.pdf
deleted file mode 100644
index 7880378..0000000
Binary files a/uploads/2020/10/24/CPRG311_Assignment1_Battleship_1_lTgCfdi.pdf and /dev/null differ