TP2000-1387 py312 async success page

common/jinja2/common/celery_queues.jinja

@@ -10,6 +10,11 @@
       "href": url('measure-create-process-queue'),
       "selected": selected_tab == "measure-process-queue"
     },
+    {
+      "text": "Measure edit process queue",
+      "href": url('measure-edit-process-queue'),
+      "selected": selected_tab == "measure-edit-process-queue"
+    },
     {
       "text": "Rule check queue",
       "href": url('workbaskets:rule-check-queue'),

measures/editors.py

@@ -113,6 +113,6 @@ def edit_measures(self) -> List["measure_models.Measure"]:
                         workbasket=self.workbasket,
                     )
 
-                    edited_measures.append(new_measure.id)
+                    edited_measures.append(new_measure)
 
             return edited_measures

measures/filters.py

@@ -26,6 +26,7 @@
 from measures.models import MeasureCondition
 from measures.models import MeasureType
 from measures.models.bulk_processing import MeasuresBulkCreator
+from measures.models.bulk_processing import MeasuresBulkEditor
 from quotas.models import QuotaOrderNumber
 from regulations.models import Regulation
 from workbaskets.models import WorkBasket
@@ -302,3 +303,14 @@ class MeasureCreateTaskFilter(TamatoFilter):
     class Meta:
         model = MeasuresBulkCreator
         fields = ["processing_state"]
+
+
+class MeasureEditTaskFilter(TamatoFilter):
+    """FilterSet for Bulk Measure Edit tasks."""
+
+    search_fields = "processing_state"
+    clear_url = reverse_lazy("measure-edit-process-queue")
+
+    class Meta:
+        model = MeasuresBulkEditor
+        fields = ["processing_state"]

measures/jinja2/measures/confirm-create-multiple-async.jinja

@@ -8,7 +8,7 @@
 {% endmacro %}
 
 {% macro panel_subtitle(created_measures) %}
-  You can view {% if expected_measures_count > 1 %}their{% else %}its{% endif %} status on the Measures process queue page.
+  You can view {% if expected_measures_count > 1 %}their{% else %}its{% endif %} status on the measures process queue page.
 {% endmacro %}
 
 {% block breadcrumb %}
@@ -37,6 +37,11 @@
           "href": url("home"),
           "classes": "govuk-button--secondary"
         }) }}
+        {{ govukButton({
+        "text": "Return to workbasket",
+        "href": url("workbaskets:current-workbasket"),
+        "classes": "govuk-button--secondary"
+      }) }}
       </div>
     </div>
   </div>

measures/jinja2/measures/confirm-edit-multiple.jinja

@@ -0,0 +1,42 @@
+{% extends "layouts/confirm.jinja" %}
+{% from "components/breadcrumbs.jinja" import breadcrumbs %}
+
+{% set page_title = "Edit measure details" %}
+
+{% macro panel_title(edited_measures) %}
+  {% if edited_measures|length > 1 %}
+    {{ edited_measures.0._meta.verbose_name_plural|title }} {% for m in edited_measures %}{% if not loop.last %}{{ m|string }}, {% else %}{{ m|string }} {% endif %}{% endfor %}have been edited
+  {% else %}
+    {{ edited_measures.0._meta.verbose_name|title }} {{ edited_measures.0|string }} has been edited
+  {% endif %}
+{% endmacro %}
+
+{% macro panel_subtitle(created_measures) %}
+    This change has been added to your workbasket
+{% endmacro %}
+
+{% block breadcrumb %}
+  {{ breadcrumbs(request, [
+      {"text": page_title },
+    ])
+  }}
+{% endblock %}
+
+{% block content %}
+  <div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds">
+      {{ govukPanel({
+        "titleText": panel_title(edited_measures),
+        "text": panel_subtitle(edited_measures),
+        "classes": "govuk-!-margin-bottom-7"
+      }) }}
+      <h2 class="govuk-heading-m">Next steps</h2>
+      <p class="govuk-body">To complete your task you must publish your change. </p>
+      {{ govukButton({
+        "text": "Go to workbasket summary",
+        "href": url("workbaskets:current-workbasket"),
+        "classes": "govuk-button--secondary"
+      }) }}
+    </div>
+  </div>
+{% endblock %}

measures/jinja2/measures/edit-process-queue.jinja

