test time fixes and bonus letter removal

app/main/views/jobs.py

@@ -35,10 +35,6 @@ from app.main.forms import SearchNotificationsForm
 from app.models.job import Job
 from app.utils import parse_filter_args, set_status_filters
 from app.utils.csv import generate_notifications_csv
-from app.utils.letters import (
-    get_letter_printing_statement,
-    printing_today_or_tomorrow,
-)
 from app.utils.pagination import (
     generate_next_dict,
     generate_previous_dict,
@@ -66,11 +62,6 @@ def view_job(service_id, job_id):
     filter_args = parse_filter_args(request.args)
     filter_args['status'] = set_status_filters(filter_args)
 
-    just_sent_message = 'Your {} been sent. Printing starts {} at 5:30pm.'.format(
-        'letter has' if job.notification_count == 1 else 'letters have',
-        printing_today_or_tomorrow(job.created_at)
-    )
-
     return render_template(
         'views/jobs/job.html',
         job=job,
@@ -82,8 +73,6 @@ def view_job(service_id, job_id):
             status=request.args.get('status', ''),
         ),
         partials=get_job_partials(job),
-        just_sent=request.args.get('just_sent') == 'yes',
-        just_sent_message=just_sent_message,
     )
 
 
@@ -426,7 +415,6 @@ def get_job_partials(job):
         'status': render_template(
             'partials/jobs/status.html',
             job=job,
-            letter_print_day=get_letter_printing_statement("created", job.created_at)
         ),
     }
 

app/main/views/notifications.py

@@ -44,7 +44,6 @@ from app.utils import (
 )
 from app.utils.csv import generate_notifications_csv
 from app.utils.letters import (
-    get_letter_printing_statement,
     get_letter_validation_error,
 )
 from app.utils.templates import get_template
@@ -120,7 +119,6 @@ def view_notification(service_id, notification_id):
     else:
         job = None
 
-    letter_print_day = get_letter_printing_statement(notification['status'], notification['created_at'])
 
     notification_created = parser.parse(notification['created_at']).replace(tzinfo=None)
 
@@ -138,12 +136,6 @@ def view_notification(service_id, notification_id):
             service_id=current_service.id,
             job_id=request.args.get('from_job'),
         )
-    elif request.args.get('from_uploaded_letters'):
-        back_link = url_for(
-            'main.uploaded_letters',
-            service_id=current_service.id,
-            letter_print_day=request.args.get('from_uploaded_letters'),
-        )
     else:
         back_link = url_for(
             'main.view_notifications',
@@ -185,7 +177,6 @@ def view_notification(service_id, notification_id):
         postage=notification['postage'],
         can_receive_inbound=(current_service.has_permission('inbound_sms')),
         is_precompiled_letter=notification['template']['is_precompiled_letter'],
-        letter_print_day=letter_print_day,
         show_cancel_button=show_cancel_button,
         sent_with_test_key=(
             notification.get('key_type') == KEY_TYPE_TEST

app/main/views/send.py

@@ -817,7 +817,6 @@ def start_job(service_id, upload_id):
             'main.view_job',
             job_id=upload_id,
             service_id=service_id,
-            just_sent='yes',
         )
     )
 

app/main/views/uploads.py

@@ -49,7 +49,6 @@ from app.template_previews import TemplatePreview, sanitise_letter
 from app.utils import unicode_truncate
 from app.utils.csv import Spreadsheet, get_errors_for_csv
 from app.utils.letters import (
-    get_letter_printing_statement,
     get_letter_validation_error,
 )
 from app.utils.pagination import (
@@ -95,59 +94,6 @@ def uploads(service_id):
     )
 
 
-@main.route("/services/<uuid:service_id>/uploaded-letters/<simple_date:letter_print_day>")
-@user_has_permissions()
-def uploaded_letters(service_id, letter_print_day):
-    page = get_page_from_request()
-    if page is None:
-        abort(404, "Invalid page argument ({}).".format(request.args.get('page')))
-    uploaded_letters = upload_api_client.get_letters_by_service_and_print_day(
-        current_service.id, letter_print_day=letter_print_day, page=page,
-    )
-
-    prev_page = None
-    if uploaded_letters['links'].get('prev'):
-        prev_page = generate_previous_dict('.uploaded_letters', service_id, page, url_args={
-            'letter_print_day': letter_print_day
-        })
-    next_page = None
-    if uploaded_letters['links'].get('next'):
-        next_page = generate_next_dict('.uploaded_letters', service_id, page, url_args={
-            'letter_print_day': letter_print_day
-        })
-    return render_template(
-        'views/uploads/uploaded-letters.html',
-        notifications=add_preview_of_content_uploaded_letters(
-            uploaded_letters['notifications']
-        ),
-        prev_page=prev_page,
-        next_page=next_page,
-        show_pagination=True,
-        total=uploaded_letters['total'],
-        letter_printing_statement=get_letter_printing_statement(
-            'created',
-            letter_print_day,
-        ),
-        letter_print_day=letter_print_day,
-        single_notification_url=partial(
-            url_for,
-            '.view_notification',
-            service_id=current_service.id,
-            from_uploaded_letters=letter_print_day,
-        )
-    )
-
-
-def add_preview_of_content_uploaded_letters(notifications):
-
-    for notification in notifications:
-        yield(dict(
-            preview_of_content=', '.join(notification.pop('to').splitlines()),
-            to=notification['client_reference'],
-            **notification
-        ))
-
-
 @main.route("/services/<uuid:service_id>/upload-letter", methods=['GET', 'POST'])
 @user_has_permissions('send_messages')
 def upload_letter(service_id):