diff --git a/app/main/views/activity.py b/app/main/views/activity.py index effc65a04..63f485c30 100644 --- a/app/main/views/activity.py +++ b/app/main/views/activity.py @@ -98,15 +98,13 @@ def create_job_dict_entry(job): return { "job_id": job_id, "can_download": can_download, - "download_link": url_for( - ".view_job_csv", - service_id=current_service.id, - job_id=job_id - ) if can_download else None, + "download_link": ( + url_for(".view_job_csv", service_id=current_service.id, job_id=job_id) + if can_download + else None + ), "view_job_link": url_for( - ".view_job", - service_id=current_service.id, - job_id=job_id + ".view_job", service_id=current_service.id, job_id=job_id ), "activity_time": activity_time, "created_by": job.get("created_by"), diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py index 2e18be074..3d8adde61 100644 --- a/app/main/views/dashboard.py +++ b/app/main/views/dashboard.py @@ -43,10 +43,9 @@ def service_dashboard(service_id): service_data_retention_days = 7 active_jobs = [job for job in job_response if job["job_status"] != "cancelled"] - sorted_jobs = sorted(active_jobs, key=lambda job: job["created_at"], reverse=True) job_lists = [ {**job_dict, "finished_processing": job_is_finished(job_dict)} - for job_dict in sorted_jobs + for job_dict in active_jobs ] total_messages = service_api_client.get_service_message_ratio(service_id) diff --git a/app/templates/views/activity/all-activity.html b/app/templates/views/activity/all-activity.html index f58889f3a..25239263f 100644 --- a/app/templates/views/activity/all-activity.html +++ b/app/templates/views/activity/all-activity.html @@ -70,7 +70,7 @@ Template