From b1b21c84c73d296f5a16cabcf6d795f7dad10165 Mon Sep 17 00:00:00 2001
From: kououken <kououken@gmail.com>
Date: Fri, 1 Mar 2019 11:38:12 -0800
Subject: [PATCH] Added 'approved' field to sections. Added env to gitignore.

---
 .gitignore                                    |   1 +
 back/.env                                     |   8 ++++----
 .../migrations/0009_section_approved.py       |  18 ++++++++++++++++++
 back/backend/models.py                        |   1 +
 back/backend/templates/backend/email.html     |   2 +-
 back/backend/templates/backend/email.txt      |   2 +-
 back/backend/views.py                         |   4 ++--
 back/db.sqlite3                               | Bin 197632 -> 197632 bytes
 8 files changed, 28 insertions(+), 8 deletions(-)
 create mode 100644 back/backend/migrations/0009_section_approved.py

diff --git a/.gitignore b/.gitignore
index d25063b..40497c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 # Edit at https://www.gitignore.io/?templates=linux,macos,python,django,windows,pycharm,intellij,visualstudio
 
 ### Django ###
+*.env
 *.log
 *.pot
 *.pyc
diff --git a/back/.env b/back/.env
index b47f7a4..c75a73f 100644
--- a/back/.env
+++ b/back/.env
@@ -1,4 +1,4 @@
-EMAIL_HOST_USER=accountemail@yourmail.com
-EMAIL_HOST_PASSWORD=accountpasswordhere
-SUBMIT_REPORT_DESTINATION_EMAIL=to-address@yourmail.com
-SUBMIT_REPORT_FROM_EMAIL=from-address@yourmail.com
+EMAIL_HOST_USER=reimbursinator@gmail.com
+EMAIL_HOST_PASSWORD=Frank12345
+SUBMIT_REPORT_DESTINATION_EMAIL=kououken@gmail.com
+SUBMIT_REPORT_FROM_EMAIL=admin@reimbursinator.com
diff --git a/back/backend/migrations/0009_section_approved.py b/back/backend/migrations/0009_section_approved.py
new file mode 100644
index 0000000..2621ee0
--- /dev/null
+++ b/back/backend/migrations/0009_section_approved.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.1.7 on 2019-03-01 19:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('backend', '0008_auto_20190214_1421'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='section',
+            name='approved',
+            field=models.BooleanField(default=False),
+        ),
+    ]
diff --git a/back/backend/models.py b/back/backend/models.py
index 69db8ee..cc12b3a 100644
--- a/back/backend/models.py
+++ b/back/backend/models.py
@@ -33,6 +33,7 @@ class Section(models.Model):
     title = models.CharField(max_length=256)
     html_description = models.TextField()
     number = models.IntegerField()
+    approved = models.BooleanField(default=False)
 
     def __str__(self):
         """
diff --git a/back/backend/templates/backend/email.html b/back/backend/templates/backend/email.html
index b985302..7137071 100644
--- a/back/backend/templates/backend/email.html
+++ b/back/backend/templates/backend/email.html
@@ -6,7 +6,7 @@
         <h1>Title: {{ title }}</h1>
         {% for section in sections %}
 	{% if section.completed %}
-            <h2>{{section.title}}</h2>
+	<h2>{{section.title}} (SID: {{section.id}})</h2>
             <table border="1">
             {% for field in section.fields %}
                 <tr>
diff --git a/back/backend/templates/backend/email.txt b/back/backend/templates/backend/email.txt
index 43f9df7..2411e0e 100644
--- a/back/backend/templates/backend/email.txt
+++ b/back/backend/templates/backend/email.txt
@@ -5,7 +5,7 @@
 
 Title: {{title}}
 {% for section in sections %}
-    {{section.title}}
+    {{section.title}}(SID: {{section.id}})
     {% for field in section.fields %}
         {{field.label}}:  {{field.value|default:"empty"}}
     {% endfor %}
diff --git a/back/backend/views.py b/back/backend/views.py
index 1d55aec..a99d999 100644
--- a/back/backend/views.py
+++ b/back/backend/views.py
@@ -51,7 +51,7 @@ def get_sections(r_id):
         # append the fields for corresponding section
         data.update(get_fields(i.id))
         # process rules from the policy file if the section is completed
-        if i.completed:
+        if i.completed and not i.approved:
             rules = pol.sections[index].rules
             for rule in rules:
                 try:
@@ -338,7 +338,7 @@ def section(request, report_pk, section_pk):
     }
     data.update(get_fields(s.id))
     # process rules from the policy file if the section is completed
-    if s.completed:
+    if s.completed and not s.approved:
         rules = pol.sections[s.number].rules
         for rule in rules:
             try:
diff --git a/back/db.sqlite3 b/back/db.sqlite3
index e1d41596d7922b7a3494ee4a62a36f8929456c47..d5c6c8b12e49f18828982266bd3b34288ffb3c7d 100644
GIT binary patch
delta 3313
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
aSlhyyZ;pP(`Bu)J=UeIY_g*2Pfqw)1+i1`L

delta 2358
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