Skip to content

Commit

Permalink
Show case number from MAAT
Browse files Browse the repository at this point in the history
Display the case number for a representation order taken from MAAT. As this is
experimental it can be enabled or disabled by the user.
  • Loading branch information
jrmhaig committed May 21, 2024
1 parent 90522cf commit 036dd9a
Show file tree
Hide file tree
Showing 7 changed files with 70 additions and 4 deletions.
5 changes: 3 additions & 2 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This configuration was generated by
# `rubocop --auto-gen-config --auto-gen-only-exclude --exclude-limit 1000`
# on 2024-04-24 16:19:07 UTC using RuboCop version 1.63.3.
# on 2024-05-21 08:38:48 UTC using RuboCop version 1.63.5.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
Expand Down Expand Up @@ -244,10 +244,11 @@ Metrics/AbcSize:
- 'spec/support/seed_helpers.rb'
- 'spec/support/validation_helpers.rb'

# Offense count: 19
# Offense count: 20
# Configuration parameters: CountComments, Max, CountAsOne.
Metrics/ClassLength:
Exclude:
- 'app/controllers/case_workers/claims_controller.rb'
- 'app/controllers/external_users/claims_controller.rb'
- 'app/interfaces/api/entities/search_result.rb'
- 'app/interfaces/api/v1/dropdown_data.rb'
Expand Down
10 changes: 10 additions & 0 deletions app/controllers/case_workers/claims_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ class ClaimsController < CaseWorkers::ApplicationController
before_action :filter_archived_claims, only: [:archived]
before_action :sort_claims, only: %i[index archived]
before_action :set_claim, only: %i[show messages download_zip]
before_action :set_show_maat_details

include ReadMessages
include MessageControlsDisplay
Expand Down Expand Up @@ -131,5 +132,14 @@ def sort_claims
def criteria_params
{ sorting: sort_column, direction: sort_direction, page: current_page, limit: page_size, search: search_terms }
end

def set_show_maat_details
if params[:maat_details].present?
@show_maat_details = params[:maat_details] == 'on'
current_user.save_setting!(maat_details: @show_maat_details)
else
@show_maat_details = current_user.setting?(:maat_details) || false
end
end
end
end
7 changes: 6 additions & 1 deletion app/views/shared/_claim.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,12 @@
%h3.govuk-heading-m
= t('.defendants')

= render partial: 'shared/claim_defendants', locals: {defendants: claim.defendants }
- if @show_maat_details
= govuk_link_to t('.disable_maat_details'), '?maat_details=off'
= render partial: 'shared/claim_defendants_with_maat', locals: {defendants: claim.defendants }
- else
= govuk_link_to t('.enable_maat_details'), '?maat_details=on'
= render partial: 'shared/claim_defendants', locals: {defendants: claim.defendants }

- else
.govuk-grid-row
Expand Down
37 changes: 37 additions & 0 deletions app/views/shared/_claim_defendant_details_with_maat.html.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
.app-card--defendant
%h4.govuk-heading-s
= t('.defendant', context: index)

= govuk_summary_list do
= govuk_summary_list_row_collection( t('external_users.claims.defendants.defendant_fields.full_name') ) { defendant.name }

- if defendant.date_of_birth.present?
= govuk_summary_list_row_collection( t('external_users.claims.defendants.defendant_fields.date_of_birth') ) { defendant.date_of_birth.strftime(Settings.date_format) rescue '' }

- unless @claim.lgfs? && @claim.interim?
= govuk_summary_list_row_collection( t('external_users.claims.defendants.defendant_fields.judical_apportionment') ) { defendant.order_for_judicial_apportionment == true ? t('global_yes') : t('global_no') }


- if defendant.representation_orders.any?
= govuk_table do
= govuk_table_caption do
= t('shared.claim.reporders')

= govuk_table_thead_collection [t('.date'),
t('external_users.claims.defendants.representation_order_fields.maat_reference_number'),
t('.case_number_from_maat')]

= govuk_table_tbody do
- defendant.representation_orders.each do | representation_order |
= govuk_table_row do
= govuk_table_td('data-label': t('.date')) do
= representation_order.representation_order_date.strftime(Settings.date_format) rescue ''

= govuk_table_td('data-label': t('external_users.claims.defendants.representation_order_fields.maat_reference_number')) do
= representation_order.maat_reference

= govuk_table_td('data-label': t('.case_number_from_maat')) do
= representation_order.maat_details[:case_number]

- else
= govuk_inset_text(t('.no_reporder'))
2 changes: 1 addition & 1 deletion app/views/shared/_claim_defendants.html.haml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
- defendants.each_with_index do | defendant, index |
.govuk-grid-column-one-half
= render partial: 'shared/claim_defendant_details', locals: { defendant: present(defendant, CaseWorkers::DefendantPresenter), index: index += 1 }
= render partial: 'shared/claim_defendant_details', locals: { defendant:, index: index += 1 }
3 changes: 3 additions & 0 deletions app/views/shared/_claim_defendants_with_maat.html.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- defendants.each_with_index do | defendant, index |
.govuk-grid-column-one-half
= render partial: 'shared/claim_defendant_details_with_maat', locals: { defendant: present(defendant, CaseWorkers::DefendantPresenter), index: index += 1 }
10 changes: 10 additions & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2024,11 +2024,19 @@ en:
banner_paragraph: This is to enable routine maintenance work to be carried out. Please save and close any work before this time.
claim_defendants:
defendants: Defendants
enable_maat_details: Enable MAAT details (experimental)
disable_maat_details: Disable MAAT details (experimental)
claim_defendant_details:
caption: 'Defendant: Additional information'
date: Order date
defendant: Defendant %{context}
no_reporder: No representation orders have been supplied for this defendant.
claim_defendant_details_with_maat:
caption: 'Defendant: Additional information'
date: Order date
defendant: Defendant %{context}
no_reporder: No representation orders have been supplied for this defendant.
case_number_from_maat: Case number from MAAT (experimental)
evidence_checklist:
caption: 'Supporting evidence checklist'
summary: 'Note: To best navigate this table, step down the second column'
Expand Down Expand Up @@ -2098,6 +2106,8 @@ en:
submit_date: Claim submitted
trial_concluded: Trial concluded
prosecution_evidence: Prosecution evidence
enable_maat_details: Enable MAAT details (experimental)
disable_maat_details: Disable MAAT details (experimental)
claims:
interim_claim_info:
fields: *interim_claim_info_fields
Expand Down

0 comments on commit 036dd9a

Please sign in to comment.