darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-18 21:49:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add stubbed job_id

Browse Source 
So that we can get a better sense of what the URLs look like.

Leaving unsigned for now because we don’t know if the ID will be a string or int
or…
This commit is contained in:
Chris Hill-Scott
2016-01-13 12:49:31 +00:00
parent 04b9c120d4
commit b4a8c2732d
8 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/main/views/jobs.py
View File

@@ -52,9 +52,9 @@ def showjobs(service_id):
)
@main.route("/<int:service_id>/jobs/job")
@main.route("/<int:service_id>/jobs/<job_id>")
@login_required
def showjob(service_id):
def showjob(service_id, job_id):
return render_template(
'views/job.html',
messages=messages,
@@ -76,9 +76,9 @@ def showjob(service_id):
)
@main.route("/<int:service_id>/jobs/job/notification/<string:notification_id>")
@main.route("/<int:service_id>/jobs/<job_id>/notification/<string:notification_id>")
@login_required
def shownotification(service_id, notification_id):
def shownotification(service_id, job_id, notification_id):
return render_template(
'views/notification.html',
message=[
@@ -86,5 +86,6 @@ def shownotification(service_id, notification_id):
][0],
delivered_at=now,
uploaded_at=now,
service_id=service_id
service_id=service_id,
job_id=job_id
)

2
app/main/views/sms.py
View File

@@ -83,7 +83,7 @@ def checksms(service_id):
service_id=service_id
)
elif request.method == 'POST':
return redirect(url_for('.showjob', service_id=service_id))
return redirect(url_for('.showjob', service_id=service_id, job_id=456))
def _build_upload_result(csv_file):

4
app/templates/views/dashboard.html
View File

@@ -30,10 +30,10 @@
field_headings=['Job', 'File', 'Time', 'Status']
) %}
{% call field() %}
<a href="{{ url_for('.showjob', service_id=service_id) }}">{{ item.file }}</a>
<a href="{{ url_for('.showjob', service_id=service_id, job_id=456) }}">{{ item.file }}</a>
{% endcall %}
{% call field() %}
<a href="{{ url_for('.showjob', service_id=service_id) }}">{{ item.job }}</a>
<a href="{{ url_for('.showjob', service_id=service_id, job_id=456) }}">{{ item.job }}</a>
{% endcall %}
{% call field() %}
{{ item.time }}

4
app/templates/views/job.html
View File

@@ -52,10 +52,10 @@ GOV.UK Notify | Notifications activity
]
) %}
{% call field() %}
<a href="{{ url_for('.shownotification', service_id=service_id, notification_id=item.id) }}">{{item.phone}}</a>
<a href="{{ url_for('.shownotification', service_id=service_id, job_id=456, notification_id=item.id) }}">{{item.phone}}</a>
{% endcall %}
{% call field() %}
<a href="{{ url_for('.shownotification', service_id=service_id, notification_id=item.id) }}">{{item.message[:50]}}…</a>
<a href="{{ url_for('.shownotification', service_id=service_id, job_id=456, notification_id=item.id) }}">{{item.message[:50]}}…</a>
{% endcall %}
{% call field(
align='right',

4
app/templates/views/jobs.html
View File

@@ -16,10 +16,10 @@ GOV.UK Notify | Notifications activity
field_headings=['Job', 'File', 'Time', 'Status']
) %}
{% call field() %}
<a href="{{ url_for('.showjob', service_id=service_id) }}">{{ item.file }}</a>
<a href="{{ url_for('.showjob', service_id=service_id, job_id=456) }}">{{ item.file }}</a>
{% endcall %}
{% call field() %}
<a href="{{ url_for('.showjob', service_id=service_id) }}">{{ item.job }}</a>
<a href="{{ url_for('.showjob', service_id=service_id, job_id=456) }}">{{ item.job }}</a>
{% endcall %}
{% call field() %}
{{ item.time }}

2
app/templates/views/notification.html
View File

@@ -26,7 +26,7 @@ GOV.UK Notify | Notifications activity
</div>
{{ page_footer(
back_link = url_for('.showjob', service_id=service_id),
back_link = url_for('.showjob', service_id=service_id, job_id=job_id),
back_link_text = 'View other messages in this job'
) }}