Merge remote-tracking branch 'origin/master' into test-report

.gitignore

@@ -2,7 +2,6 @@
 # Edit at https://www.gitignore.io/?templates=linux,macos,python,django,windows,pycharm,intellij,visualstudio
 
 ### Django ###
-*.env
 *.log
 *.pot
 *.pyc
@@ -101,7 +100,6 @@ celerybeat-schedule
 *.sage.py
 
 # Environments
-.env
 .venv
 env/
 venv/

back/.env

@@ -1,4 +0,0 @@
-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

back/backend/templates/backend/email.html

@@ -12,7 +12,11 @@
             {% for field in section.fields %}
                 <tr>
                     <td>{{field.label}}</td>
-                    <td>{{field.value|default:""}}</td>
+		    <td>{% if field.field_type == 'boolean' %}
+			    {{field.value|yesno:"yes,no"}}
+			{% else %}
+			    {{field.value|default:" "}}
+			{% endif %}</td>
                 </tr>
             {% endfor %}
             {% for rule in section.rule_violations %}

back/backend/templates/backend/email.txt

@@ -5,12 +5,12 @@
 
 Title: {{title}}
 Reference #: {{reference_number}}
-{% for section in sections %}
+{% for section in sections %}{% if section.completed %}
     {{section.title}}(SID: {{section.id}})
     {% for field in section.fields %}
-        {{field.label}}:  {{field.value|default:"empty"}}
+        {{field.label}}:  {% if field.field_type == 'boolean' %}{{field.value|yesno:"yes,no"}}{% else %}{{field.value|default:" "}}{% endif %}
     {% endfor %}
     {% for rule in section.rule_violations %}
         [RULE] {{rule.label}}:  {{rule.rule_break_text}}
     {% endfor %}
-{% endfor %}    
+{% endif %}{% endfor %}    

back/backend/views.py

@@ -415,7 +415,7 @@ def send_report_to_admin(request, report_pk, status):
     message = None
     if params['reference_number'] == '':
         message = EmailMultiAlternatives(
-            "[Reimbursinator {}] ({})".format(params['title'], status),
+            "[Reimbursinator] {} ({})".format(params['title'], status),
             msg_plain,
             from_email,
             [to_email],