Move defendant and certification out of claim file

ministryofjustice · Dec 4, 2024 · a3529f2 · a3529f2
1 parent afe746d
commit a3529f2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/app/views/shared/_claim.html.haml b/app/views/shared/_claim.html.haml
@@ -1,6 +1,3 @@
-- if claim.certification.present?
-  = render partial: 'shared/certification', locals: { claim: claim }
-
 .govuk-summary-card
   .govuk-summary-card__title-wrapper
     %h2.govuk-summary-card__title
@@ -29,18 +26,3 @@
     - if claim&.requires_retrial_dates?
       = render partial: 'shared/claim_retrial_details', locals: { claim: claim }
       = render partial: 'shared/main_hearing_date_details', locals: {claim: claim}
-
-- if claim.defendants.any?
-  %h2.govuk-heading-l
-    = t('external_users.claims.defendants.defendant_fields.defendant_details')
-
-  = render partial: 'shared/claim_defendants', locals: { defendants: claim.defendants }
-
-- else
-  .govuk-grid-row
-    .govuk-grid-column-two-thirds
-      %p.govuk-body
-        = t('.no_defendant')
-
-- unless claim.fixed_fee_case?
-  = render partial: 'external_users/claims/offence_details/summary', locals: { claim: claim }
diff --git a/app/views/shared/_claim_accordion.html.haml b/app/views/shared/_claim_accordion.html.haml
@@ -18,9 +18,28 @@
 
   %h2.govuk-heading-l
     = t('.h2_basic_info')
+
+  - if claim.certification.present?
+    = render partial: 'shared/certification', locals: { claim: claim }
+
   .js-accordion__panel
     = render partial: 'shared/claim', locals: { claim: claim, hide_totals: true }
 
+- if claim.defendants.any?
+  %h2.govuk-heading-l
+    = t('external_users.claims.defendants.defendant_fields.defendant_details')
+
+  = render partial: 'shared/claim_defendants', locals: { defendants: claim.defendants }
+
+- else
+  .govuk-grid-row
+    .govuk-grid-column-two-thirds
+      %p.govuk-body
+        = t('.no_defendant')
+
+- unless claim.fixed_fee_case?
+  = render partial: 'external_users/claims/offence_details/summary', locals: { claim: claim }
+
   %h2.govuk-heading-l
     = t('.h2_evidence')
   .js-accordion__panel