Use bops_ticket_panel

unboxed · Feb 21, 2025 · dec7cab · dec7cab
1 parent b3e864b
commit dec7cab
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 19 deletions.
diff --git a/app/components/planning_applications/immunity_details_assessment_component.html.erb b/app/components/planning_applications/immunity_details_assessment_component.html.erb
@@ -57,26 +57,18 @@
             <strong>Relevant dates: </strong> <%= evidence_group.date_range %>
           </p>
 
-          <% if evidence_group.applicant_comment.present? %>
-            <div class="govuk-inset-text" style="background-color: #f3f2f1; border-left: 10px solid #b1b4b6;">
-              <p class="govuk-body">
-                <strong>Applicant comment</strong>
-              </p>
-              <p class="govuk-body">
-                <%= evidence_group.applicant_comment %>
-              </p>
-            </div>
+          <% if applicant_comment = evidence_group.applicant_comment %>
+            <%= bops_ticket_panel(colour: "grey", classes: %w[govuk-!-margin-bottom-2]) do |ticket| %>
+              <% ticket.with_body { applicant_comment } %>
+              <% ticket.with_footer { "By applicant" } %>
+            <% end %>
           <% end %>
 
-          <% if evidence_group.persisted_comments.any? %>
-            <div class="govuk-inset-text" style="background-color: #fff7bf; border-left: 10px solid #ffdd00;">
-              <p class="govuk-body">
-                <strong>Officer comment</strong>
-              </p>
-              <p class="govuk-body">
-                <%= simple_format(evidence_group.persisted_comments.last.text) %>
-              </p>
-            </div>
+          <% if comment = evidence_group.last_comment %>
+            <%= bops_ticket_panel(colour: "yellow", classes: %w[govuk-!-margin-bottom-2]) do |ticket| %>
+              <% ticket.with_body { comment.text } %>
+              <% ticket.with_footer { comment.information } %>
+            <% end %>
           <% end %>
         </div>
       </div>

diff --git a/app/components/planning_applications/immunity_details_assessment_component.rb b/app/components/planning_applications/immunity_details_assessment_component.rb
@@ -10,6 +10,7 @@ def initialize(planning_application:, evidence_groups:)
     end
 
     delegate :immunity_detail, to: :planning_application
+    delegate :bops_ticket_panel, to: :helpers
 
     attr_reader :planning_application, :evidence_groups
   end

diff --git a/app/presenters/evidence_group_presenter.rb b/app/presenters/evidence_group_presenter.rb
@@ -23,6 +23,10 @@ def date_range
     end
   end
 
+  def last_comment
+    @last_comment ||= persisted_comments.last
+  end
+
   private
 
   attr_reader :evidence_group

diff --git a/engines/bops_core/app/components/bops_core/ticket_panel_component.rb b/engines/bops_core/app/components/bops_core/ticket_panel_component.rb
@@ -17,7 +17,7 @@ def initialize(colour: nil, id: nil, classes: [], html_attributes: {})
     end
 
     def call
-      tag.div(**default_attributes) do
+      tag.div(**html_attributes) do
         safe_join([body_wrapper, footer_wrapper].compact_blank)
       end
     end
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ def initialize(planning_application:, evidence_groups:) @@
         end
         delegate :immunity_detail, to: :planning_application
+        delegate :bops_ticket_panel, to: :helpers
         attr_reader :planning_application, :evidence_groups
       end
@@ Expand Down @@