-
Notifications
You must be signed in to change notification settings - Fork 9
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
Update Providers Reports index #9359
Merged
Merged
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
90dc2a5
Update Providers Reports index
inulty-dfe f0948a4
Add CycleTimetable.cycle_week_date_range
inulty-dfe bf11ac4
Format recruitment performance report link
inulty-dfe 7d49104
Add spec for CycleTimetable.cycle_week_date_range
inulty-dfe a292728
Change link text to reference the reporting date of the report
inulty-dfe 33847a0
Only show weekly performance provider name if multiple providers
inulty-dfe cc57bf2
Show mid cycle header if provider has mid cycle reports
inulty-dfe 5a71ff8
Set Reports headings to locales
inulty-dfe 6d6aa59
Rename reporting_date to reporting_end_date
inulty-dfe 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,8 @@ | ||
module ProviderInterface | ||
class ReportsController < ProviderInterfaceController | ||
def index | ||
@providers = current_user.providers | ||
@providers = current_user.providers.preload(:performance_reports) | ||
@performance_reports = current_user.providers.any? { _1.performance_reports.present? } | ||
end | ||
end | ||
end |
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 |
---|---|---|
|
@@ -5,46 +5,69 @@ | |
<h1 class="govuk-heading-l"> | ||
<%= t('page_titles.provider.reports') %> | ||
</h1> | ||
<ul class="govuk-list govuk-list--spaced"> | ||
<li> | ||
<%= govuk_link_to t('page_titles.provider.export_application_data'), provider_interface_new_application_data_export_path %> | ||
</li> | ||
<li> | ||
<%= govuk_link_to t('page_titles.provider.export_hesa_data'), provider_interface_reports_hesa_exports_path %> | ||
</li> | ||
<% if @providers.one? %> | ||
<li> | ||
<%= govuk_link_to t('page_titles.provider.status_of_active_applications'), provider_interface_reports_provider_status_of_active_applications_path(provider_id: @providers.first) %> | ||
</li> | ||
<li> | ||
<%= govuk_link_to t('page_titles.provider.diversity_report'), provider_interface_reports_provider_diversity_report_path(provider_id: @providers.first) %> | ||
</li> | ||
<li> | ||
<%= govuk_link_to t('page_titles.provider.withdrawal_report'), provider_interface_reports_provider_withdrawal_report_path(provider_id: @providers.first) %> | ||
</li> | ||
<% if mid_cycle_report_present_for?(@providers.first) %> | ||
<%= govuk_link_to mid_cycle_report_label_for(@providers.first), provider_interface_reports_provider_mid_cycle_report_path(provider_id: @providers.first) %> | ||
|
||
<% if FeatureFlag.active?(:recruitment_performance_report) %> | ||
<% if @performance_reports %> | ||
<h2 class="govuk-heading-m"> | ||
Weekly recruitment performance report | ||
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. I think we should be consistent with the locales and put this in a locale file. (same for the other text on this page) |
||
</h2> | ||
<% end %> | ||
|
||
<% @providers.select { _1.performance_reports.any? }.each do |provider| %> | ||
<% if @providers.many? %> | ||
<h3 class="govuk-heading-s"><%= provider.name %></h3> | ||
<% end %> | ||
<% report = provider.performance_reports.last %> | ||
<ul class="govuk-list govuk-list--spaced"> | ||
<li><%= govuk_link_to("Weekly report for week ending #{report.reporting_date.to_fs(:govuk_date)}", provider_interface_reports_provider_recruitment_performance_report_path(provider.id)) %></li> | ||
</ul> | ||
<% end %> | ||
</ul> | ||
<% if @providers.many? %> | ||
<% @providers.each do |provider| %> | ||
<h2 class="govuk-heading-m"><%= provider.name %></h2> | ||
<% else %> | ||
<% if @providers.any? { mid_cycle_report_present_for?(_1) } %> | ||
<h2 class="govuk-heading-m"> | ||
Mid-cycle recruitment performance report | ||
</h2> | ||
<% end %> | ||
|
||
<% @providers.select { mid_cycle_report_present_for?(_1) }.each do |provider| %> | ||
<h3 class="govuk-heading-s"><%= provider.name %></h3> | ||
|
||
<ul class="govuk-list govuk-list--spaced"> | ||
<li> | ||
<%= govuk_link_to t('page_titles.provider.status_of_active_applications'), provider_interface_reports_provider_status_of_active_applications_path(provider_id: provider) %> | ||
<% if mid_cycle_report_present_for?(provider) %> | ||
<%= govuk_link_to mid_cycle_report_label_for(provider), provider_interface_reports_provider_mid_cycle_report_path(provider_id: provider) %> | ||
<% end %> | ||
</li> | ||
<li> | ||
<%= govuk_link_to t('page_titles.provider.diversity_report'), provider_interface_reports_provider_diversity_report_path(provider_id: provider) %> | ||
</li> | ||
<li> | ||
<%= govuk_link_to t('page_titles.provider.withdrawal_report'), provider_interface_reports_provider_withdrawal_report_path(provider_id: provider) %> | ||
</li> | ||
<% if mid_cycle_report_present_for?(provider) %> | ||
<%= govuk_link_to mid_cycle_report_label_for(provider), provider_interface_reports_provider_mid_cycle_report_path(provider_id: provider) %> | ||
<% end %> | ||
</ul> | ||
<% end %> | ||
<% end %> | ||
|
||
<h2 class="govuk-heading-m">Application data for this recruitment cycle</h2> | ||
<% @providers.each do |provider| %> | ||
<% if @providers.many? %> | ||
<h3 class="govuk-heading-s"><%= provider.name %></h3> | ||
<% end %> | ||
<ul class="govuk-list govuk-list--spaced"> | ||
<li> | ||
<%= govuk_link_to t('page_titles.provider.status_of_active_applications'), provider_interface_reports_provider_status_of_active_applications_path(provider_id: provider) %> | ||
</li> | ||
<li> | ||
<%= govuk_link_to t('page_titles.provider.diversity_report'), provider_interface_reports_provider_diversity_report_path(provider_id: provider) %> | ||
</li> | ||
<li> | ||
<%= govuk_link_to t('page_titles.provider.withdrawal_report'), provider_interface_reports_provider_withdrawal_report_path(provider_id: provider) %> | ||
</li> | ||
</ul> | ||
<% end %> | ||
|
||
<h2 class="govuk-heading-m">Download and export</h2> | ||
<ul class="govuk-list govuk-list--spaced"> | ||
<li> | ||
<%= govuk_link_to t('page_titles.provider.export_application_data'), provider_interface_new_application_data_export_path %> | ||
</li> | ||
<li> | ||
<%= govuk_link_to t('page_titles.provider.export_hesa_data'), provider_interface_reports_hesa_exports_path %> | ||
</li> | ||
</ul> | ||
</div> | ||
</div> |
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
105 changes: 0 additions & 105 deletions
105
spec/system/provider_interface/provider_reports_page_spec.rb
This file was deleted.
Oops, something went wrong.
38 changes: 38 additions & 0 deletions
38
spec/system/provider_interface/reports/index_provider_user_one_provider_spec.rb
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,38 @@ | ||
require 'rails_helper' | ||
|
||
RSpec.feature 'Provider reports index' do | ||
include DfESignInHelpers | ||
scenario 'when provider user has one provider' do | ||
given_a_provider_and_provider_user_exists | ||
and_i_am_signed_in_as_provider_user | ||
when_i_visit_the_reports_index | ||
then_the_page_has_the_right_content | ||
end | ||
|
||
def when_i_visit_the_reports_index | ||
visit provider_interface_reports_path | ||
expect(page).to have_current_path('/provider/reports') | ||
end | ||
|
||
def given_a_provider_and_provider_user_exists | ||
@provider_user = create(:provider_user, :with_dfe_sign_in, email_address: '[email protected]') | ||
@provider = @provider_user.providers.first | ||
end | ||
|
||
def then_the_page_has_the_right_content | ||
expect(page).to have_css('h1', text: 'Reports') | ||
expect(page).to have_css('h2', text: 'Application data for this recruitment cycle') | ||
expect(page).to have_link('Status of active applications', href: provider_interface_reports_provider_status_of_active_applications_path(provider_id: @provider)) | ||
expect(page).to have_link('Sex, disability, ethnicity and age of candidates', href: provider_interface_reports_provider_diversity_report_path(provider_id: @provider)) | ||
expect(page).to have_link('Withdrawals', href: provider_interface_reports_provider_withdrawal_report_path(provider_id: @provider)) | ||
expect(page).to have_css('h2', text: 'Download and export') | ||
expect(page).to have_link('Export application data', href: provider_interface_new_application_data_export_path) | ||
expect(page).to have_link('Export data for Higher Education Statistics Agency (HESA)', href: provider_interface_reports_hesa_exports_path) | ||
end | ||
|
||
def and_i_am_signed_in_as_provider_user | ||
provider_exists_in_dfe_sign_in | ||
provider_signs_in_using_dfe_sign_in | ||
expect(page).to have_current_path('/provider/applications') | ||
end | ||
end |
Oops, something went wrong.
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.
I think the name of this one is confusing. I would think 'reporting date' would be the date the report was created, which is the publications date. Maybe
reporting_end_date
.report_range_end_date