From c94bede4befbbecfecc406decd9175e1cfb96576 Mon Sep 17 00:00:00 2001 From: kououken Date: Fri, 1 Mar 2019 12:26:43 -0800 Subject: [PATCH] Added request tracker support as a 'reference_number' field in the report model. --- .../0009_report_reference_number.py | 18 +++++++++++++++++ back/backend/models.py | 1 + back/backend/templates/backend/email.html | 1 + back/backend/templates/backend/email.txt | 1 + back/backend/views.py | 19 +++++++++++++++--- back/db.sqlite3 | Bin 197632 -> 197632 bytes 6 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 back/backend/migrations/0009_report_reference_number.py 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 e1d41596d7922b7a3494ee4a62a36f8929456c47..458fa7cd351163fc89fc149c64d3a57d404d7294 100644 GIT binary patch delta 671 zcmZqZ;A!aKnIJ7#!@$6B5QtX*aRLypov35XQ^TP9jGGn66JXx3G24TgDXMz&R^}iU zX)dO7%+Hx?nf;klnOT`vGOb{G%6yqwmDz^bX0xF{BGcq%u0%FvIdNuZj_DI!8Koz) za+`@T3o0;cawH`tXQ$?+#22L&`(3r8&ezNOSQ#P=A_38DojAE06rb@#f#=Vlfa7M9H%OMdR>W!%lc#GuQ-pv#=ZcxSR9hx~Tk494}0T+Pfi?Bbf5 zjIEB7Z%$QY)C3zgS#Vm-WUlFole?xhs28QCr52^;C8x&cmF6a;7AYx|B^D)TBo=8H z8)+)|`G+X@h5GntPEX2aT*Se|_>6(6it*WILylXF%#DJzlkKKXBy5Qqah7cVpUucB z!^g_BpMm)xa}%=@Gc(iv&4LV6{wLrYx)V_gG7 z1tSA1LklYdQ#}I{a}x`*cIIxz?abXwEP{;j+d1Yi1v4^gPmh_)q|O-wOl;aftiHWx IE>lSw07j|I-T(jq delta 810 zcmZuvOK4L;6rDRawK0jrXxnI0YZ`wIHA-t!KPjTtVpGMUF8t!_OW&l8tx0`(q7;Qb zKUh$(@u?SDi}<7MLaK%me~2QuRM15Q1yN9O=La`#bchID2y+(aa?a(<%<1iO_4c{? zeV!i1*b|8n2~}b=vv`@ShlM^l3nX*n`0dUn{R*Q2z+_TO* zE4`(l9yB_XZlUi_q|=F1vesMT!wnW2C+Fno%O;RQrkgH>(!drV(dp?7-~ zm}?VBO&pG?)~~x0*5wNoXnN}DO9C>EW4j`S-e3?;r0A1?3aBF33nf$@ha>bT4o9;N z`ei3uKaATpIa-@3a~~9|?1m>7%0MmH%8&b+a^f5e0F>Xk4v*)_AWkS`_z?SX9e>A% z`8Hkw6EFmmlX=%#a~XvOp>B4Q8aITl7TB-9T^spUjTJk*LuMGSxfRfPU2?QB~A#XSgC$}4FtV{fB zNm{fSvI%+9|7OAbZ@MPStm>a(x~ah&x+cI&A2g_^SUX%Dwsk?7%ZAAC2_D0Bh*?kN o4}J@Kn+IBR_Dg&lz%JS|#1~DKnb;oru3GNQ5I5p~0MV)UzW@LL