Skip to content
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

Reports for eligibility and character issues #396

Merged
merged 4 commits into from
Apr 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/filters.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,15 @@ const lookup = (value) => {
'both': 'Both',
'buddhist': 'Buddhist',
'caribbean': 'Caribbean',
'character': 'Character',
'chartered-association-of-building-engineers': 'Chartered Association of Building Engineers',
'chartered-institute-of-building': 'Chartered Institute of Building',
'chartered-institute-of-environmental-health': 'Chartered Institute of Environmental Health',
'chinese': 'Chinese',
'christian': 'Christian',
'cilex': 'CILEx fellow (this might be called Fellow ILEX)',
'CILEx': 'Fellow of the Chartered Institute of Legal Executives (CILEx)',
'citizenship': 'Citizenship',
'civil': 'Civil',
'closed': 'Closed',
'court': 'Court',
Expand Down Expand Up @@ -173,13 +175,15 @@ const lookup = (value) => {
'other-sexual-orientation': 'Other',
'paper-sift': 'Paper sift',
'pakistani': 'Pakistani',
'pqe': 'Post-qualification experience',
'practice-or-employment-as-lawyer': 'Practice or employment as a lawyer',
'pre-launch': 'Pre launch',
'prefer-not-to-say': 'Prefer not to say',
'property-chamber': 'Property Chamber',
'ranked-choice': 'Ranked choice',
'read': 'Read',
'ready': 'Ready for approval',
'rls': 'Reasonable length of service',
'republic-of-ireland': 'Republic of Ireland',
'royal-college-of-psychiatrists': 'Royal College of Psychiatrists',
'royal-institute-of-british-architects': 'Royal Institute of British Architects',
Expand Down
20 changes: 20 additions & 0 deletions src/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ import ExerciseShowReports from '@/views/Exercises/Show/Reports';
import ExerciseShowReportsIndex from '@/views/Exercises/Show/Reports/Index';
import ExerciseShowReportsDiversity from '@/views/Exercises/Show/Reports/Diversity';
import ExerciseShowReportsReasonableAdjustments from '@/views/Exercises/Show/Reports/ReasonableAdjustments';
import ExerciseShowReportsEligibilityIssues from '@/views/Exercises/Show/Reports/EligibilityIssues';
import ExerciseShowReportsCharacterIssues from '@/views/Exercises/Show/Reports/CharacterIssues';

import ExerciseReportsCharacterIssues from '@/views/Exercises/Reports/CharacterIssues';
import ExerciseReportsCharacterChecks from '@/views/Exercises/Reports/CharacterChecks';
Expand Down Expand Up @@ -232,6 +234,24 @@ const router = new Router({
title: 'Exercise Details | Reports | Reasonable Adjustments',
},
},
{
path: 'eligibility',
component: ExerciseShowReportsEligibilityIssues,
name: 'exercise-show-report-eligibility-issues',
meta: {
requiresAuth: true,
title: 'Exercise Details | Reports | Eligibility Issues',
},
},
{
path: 'character',
component: ExerciseShowReportsCharacterIssues,
name: 'exercise-show-report-character-issues',
meta: {
requiresAuth: true,
title: 'Exercise Details | Reports | Character Issues',
},
},
],
},
],
Expand Down
8 changes: 7 additions & 1 deletion src/styles/print.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
@media print {
#header,
.govuk-back-link,
.jac-button-group {
.jac-button-group,
.govuk-button,
.print-none {
display: none;
}

.print-full-width {
width: 100%;
}

.govuk-width-container {
margin-top: govuk-spacing(4);
margin-bottom: govuk-spacing(4);
Expand Down
2 changes: 1 addition & 1 deletion src/views/Dashboard.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div>
<div class="govuk-grid-row">
<div class="govuk-grid-row print-none">
<div class="govuk-grid-column-full">
<div class="text-right">
<button
Expand Down
10 changes: 6 additions & 4 deletions src/views/Exercises/Show.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
:load-failed="loadFailed"
/>
<div v-else>
<div class="govuk-grid-row">
<div class="govuk-grid-row print-none">
<div class="govuk-grid-column-one-quarter">
<router-link
class="govuk-back-link"
Expand All @@ -31,21 +31,21 @@
</h1>
<router-link
v-if="isEditable"
class="govuk-link"
class="govuk-link print-none"
:to="{name: 'exercise-edit-name'}"
>
Edit name
</router-link>
</div>
</div>
<div class="govuk-grid-row">
<div class="govuk-grid-column-one-quarter">
<div class="govuk-grid-column-one-quarter print-none">
<Navigation
:items="navPages"
label="Main Navigation"
/>
</div>
<div class="govuk-grid-column-three-quarters">
<div class="govuk-grid-column-three-quarters print-full-width">
<RouterView />
</div>
</div>
Expand Down Expand Up @@ -133,7 +133,9 @@ export default {
page: 'Exercise reports',
name: 'exercise-show-reports',
children: [
{ page: 'Character Issues', name: 'exercise-show-report-character-issues' },
{ page: 'Diversity', name: 'exercise-show-report-diversity' },
{ page: 'Eligibility Issues', name: 'exercise-show-report-eligibility-issues' },
{ page: 'Reasonable Adjustments', name: 'exercise-show-report-reasonable-adjustments' },
],
});
Expand Down
13 changes: 6 additions & 7 deletions src/views/Exercises/Show/Application.vue
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
<template>
<div class="govuk-grid-row">
<div class="govuk-grid-column-full">
<router-link
v-if="exerciseId"
class="govuk-back-link"
:to="{name: 'exercise-show-applications', params: { id: exerciseId }}"
>
Back
</router-link>
<BackLink />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍


<div id="download-as-pdf-div">
<h1 class="govuk-heading-xl govuk-!-margin-bottom-4">
Expand All @@ -21,7 +15,12 @@
</template>

<script>
import BackLink from '@/components/BackLink';

export default {
components: {
BackLink,
},
computed: {
application() {
return this.$store.state.application.record;
Expand Down
Loading