-
Notifications
You must be signed in to change notification settings - Fork 7
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Create new file names to implement changes #7862
Open
Katy600
wants to merge
26
commits into
master
Choose a base branch
from
CTSKF-993--Implement-Summary-Page-accessibility-improvements--attempt-2
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
e9868d7
Create new file names to implement changes
Katy600 743a5af
Format supporting evidence
Katy600 e5bebaa
Format evidence table;
Katy600 4549044
Format defendant details;
Katy600 2689abc
Format claims section
Katy600 93622b4
Format certification in basic claims information
Katy600 725bfd9
Format claim retrial detals from the claim section
Katy600 822bff9
Format offence details;
Katy600 e4c4bd8
Format first part of lgfs summary
Katy600 f703400
Format basic and additional fees;
Katy600 6b162e4
Format new warrent fee lgfs;
Katy600 946993e
Fix new claim layout
Katy600 785d10a
Format Travel expenses for LGFS in summary card;
Katy600 5554262
Update translation for expenses summary card
Katy600 7f19322
Fix translations in new details
Katy600 2868a85
Revert new show to use helper methods
Katy600 4db26e8
Update translate file for warrant fees
Katy600 7d6fa70
Sort translation in warrant fees lgfs caseworker
Katy600 f46f236
Update translate file to match new file structure
Katy600 4342fba
Create a seperate file for lgfs disbursemetns and update file paths
Katy600 f7cb4db
Fix translation working rspec tests
Katy600 6153bf5
Format agfs fees in a summary card;
Katy600 11e72d5
Display formatted travel expense table for agfs
Katy600 2913583
Format additional claims information in a summary card
Katy600 24fa15f
Format disbursments with VAT in a summary card
Katy600 d42e424
Move defendant details into the accordion to create consistency with …
Katy600 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
.govuk-summary-card | ||
.govuk-summary-card__title-wrapper | ||
%h2.govuk-summary-card__title | ||
= t('shared.new_claim_accordion.additional_information') | ||
|
||
.govuk-summary-card__content | ||
.govuk-summary-list | ||
%dl.govuk-summary-list__row | ||
= format_multiline(claim.additional_information) | ||
|
||
|
||
|
||
Comment on lines
+10
to
+12
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nitpicky, but could these blank lines be deleted? I've noticed similar blank lines at the end of a few other files, it might be better if they could all be tidied up a bit (sorry!) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,98 @@ | ||
.govuk-summary-card.custom-summary-card | ||
.govuk-summary-card__title-wrapper | ||
%h2.govuk-summary-card__title | ||
= t('common.fees') | ||
.govuk-summary-card__content | ||
%dl.govuk-summary-list.new_summary | ||
%div.govuk-summary-list__header | ||
%div.govuk-summary-list__row | ||
|
||
= govuk_table do | ||
= govuk_table_caption(class: 'govuk-visually-hidden') do | ||
= t('.fees.caption') | ||
= govuk_table_thead do | ||
= govuk_table_row do | ||
= govuk_table_th do | ||
= t('.fee_category') | ||
= govuk_table_th do | ||
= t('.fee_type') | ||
- unless claim.interim? | ||
= govuk_table_th_numeric do | ||
= t('.quantity') | ||
|
||
= govuk_table_th_numeric do | ||
= t('.rate') | ||
= govuk_table_th_numeric do | ||
= t('.net_amount') | ||
= govuk_table_tbody do | ||
- present_collection(claim.fees.select(&:present?).sort_by(&:position)).each do |fee| | ||
= govuk_table_row do | ||
= govuk_table_td('data-label': t('.fee_category')) do | ||
= fee.fee_type&.fee_category_name || 'n/a' | ||
%br/ | ||
- if fee.fee_type.unique_code.eql?('BABAF') | ||
- if fee.first_day_of_trial | ||
= t('.first_day_of_trial') | ||
%br/ | ||
= fee.first_day_of_trial | ||
%br/ | ||
%br/ | ||
|
||
- if fee.retrial_started_at | ||
= t('.retrial_started_at') | ||
%br/ | ||
= fee.retrial_started_at | ||
%br/ | ||
%br/ | ||
- if fee.dates_attended.any? | ||
- if fee.fee_type.unique_code.eql?('BABAF') | ||
= t(fee.claim.case_type.name.split(' ').collect(&:capitalize).join.underscore, scope: "external_users.claims.basic_fees.basic_fee_fields_primary.date_label") | ||
- else | ||
= t('.dates_attended') | ||
%br/ | ||
= fee.dates_attended_delimited_string | ||
%br/ | ||
%br/ | ||
|
||
|
||
- if fee.date? | ||
= t('.date') | ||
= fee.date | ||
= govuk_table_td('data-label': t('.fee_type')) do | ||
= fee.fee_type&.description || 'n/a' | ||
- if fee.sub_type.present? | ||
%p | ||
= "#{t('.fee_subtype')}: #{fee.sub_type.description}" | ||
- if fee.case_uplift? | ||
%br | ||
= "#{t('.case_numbers')}: #{fee.case_numbers}" | ||
- unless claim.interim? | ||
= govuk_table_td_numeric('data-label': t('.quantity')) do | ||
= fee.quantity | ||
= govuk_table_td_numeric('data-label': t('.rate')) do | ||
= fee.rate | ||
= govuk_table_td_numeric('data-label': t('.net_amount')) do | ||
= fee.amount | ||
|
||
= govuk_table do | ||
= govuk_table_thead do | ||
= govuk_table_row do | ||
= govuk_table_th do | ||
= t('shared.description') | ||
= govuk_table_th_numeric do | ||
= t('shared.net_amount') | ||
= govuk_table_th_numeric do | ||
= t('shared.vat') | ||
= govuk_table_th_numeric do | ||
= t('shared.gross_amount') | ||
|
||
= govuk_table_tbody do | ||
= govuk_table_row do | ||
= govuk_table_td('data-label': t('shared.description')) do | ||
= t('shared.summary.fees_total') | ||
= govuk_table_td_numeric('data-label': t('shared.net_amount')) do | ||
= claim.fees_total | ||
= govuk_table_td_numeric('data-label': t('shared.vat')) do | ||
= claim.fees_vat | ||
= govuk_table_td_numeric('data-label': t('shared.gross_amount')) do | ||
= claim.fees_gross |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
.govuk-summary-card | ||
.govuk-summary-card__title-wrapper | ||
%h2.govuk-summary-card__title | ||
= t('.certification_box_title') | ||
|
||
.govuk-summary-card__content | ||
.govuk-summary-list | ||
%dl.govuk-summary-list__row.summary-page-table-two-row | ||
%dt.govuk-summary-list__key | ||
= t('.instructed_heading') | ||
%dd.govuk-summary-list__value | ||
= claim.external_user.name | ||
|
||
- if @claim.agfs? | ||
%dl.govuk-summary-list__row.summary-page-table-two-row | ||
%dt.govuk-summary-list__key | ||
= t('.certification_reason') | ||
%dd.govuk-summary-list__value | ||
= claim.certification.certification_type.name rescue '' | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
- if claim.certification.present? | ||
= render partial: 'shared/new_certification', locals: { claim: claim } | ||
|
||
.govuk-summary-card | ||
.govuk-summary-card__title-wrapper | ||
%h2.govuk-summary-card__title | ||
= t('shared.claim.claim_type') | ||
|
||
.govuk-summary-card__content | ||
.govuk-summary-list | ||
|
||
= render partial: 'shared/new_claim_and_case_type_details', locals: { claim: claim } | ||
|
||
- if claim.agfs? && claim.case_type.present? && claim.requires_cracked_dates? | ||
= render partial: 'shared/new_claim_cracked_trial_details', locals: { claim: claim } | ||
|
||
- if claim.case_type && claim.case_concluded_at | ||
= render partial: 'shared/new_claim_case_concluded_at_details', locals: { claim: claim } | ||
|
||
- if claim.lgfs? && claim.interim? && !claim.interim_fee.nil? | ||
= render partial: 'shared/new_claim_interim_details', locals: { claim: claim } | ||
|
||
- if claim.transfer? | ||
= render partial: 'shared/new_claim_transfer_details', locals: { claim: claim } | ||
|
||
- if claim&.requires_trial_dates? | ||
= render partial: 'shared/new_claim_trial_details', locals: { claim: claim } | ||
|
||
- if claim&.requires_retrial_dates? | ||
= render partial: 'shared/new_claim_retrial_details', locals: { claim: claim } | ||
|
||
- if claim.main_hearing_date | ||
= render partial: 'shared/new_main_hearing_date_details', locals: { claim: claim } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
#claim-accordion | ||
.govuk-grid-row | ||
.govuk-grid-column-one-half | ||
%h2.govuk-heading-m | ||
= t('.h2_messages') | ||
|
||
.govuk-grid-column-one-half | ||
- if current_user.persona.is_a?(CaseWorker) | ||
.other-claims | ||
- if claim_ids.present? && claim_ids.include?(@claim.id) | ||
= t('shared.position_and_count', position: claim_position_and_count) | ||
|
||
- unless last_claim? | ||
= next_claim_link 'Next claim >'.html_safe, class: 'next-claim' | ||
|
||
= render partial: 'shared/claim_history', locals: { claim: claim } | ||
= render partial: 'shared/claim_status', locals: { claim: claim, disabled: status_disabled } | ||
|
||
%h2.govuk-heading-l | ||
= t('.h2_basic_info') | ||
.js-accordion__panel | ||
= render partial: 'shared/new_claim', locals: { claim: claim, hide_totals: true } | ||
|
||
- if claim.defendants.any? | ||
%h2.govuk-heading-l | ||
= t('.h2_defendant_details') | ||
.js-accordion__panel | ||
= render partial: 'shared/new_claim_defendants', locals: { defendants: claim.defendants } | ||
-else | ||
= render partial: 'shared/new_defendant_details', locals: { claim: claim } | ||
|
||
%h2.govuk-heading-l | ||
= t('.h2_evidence') | ||
.js-accordion__panel | ||
= render partial: 'shared/new_evidence_list', locals: { claim: claim } | ||
|
||
%h2.govuk-heading-l | ||
= t('.h2_summary') | ||
.js-accordion__panel.fees-summary | ||
- if claim.agfs? | ||
= render partial: 'shared/new_summary_agfs', locals: { claim: claim } | ||
- else | ||
= render partial: 'shared/new_summary_lgfs', locals: { claim: claim } | ||
|
||
- if claim.additional_information.present? | ||
%h2.govuk-heading-l | ||
= t('.additional_information') | ||
.js-accordion__panel.fees-summary | ||
= render partial: 'shared/new_additional_information', locals: { claim: claim } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are some summary_list helper methods in
lib/govuk_component/summary_list_helpers.rb
which might make this section a bit cleaner. There's an example of how to use it here:app/views/external_users/claims/case_details/_summary.html.haml
.Edit: actually, I can see that there are lots of places in other files here where that helper could potentially be used. Possibly it's too big a change for this PR at this point...