fixed test

app/main/views/send.py

@@ -506,9 +506,14 @@ def _check_messages(service_id, template_id, upload_id, preview_row):
         email_reply_to=email_reply_to,
         sms_sender=sms_sender,
     )
+    simplifed_template = get_template(
+        db_template,
+        current_service,
+        show_recipient=False,
+    )
     recipients = RecipientCSV(
         contents,
-        template=template,
+        template=template or simplifed_template,
         max_initial_rows_shown=50,
         max_errors_shown=50,
         guestlist=itertools.chain.from_iterable(
@@ -547,6 +552,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row):
 
     if preview_row < len(recipients) + 2:
         template.values = recipients[preview_row - 2].recipient_and_personalisation
+        simplifed_template.values = recipients[preview_row - 2].recipient_and_personalisation
     elif preview_row > 2:
         abort(404)
 
@@ -574,7 +580,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row):
             service_id, template.id, db_template["version"], original_file_name
         ),
         template_id=template_id,
-        db_template=db_template
+        simplifed_template=simplifed_template,
     )
 
 
@@ -651,14 +657,10 @@ def preview_job(service_id, template_id, upload_id, row_index=2):
     if data["errors"]:
         return render_template("views/check/column-errors.html", **data)
 
-    simplifed_template = get_template(
-        data.get('db_template', {}),
-        current_service,
-    )
-
     return render_template(
-        "views/check/preview.html", scheduled_for=session["scheduled_for"], **data,
+        "views/check/preview.html",
-        simplifed_template=simplifed_template
+        scheduled_for=session["scheduled_for"],
+        **data,
     )
 
 
@@ -841,7 +843,10 @@ def _check_notification(service_id, template_id, exception=None):
         email_reply_to=email_reply_to,
         sms_sender=sms_sender,
     )
-
+    simplifed_template = get_template(
+        db_template,
+        current_service,
+    )
     placeholders = fields_to_fill_in(template)
 
     back_link = get_back_link(service_id, template, len(placeholders), placeholders)
@@ -867,6 +872,7 @@ def _check_notification(service_id, template_id, exception=None):
         choose_time_form=choose_time_form,
         db_template=db_template,
         **(get_template_error_dict(exception) if exception else {}),
+        simplifed_template=simplifed_template
     )
 
 
@@ -913,18 +919,11 @@ def preview_notification(service_id, template_id):
         )
 
     session["scheduled_for"] = request.args.get("scheduled_for", "")
-    data = _check_notification(service_id, template_id)
-    db_template = data.get('db_template', None)
-    simplifed_template = get_template(
-        db_template,
-        current_service,
-    )
 
     return render_template(
         "views/notifications/preview.html",
-        **data,
+        **_check_notification(service_id, template_id),
         scheduled_for=session["scheduled_for"],
-        simplifed_template=simplifed_template,
         recipient=recipient,
     )
 

app/templates/views/check/preview.html

@@ -29,50 +29,49 @@
 
   <h2 id="{{ file_contents_header_id }}">Message</h2>
   <div class="preview-message"> {{ simplifed_template|string }}</div>
-  <div class="bottom-gutter-3-2">
+  {% if not request.args.from_test %}
-    <form method="post" enctype="multipart/form-data" action="{{url_for('main.start_job', service_id=current_service.id, upload_id=upload_id)}}" class='page-footer'>
+  <h2>Recipients list</h2>
-      <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
+  <div>
-      {% if not request.args.from_test %}
+    <ul class="usa-icon-list">
-      <h2 class="font-body-lg">Recipients list</h2>
+      <li class="usa-icon-list__item">
-      <ul class="usa-icon-list">
+        <img src="{{ url_for('static', filename='img/material-icons/description.svg') }}" alt="Description Icon">
-        <li class="usa-icon-list__item">
+        <div class="usa-icon-list__content">
-          <div class="usa-icon-list__icon" >
+          <h3>{{ original_file_name }}</h3>
-            <img src="{{ url_for('static', filename='img/material-icons/description.svg') }}" alt="Description Icon">
+        </div>
-          </div>
+      </li>
-          <div class="usa-icon-list__content">
+    </ul>
-            <h3 id="{{ file_contents_header_id }}">{{ original_file_name }}</h3>
-          </div>
-        </li>
-      </ul>
-      <div class="usa-table-container--scrollable" tabindex="0">
-        {% call(item, row_number) list_table(
-          recipients.displayed_rows,
-          caption="Note: Only the first 5 rows are displayed here.",
-          caption_visible=True,
-          field_headings=recipients.column_headers
-        ) %}
-          {% for column in recipients.column_headers %}
-            {% if item[column].ignore %}
-              {{ text_field(item[column].data or '', status='default') }}
-            {% else %}
-              {{ text_field(item[column].data or '') }}
-            {% endif %}
-          {% endfor %}
-          {% if item[None].data %}
-            {% for column in item[None].data %}
-              {{ text_field(column, status='default') }}
-            {% endfor %}
-          {% endif %}
-        {% endcall %}
-      </div>
-      {% endif %}
-      <!-- <p>Placeholder: This message will be delivered to <b>400 phone numbers</b> and will use a total of <b>800 message parts</b>, leaving Washington DSHS with <b>249,200 message parts remaining</b>.</p> -->
-      <h3>Does everything look good?</h3>
-      {% set button_text %}
-        {{ "Schedule" if scheduled_for else 'Send'}}
-      {% endset %}
-      {{ usaButton({ "text": button_text }) }}
-
-    </form>
   </div>
+  <div class="usa-table-container--scrollable" tabindex="0">
+    {% call(item, row_number) list_table(
+      recipients.displayed_rows,
+      caption="Note: Only the first 5 rows are displayed here.",
+      caption_visible=True,
+      field_headings=recipients.column_headers
+    ) %}
+      {% for column in recipients.column_headers %}
+        {% if item[column].ignore %}
+          {{ text_field(item[column].data or '', status='default') }}
+        {% else %}
+          {{ text_field(item[column].data or '') }}
+        {% endif %}
+      {% endfor %}
+      {% if item[None].data %}
+        {% for column in item[None].data %}
+          {{ text_field(column, status='default') }}
+        {% endfor %}
+      {% endif %}
+    {% endcall %}
+  </div>
+  {% endif %}
+  <!-- <div class="bottom-gutter-3-2">
+    <p>Placeholder: This message will be delivered to <b>400 phone numbers</b> and will use a total of <b>800 message parts</b>, leaving Washington DSHS with <b>249,200 message parts remaining</b>.</p>
+  </div> -->
+  <form method="post" enctype="multipart/form-data" action="{{url_for('main.start_job', service_id=current_service.id, upload_id=upload_id)}}" class='page-footer'>
+    <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
+    <h3>Does everything look good?</h3>
+    {% set button_text %}
+      {{ "Schedule" if scheduled_for else 'Send'}}
+    {% endset %}
+    {{ usaButton({ "text": button_text }) }}
+  </form>
 {% endblock %}

app/templates/views/notifications/preview.html

@@ -60,7 +60,7 @@
         help='3' if help else 0
       )}}" class='page-footer'>
       <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
-      <p>Placeholder: This message will be delivered to <b>400 phone numbers</b> and will use a total of <b>800 message parts</b>, leaving Washington DSHS with <b>249,200 message parts remaining</b>.</p>
+      <!-- <p>Placeholder: This message will be delivered to <b>400 phone numbers</b> and will use a total of <b>800 message parts</b>, leaving Washington DSHS with <b>249,200 message parts remaining</b>.</p> -->
       <h3>Does everything look good?</h3>
       {% if not error %}
         {% set button_text %}