Merge pull request #979 from alphagov/4-days-scheduled

Allow a job to be scheduled any time in next 4 days

app/templates/components/radios.html

@@ -38,7 +38,7 @@
          </span>
        {% endif %}
      </legend>
-     <div class="radio-select" data-module="radio-select">
+     <div class="radio-select" data-module="radio-select" data-categories="{{ field.categories|join(',') }}">
        <div class="radio-select-column">
        {% for option in field %}
          <label class="block-label" for="{{ option.id }}">

app/templates/partials/jobs/notifications.html

@@ -5,7 +5,7 @@
   {% if job.job_status == 'scheduled' %}
 
     <p>
-      Sending will start at {{ job.scheduled_for|format_time }}
+      Sending will start {{ job.scheduled_for|format_datetime_relative }}
     </p>
     <div class="page-footer">
       <form method="post">

app/templates/partials/jobs/status.html

@@ -1,5 +1,13 @@
 <div class="ajax-block-container">
   <p class='heading-small bottom-gutter'>
-    Uploaded by {{ job.created_by.name }} on {{ job.created_at|format_datetime_short }}
+    {% if job.scheduled_for %}
+      {% if job.processing_started %}
+        Sent by {{ job.created_by.name }} on {{ job.processing_started|format_datetime_short }}
+      {% else %}
+        Uploaded by {{ job.created_by.name }} on {{ job.created_at|format_datetime_short }}
+      {% endif %}
+    {% else %}
+      Sent by {{ job.created_by.name }} on {{ job.created_at|format_datetime_short }}
+    {% endif %}
   </p>
 </div>

app/templates/views/dashboard/_upcoming.html

@@ -23,7 +23,7 @@
           <div class="file-list">
             <a class="file-list-filename" href="{{ url_for('.view_job', service_id=current_service.id, job_id=item.id) }}">{{ item.original_file_name }}</a>
             <span class="file-list-hint">
-              Sending at {{ item.scheduled_for|format_time }}
+              Sending {{ item.scheduled_for|format_datetime_relative }}
             </span>
           </div>
         {% endcall %}