diff --git a/back/backend/migrations/0009_report_reference_number.py b/back/backend/migrations/0009_report_reference_number.py new file mode 100644 index 0000000..c2d275a --- /dev/null +++ b/back/backend/migrations/0009_report_reference_number.py @@ -0,0 +1,18 @@ +# Generated by Django 2.1.7 on 2019-03-01 20:17 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('backend', '0008_auto_20190214_1421'), + ] + + operations = [ + migrations.AddField( + model_name='report', + name='reference_number', + field=models.CharField(default='', max_length=32), + ), + ] diff --git a/back/backend/models.py b/back/backend/models.py index 69db8ee..952a553 100644 --- a/back/backend/models.py +++ b/back/backend/models.py @@ -13,6 +13,7 @@ class Report(models.Model): date_created = models.DateTimeField('date created', default=datetime.date.today) date_submitted = models.DateTimeField('date submitted', default=datetime.date.today) submitted = models.BooleanField(default=False) + reference_number = models.CharField(max_length=32, default='') def __str__(self): """ diff --git a/back/backend/templates/backend/email.html b/back/backend/templates/backend/email.html index b985302..44f9358 100644 --- a/back/backend/templates/backend/email.html +++ b/back/backend/templates/backend/email.html @@ -4,6 +4,7 @@

Title: {{ title }}

+

Reference #: {{ reference_number }}

{% for section in sections %} {% if section.completed %}

{{section.title}}

diff --git a/back/backend/templates/backend/email.txt b/back/backend/templates/backend/email.txt index 43f9df7..9f90da2 100644 --- a/back/backend/templates/backend/email.txt +++ b/back/backend/templates/backend/email.txt @@ -4,6 +4,7 @@ *** Title: {{title}} +Reference #: {{reference_number}} {% for section in sections %} {{section.title}} {% for field in section.fields %} diff --git a/back/backend/views.py b/back/backend/views.py index 1d55aec..dc5a866 100644 --- a/back/backend/views.py +++ b/back/backend/views.py @@ -23,6 +23,7 @@ def get_report(report_pk): "date_created": i.date_created, "submitted": i.submitted, "date_submitted": i.date_submitted, + "reference_number": i.reference_number, } # append the sections for each report data.update(get_sections(i.id)) @@ -120,9 +121,20 @@ def report(request): "title": "Report Title Here" } """ - # Create the report - report = Report.objects.create(user_id=request.user, title=request.data['title'], - date_created=datetime.date.today()) + # Create the report, with reference number if available + if 'reference_number' in request.data: + report = Report.objects.create( + user_id=request.user, + title=request.data['title'], + date_created=datetime.date.today(), + reference_number=request.data['reference_number'] + ) + else: + report = Report.objects.create( + user_id=request.user, + title=request.data['title'], + date_created=datetime.date.today() + ) report.save() # Create the sections @@ -161,6 +173,7 @@ def reports(request): "date_created": i.date_created, "submitted": i.submitted, "date_submitted": i.date_submitted, + "reference_number": i.reference_number, } # append the sections for each report report_set["reports"].append(data.copy()) diff --git a/back/db.sqlite3 b/back/db.sqlite3 index e1d4159..458fa7c 100644 Binary files a/back/db.sqlite3 and b/back/db.sqlite3 differ