darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-11 09:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

cleaned code and added css spacing

Browse Source
This commit is contained in:
Beverly Nguyen
2024-07-24 14:29:05 -07:00
parent a4e1446791
commit 4e558ca0e7
4 changed files with 24 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/main/views/activity.py
View File

@@ -3,7 +3,7 @@ from flask_login import current_user
from werkzeug.utils import redirect
from app import current_service, job_api_client
from app.formatters import get_time_left, convert_time_unixtimestamp
from app.formatters import convert_time_unixtimestamp, get_time_left
from app.main import main
from app.utils.pagination import (
generate_next_dict,
@@ -43,13 +43,9 @@ def all_jobs_activity(service_id):
def handle_pagination(jobs, service_id, page):
if page is None:
abort(404, "Invalid page argument ({}).".format(request.args.get("page")))
prev_page = generate_previous_dict("main.all_jobs_activity", service_id, page) if page > 1 else None
next_page = generate_next_dict("main.all_jobs_activity", service_id, page) if jobs["links"].get("next") else None
pagination = generate_pagination_pages(jobs["total"], jobs['page_size'], page)
return prev_page, next_page, pagination
@@ -57,17 +53,17 @@ def generate_job_dict(jobs):
return [
{
"job_id": job["id"],
"sort_value": hashlib.sha1(job["id"].encode("utf-8")).hexdigest(),
"job_sort_value": job["id"].replace("-", ""),
"time_left": get_time_left(job["created_at"]),
"download_link": url_for(".view_job_csv", service_id=current_service.id, job_id=job["id"]),
"view_job_link": url_for(".view_job", service_id=current_service.id, job_id=job["id"]),
"created_at": job["created_at"],
"time_sent_data_value": convert_time_unixtimestamp(job["processing_finished"] if job["processing_finished"] else job["processing_started"]
if job["processing_started"] else job["created_at"]),
"time_sent_data_value": convert_time_unixtimestamp(
job["processing_finished"] if job["processing_finished"]
else job["processing_started"] if job["processing_started"]
else job["created_at"]
),
"processing_finished": job["processing_finished"],
"processing_started": job["processing_started"],
"notification_count": job["notification_count"],
"created_by": job["created_by"],
"template_name": job["template_name"]
}