mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-08-19 05:59:44 -04:00
Updates to display of jobs
This commit: - adds the template to the jobs page (and puts it at the top of the send SMS page) so that it consistently appears in the same place throughout the journey - put the real data about a job on the jobs page and on the dashboard
This commit is contained in:
@@ -4,7 +4,7 @@ from app.main import main
|
||||
from app.main.dao.services_dao import get_service_by_id
|
||||
from app.main.dao import templates_dao
|
||||
from client.errors import HTTPError
|
||||
from ._jobs import jobs
|
||||
from app import job_api_client
|
||||
|
||||
|
||||
@main.route("/services/<service_id>/dashboard")
|
||||
@@ -12,6 +12,7 @@ from ._jobs import jobs
|
||||
def service_dashboard(service_id):
|
||||
try:
|
||||
templates = templates_dao.get_service_templates(service_id)['data']
|
||||
jobs = job_api_client.get_job(service_id)['data']
|
||||
except HTTPError as e:
|
||||
if e.status_code == 404:
|
||||
abort(404)
|
||||
@@ -27,7 +28,7 @@ def service_dashboard(service_id):
|
||||
raise e
|
||||
return render_template(
|
||||
'views/service_dashboard.html',
|
||||
jobs=jobs,
|
||||
jobs=reversed(jobs),
|
||||
free_text_messages_remaining='25,000',
|
||||
spent_this_month='0.00',
|
||||
template_count=len(templates),
|
||||
|
||||
@@ -11,6 +11,7 @@ from client.errors import HTTPError
|
||||
|
||||
from app import job_api_client
|
||||
from app.main import main
|
||||
from app.main.dao import templates_dao
|
||||
|
||||
now = time.strftime('%H:%M')
|
||||
|
||||
@@ -37,6 +38,7 @@ def view_jobs(service_id):
|
||||
def view_job(service_id, job_id):
|
||||
try:
|
||||
job = job_api_client.get_job(service_id, job_id)['data']
|
||||
template = templates_dao.get_service_template(service_id, job['template'])['data']
|
||||
messages = []
|
||||
return render_template(
|
||||
'views/job.html',
|
||||
@@ -53,8 +55,7 @@ def view_job(service_id, job_id):
|
||||
cost=u'£0.00',
|
||||
uploaded_file_name=job['original_file_name'],
|
||||
uploaded_file_time=job['created_at'],
|
||||
template_used=job['template'],
|
||||
flash_message="We’ve accepted {} for processing".format(job['original_file_name']),
|
||||
template=template,
|
||||
service_id=service_id
|
||||
)
|
||||
except HTTPError as e:
|
||||
|
||||
Reference in New Issue
Block a user