mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-08-25 16:54:03 -04:00
ajax applied to status
This commit is contained in:
@@ -57,7 +57,7 @@ def view_job(service_id, job_id):
|
|||||||
|
|
||||||
filter_args = parse_filter_args(request.args)
|
filter_args = parse_filter_args(request.args)
|
||||||
filter_args["status"] = set_status_filters(filter_args)
|
filter_args["status"] = set_status_filters(filter_args)
|
||||||
|
# updates_url
|
||||||
return render_template(
|
return render_template(
|
||||||
"views/jobs/job.html",
|
"views/jobs/job.html",
|
||||||
job=job,
|
job=job,
|
||||||
@@ -111,7 +111,7 @@ def cancel_job(service_id, job_id):
|
|||||||
@user_has_permissions()
|
@user_has_permissions()
|
||||||
def view_job_updates(service_id, job_id):
|
def view_job_updates(service_id, job_id):
|
||||||
job = Job.from_id(job_id, service_id=service_id)
|
job = Job.from_id(job_id, service_id=service_id)
|
||||||
|
# this could help
|
||||||
return jsonify(**get_job_partials(job))
|
return jsonify(**get_job_partials(job))
|
||||||
|
|
||||||
|
|
||||||
@@ -407,8 +407,7 @@ def get_job_partials(job):
|
|||||||
session["arrived_from_preview_page"] = False
|
session["arrived_from_preview_page"] = False
|
||||||
|
|
||||||
arrived_from_preview_page_url = session.get("arrived_from_preview_page", False)
|
arrived_from_preview_page_url = session.get("arrived_from_preview_page", False)
|
||||||
print('job', dir(job))
|
# partials here
|
||||||
|
|
||||||
return {
|
return {
|
||||||
"counts": counts,
|
"counts": counts,
|
||||||
"notifications": render_template(
|
"notifications": render_template(
|
||||||
|
|||||||
@@ -10,7 +10,8 @@
|
|||||||
<div>
|
<div>
|
||||||
<ul class="usa-icon-list">
|
<ul class="usa-icon-list">
|
||||||
<li class="usa-icon-list__item">
|
<li class="usa-icon-list__item">
|
||||||
<img src="{{ url_for('static', filename='img/material-icons/description.svg') }}" alt="">
|
<img src="{{asset_url('img/material-icons/description.svg')}}" alt="">
|
||||||
|
<!-- fix this image reload on ajax -->
|
||||||
<div class="usa-icon-list__content">
|
<div class="usa-icon-list__content">
|
||||||
<h3>{{ job.original_file_name }}</h3>
|
<h3>{{ job.original_file_name }}</h3>
|
||||||
</div>
|
</div>
|
||||||
@@ -20,13 +21,9 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
<h2>Delivery Status</h2>
|
<h2>Delivery Status</h2>
|
||||||
{% endset %}
|
{% endset %}
|
||||||
{{ ajax_block(
|
|
||||||
partials,
|
|
||||||
url_for('.get_notifications_as_json', service_id=current_service.id, message_type=message_type, status=status),
|
|
||||||
'job'
|
|
||||||
) }}
|
|
||||||
<div class="ajax-block-container">
|
<div class="ajax-block-container">
|
||||||
<p class='bottom-gutter'>
|
<p class='bottom-gutter'>
|
||||||
|
<!-- do we need not job.finished_processing or arrived_from_preview_page_url? -->
|
||||||
{% if not job.finished_processing or arrived_from_preview_page_url %}
|
{% if not job.finished_processing or arrived_from_preview_page_url %}
|
||||||
{% if job.scheduled_for %}
|
{% if job.scheduled_for %}
|
||||||
<div class="usa-alert usa-alert--info">
|
<div class="usa-alert usa-alert--info">
|
||||||
|
|||||||
@@ -11,7 +11,19 @@
|
|||||||
{% block maincolumn_content %}
|
{% block maincolumn_content %}
|
||||||
|
|
||||||
{{ page_header("Message status") }}
|
{{ page_header("Message status") }}
|
||||||
{{ partials['status']|safe }}
|
<!-- do i need arrived_from_preview_page_url? -->
|
||||||
|
{% if not job.processing_finished %}
|
||||||
|
<div
|
||||||
|
data-module="update-content"
|
||||||
|
data-resource="{{ updates_url }}"
|
||||||
|
data-key="status"
|
||||||
|
data-form=""
|
||||||
|
>
|
||||||
|
{% endif %}
|
||||||
|
{{ partials['status']|safe }}
|
||||||
|
{% if not job.processing_finished %}
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
{% if not finished %}
|
{% if not finished %}
|
||||||
<div
|
<div
|
||||||
data-module="update-content"
|
data-module="update-content"
|
||||||
|
|||||||
Reference in New Issue
Block a user