Merge pull request #2058 from unboxed/committee-actions

Move committee actions within its own section
unboxed · Nov 29, 2024 · bf8747f · bf8747f
2 parents 2804ed8 + 5dfe32d
commit bf8747f
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 29 deletions.
diff --git a/app/views/planning_applications/review/tasks/_committee.html.erb b/app/views/planning_applications/review/tasks/_committee.html.erb
@@ -0,0 +1,33 @@
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-full">
+    <h2 class="govuk-heading-m">
+      <%= t(".committee_actions") %>
+    </h2>
+
+    <ul class="app-task-list__items" id="committee-section">
+      <%= render(
+            TaskListItems::Reviewing::NotifyCommitteeComponent.new(
+              planning_application: @planning_application
+            )
+          ) %>
+      <li class="app-task-list__item">
+        <span class="app-task-list__task-name">
+          <%= link_to_if(
+                @planning_application.in_committee?,
+                "Update decision notice after committee",
+                edit_planning_application_review_recommendation_path(@planning_application, @planning_application.recommendation),
+                aria: {describedby: "review_assessment-completed"},
+                class: "govuk-link"
+              ) %>
+        </span>
+        <div class="govuk-task-list__status app-task-list__task-tag">
+          <%= render(
+                StatusTags::AddCommitteeDecisionComponent.new(
+                  planning_application: @planning_application
+                )
+              ) %>
+        </div>
+      </li>
+    </ul>
+  </div>
+</div>
diff --git a/app/views/planning_applications/review/tasks/_review_conditions.html.erb b/app/views/planning_applications/review/tasks/_review_conditions.html.erb
@@ -158,33 +158,4 @@
   <% end %>
 
   <%= render "planning_applications/review/tasks/sign_off_recommendation" %>
-
-  <% if @planning_application.committee_decision.present? && @planning_application.committee_decision.recommend? %>
-    <%= render(
-          TaskListItems::Reviewing::NotifyCommitteeComponent.new(
-            planning_application: @planning_application
-          )
-        ) %>
-  <% end %>
-
-  <% if @planning_application.committee_decision.present? && @planning_application.committee_decision.recommend? %>
-    <li class="app-task-list__item">
-      <span class="app-task-list__task-name">
-        <%= link_to_if(
-              @planning_application.in_committee?,
-              "Update decision notice after committee",
-              edit_planning_application_review_recommendation_path(@planning_application, @planning_application.recommendation),
-              aria: {describedby: "review_assessment-completed"},
-              class: "govuk-link"
-            ) %>
-      </span>
-      <div class="govuk-task-list__status app-task-list__task-tag">
-      <%= render(
-            StatusTags::AddCommitteeDecisionComponent.new(
-              planning_application: @planning_application
-            )
-          ) %>
-      </div>
-    </li>
-  <% end %>
 </ul>
diff --git a/app/views/planning_applications/review/tasks/index.html.erb b/app/views/planning_applications/review/tasks/index.html.erb
@@ -59,6 +59,10 @@
   </div>
 </div>
 
+<% if @planning_application.committee_decision.present? && @planning_application.committee_decision.recommend? %>
+  <%= render "planning_applications/review/tasks/committee" %>
+<% end %>
+
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-full">
     <%= render(Reviewing::Tasks::AfterSignOffComponent.new(planning_application: @planning_application)) %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -1717,6 +1717,8 @@ en:
             rejected: Assessment rejected
           review_info: by %{reviewer}, %{reviewed_on}
       tasks:
+        committee:
+          committee_actions: Committee actions
         consultees:
           external: External
           internal: Internal