@@ -0,0 +1,86 @@
+{% extends "common/celery_queues.jinja" %}
+
+{% from "macros/inline_filter_links.jinja" import inline_filter_links %}
+{% from "components/table/macro.njk" import govukTable %}
+{% from "components/button/macro.njk" import govukButton %}
+
+{% set list_include = "includes/measures/create-task-list.jinja"%}
+{# Might wanna make an edit one or make this one useable by both #}
+
+{% set page_title = "Measures process queue" %}
+
+
+{% block breadcrumb %}
+  {{ breadcrumbs(
+      request,
+      [ {"text": page_title} ],
+      with_workbasket=False,
+  ) }}
+{% endblock %}
+
+{% set filter_links_list = [
+  {
+    "text": "All",
+    "href": "?processing_state=",
+    "selected": selected_link == "all",
+  },
+  {
+    "text": "Processing",
+    "href": "?processing_state=PROCESSING",
+    "selected": selected_link == "processing",
+  },
+  {
+    "text": "Completed",
+    "href": "?processing_state=SUCCESSFULLY_PROCESSED",
+    "selected": selected_link == "completed",
+  },
+  {
+    "text": "Failed",
+    "href": "?processing_state=FAILED_PROCESSING",
+    "selected": selected_link == "failed",
+  },
+  {
+    "text": "Terminated",
+    "href": "?processing_state=CANCELLED",
+    "selected": selected_link == "terminated",
+  },
+]%}
+
+{% block tab_content %}
+<div class="govuk-grid-row">
+
+  <div class="govuk-grid-column-full">
+    <h1 class="govuk-heading-xl">{{ page_title }}</h1>
+
+    <nav class="workbasket-filters">
+      <p class="govuk-body govuk-!-font-weight-bold">Filter results:</p>
+      <div class="govuk-!-margin-top-2">
+        {{ inline_filter_links(filter_links_list) }}
+      </div>
+
+      {{ govukButton({
+            "html": refresh_button_content,
+            "href": url("measure-create-process-queue"),
+            "classes": "govuk-button--primary align-right govuk-!-margin-bottom-0 refresh-button",
+      }) }}
+    </nav>
+  </div>
+
+  <div class="govuk-grid-column-full govuk-!-margin-bottom-3">
+    <hr class="govuk-section-break govuk-section-break--visible">
+  </div>
+
+  <div class="govuk-grid-column-full">
+    {% if object_list %}
+      {% include list_include%}
+    {% else %}
+      <p class="govuk-body">No bulk create/edit tasks with this status</p>
+    {% endif %}
+  </div>
+
+  <div class="govuk-grid-column-full">
+    {% include "includes/common/pagination.jinja" %}
+  </div>
+
+</div>
+{% endblock %}

measures/models/bulk_processing.py

@@ -479,6 +479,10 @@ class MeasuresBulkEditor(BulkProcessor):
     )
     """The user who submitted the task to create measures."""
 
+    @property
+    def expected_measures_count(self) -> int:
+        return len(self.selected_measures)
+
     def schedule_task(self) -> AsyncResult:
         """Implementation of base class method."""
 

measures/urls.py

@@ -43,6 +43,11 @@
         ),
         name="measure-ui-edit-multiple",
     ),
+    path(
+        "edit/done-async/<int:expected_measures_count>/",
+        views.MeasuresWizardCreateConfirm.as_view(),
+        name="measure-ui-edit-confirm",
+    ),
     path(
         "delete-multiple-measures/",
         views.MeasureMultipleDelete.as_view(),
@@ -71,6 +76,11 @@
         views.MeasuresCreateProcessQueue.as_view(),
         name="measure-create-process-queue",
     ),
+    path(
+        "edit-process-queue/",
+        views.MeasuresEditProcessQueue.as_view(),
+        name="measure-edit-process-queue",
+    ),
     path(
         "cancel-bulk-processor-task/<int:pk>/",
         views.CancelBulkProcessorTask.as_view(),

measures/views/bulk_processing.py

@@ -14,6 +14,7 @@
 from common.views import WithPaginationListView
 from measures import models
 from measures.filters import MeasureCreateTaskFilter
+from measures.filters import MeasureEditTaskFilter
 from measures.forms import CancelBulkProcessorTaskForm
 from measures.models.bulk_processing import MeasuresBulkCreator
 from measures.models.bulk_processing import ProcessingState
@@ -196,3 +197,124 @@ def status_tag_generator(self, task: models.MeasuresBulkCreator) -> dict:
                 "text": "",
                 "tag_class": "",
             }
