From 0c43869b2684826669abea4664d157dd63a292e7 Mon Sep 17 00:00:00 2001
From: George Katsikas <giorgakis.katsikas@gmail.com>
Date: Tue, 30 May 2023 15:01:10 +0200
Subject: [PATCH] add dynamic event loading to production page
---
..._hx_productionstream_details_contents.html | 26 ++++++++++++-------
scipost_django/production/urls.py | 5 ++++
scipost_django/production/views.py | 15 +++++++++++
3 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/scipost_django/production/templates/production/_hx_productionstream_details_contents.html b/scipost_django/production/templates/production/_hx_productionstream_details_contents.html
index a78693b5d..abfb59c8e 100644
--- a/scipost_django/production/templates/production/_hx_productionstream_details_contents.html
+++ b/scipost_django/production/templates/production/_hx_productionstream_details_contents.html
@@ -11,13 +11,15 @@
<h3>Actions</h3>
{% if "can_perform_supervisory_actions" in sub_perms %}
<div class="container">
- <h4>Change:</h4>
- <div class="border-primary border-start ps-2">
- {% include "production/_hx_productionstream_change_status.html" with form=status_form stream=productionstream %}
- {% include "production/_hx_productionstream_change_supervisor.html" with form=supervisor_form stream=productionstream %}
- {% include "production/_hx_productionstream_change_prodofficer.html" with form=prod_officer_form stream=productionstream %}
- {% include "production/_hx_productionstream_change_invofficer.html" with form=inv_officer_form stream=productionstream %}
- </div>
+ <details class="mb-3">
+ <summary class="fs-6">Change stream property</summary>
+ <div class="border-primary border-start ps-2 pt-4">
+ {% include "production/_hx_productionstream_change_status.html" with form=status_form stream=productionstream %}
+ {% include "production/_hx_productionstream_change_supervisor.html" with form=supervisor_form stream=productionstream %}
+ {% include "production/_hx_productionstream_change_prodofficer.html" with form=prod_officer_form stream=productionstream %}
+ {% include "production/_hx_productionstream_change_invofficer.html" with form=inv_officer_form stream=productionstream %}
+ </div>
+ </details>
</div>
{% endif %}
<ul>
@@ -31,13 +33,19 @@
<div id="productionstream-{{ productionstream.id }}-event-container"
class="col-lg-6 h-100 overflow-scroll">
+ {% comment %} This might be better to refactor with an OOB response on each event addition {% endcomment %}
<h3>Events</h3>
- {% include "production/_productionstream_events.html" with productionstream=productionstream events=productionstream.events.all_without_duration %}
+ <div id="productionstream-{{ productionstream.id }}-event-list"
+ hx-get="{% url 'production:render_stream_events' productionstream.id %}"
+ hx-trigger="load, submit from:#productionstream-{{ productionstream.id }}-details target:form delay:500">
+ </div>
<div id="productionstream-{{ productionstream.id }}-event-new-comment-form">
<button hx-get="{% url 'production:_hx_event_form' productionstream_id=productionstream.id %}"
hx-target="#productionstream-{{ productionstream.id }}-event-new-comment-form"
hx-trigger="click"
- hx-swap="outerHTML">Add a comment to this stream</button>
+ hx-swap="outerHTML"
+ class="btn btn-primary">Add a comment to this stream</button>
</div>
</div>
+
</div>
diff --git a/scipost_django/production/urls.py b/scipost_django/production/urls.py
index 1a23cad3e..bca560a71 100644
--- a/scipost_django/production/urls.py
+++ b/scipost_django/production/urls.py
@@ -202,6 +202,11 @@ urlpatterns = [
production_views.render_stream_assignees_status,
name="render_stream_assignees_status",
),
+ path(
+ "render_stream_events",
+ production_views.render_stream_events,
+ name="render_stream_events",
+ ),
]
),
),
diff --git a/scipost_django/production/views.py b/scipost_django/production/views.py
index 757254ebd..c5418d165 100644
--- a/scipost_django/production/views.py
+++ b/scipost_django/production/views.py
@@ -1144,3 +1144,18 @@ def render_stream_assignees_status(request, stream_id):
"production/_hx_productionstream_summary_assignees_status.html",
context,
)
+
+
+def render_stream_events(request, stream_id):
+ productionstream = get_object_or_404(ProductionStream, pk=stream_id)
+
+ context = {
+ "productionstream": productionstream,
+ "events": productionstream.events.all_without_duration,
+ }
+
+ return render(
+ request,
+ "production/_productionstream_events.html",
+ context,
+ )
--
GitLab