+
+
+class MeasuresEditProcessQueue(
+    PermissionRequiredMixin,
+    WithPaginationListView,
+):
+    """UI endpoint for bulk editing Measures process queue."""
+
+    permission_required = [
+        "common.add_trackedmodel",
+        "common.change_trackedmodel",
+    ]
+    template_name = "measures/edit-process-queue.jinja"
+    model = models.MeasuresBulkEditor
+    queryset = models.MeasuresBulkEditor.objects.filter(
+        workbasket__status=WorkflowStatus.EDITING,
+    ).order_by("-created_at")
+    filterset_class = MeasureEditTaskFilter
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        context["selected_link"] = "all"
+        context["selected_tab"] = "measure-edit-process-queue"
+        processing_state = self.request.GET.get("processing_state")
+
+        if processing_state == "PROCESSING":
+            context["selected_link"] = "processing"
+        elif processing_state == ProcessingState.CANCELLED:
+            context["selected_link"] = "terminated"
+        elif processing_state == ProcessingState.FAILED_PROCESSING:
+            context["selected_link"] = "failed"
+        elif processing_state == ProcessingState.SUCCESSFULLY_PROCESSED:
+            context["selected_link"] = "completed"
+        # Provide template access to some UI / view utility functions.
+        context["status_tag_generator"] = self.status_tag_generator
+        context["can_terminate_task"] = self.can_terminate_task
+        context["is_task_failed"] = self.is_task_failed
+        context["is_task_terminated"] = self.is_task_terminated
+        # Apply the TAP standard date format within the UI.
+        context["datetime_format"] = settings.DATETIME_FORMAT
+        if context["selected_link"] == "processing":
+            context["object_list"] = self.get_processing_queryset()
+        return context
+
+    def get_processing_queryset(self):
+        """Returns a combined queryset of tasks either AWAITING_PROCESSING or
+        CURRENTLY_PROCESSING."""
+
+        return self.queryset.filter(
+            Q(processing_state=ProcessingState.AWAITING_PROCESSING)
+            | Q(processing_state=ProcessingState.CURRENTLY_PROCESSING),
+        )
+
+    def is_task_failed(self, task: models.MeasuresBulkCreator) -> bool:
+        """
+        Return True if the task is in a failed state.
+
+        Return False otherwise.
+        """
+
+        return task.processing_state == ProcessingState.FAILED_PROCESSING
+
+    def is_task_terminated(self, task: MeasuresBulkCreator) -> bool:
+        """
+        Return True if the task is in a cancelled state. Cancelled tasks are
+        surfaced as 'terminated' in the UI.
+
+        Return False otherwise.
+        """
+
+        return task.processing_state == ProcessingState.CANCELLED
+
+    def can_terminate_task(self, task: MeasuresBulkCreator) -> bool:
+        """
+        Return True if a task is in a queued state and the current user is
+        permitted to terminate a task.
+
+        Return False otherwise.
+        """
+
+        if (
+            self.request.user.is_superuser
+            and task.processing_state in ProcessingState.queued_states()
+        ):
+            return True
+
+        return False
+
+    def status_tag_generator(self, task: models.MeasuresBulkCreator) -> dict:
+        """Returns a dict with text and a CSS class for a UI-friendly label for
+        a bulk creation task."""
+
+        if task.processing_state in [
+            ProcessingState.CURRENTLY_PROCESSING,
+            ProcessingState.AWAITING_PROCESSING,
+        ]:
+            return {
+                "text": "Processing",
+                "tag_class": "tamato-badge-light-blue",
+            }
+        elif task.processing_state == ProcessingState.SUCCESSFULLY_PROCESSED:
+            return {
+                "text": "Completed",
+                "tag_class": "tamato-badge-light-green",
+            }
+        elif task.processing_state == ProcessingState.FAILED_PROCESSING:
+            return {
+                "text": "Failed",
+                "tag_class": "tamato-badge-light-red",
+            }
+        elif task.processing_state == ProcessingState.CANCELLED:
+            return {
+                "text": "Terminated",
+                "tag_class": "tamato-badge-light-yellow",
+            }
+        else:
+            return {
+                "text": "",
+                "tag_class": "",
+            }