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.

Sign up for GitHub

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

#1901 Reasonable Adjustments - Additions to ticket 1842 #1905

Merged
merged 7 commits into from
Mar 8, 2023
Merged

#1901 Reasonable Adjustments - Additions to ticket 1842 #1905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c37d664
add state
HalcyonJAC Feb 20, 2023
f121f7b
add note
HalcyonJAC Feb 20, 2023
7168efe
add note
HalcyonJAC Feb 21, 2023
c7cdf01
update sorting of other applications
HalcyonJAC Feb 22, 2023
5852f36
apply permission
HalcyonJAC Feb 24, 2023
8a39a56
update status option
HalcyonJAC Feb 28, 2023
7b88297
tidy up
HalcyonJAC Mar 1, 2023
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
5 changes: 5 additions & 0 deletions src/filters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,11 @@ const lookup = (value) => {
approved: 'Approved',
denied: 'Denied',

// reasonable adjustments reason
'qualifying-test': 'Qualifying Test',
'scenario-test': 'Scenario Test',
'selection-day': 'Selection Day',

// 'xxx': 'xxx',
null: '[No Answer Provided]',
};
Expand Down
232 changes: 158 additions & 74 deletions src/views/Exercise/Reports/ReasonableAdjustments.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,20 +130,18 @@
<div class="govuk-grid-column-one-third text-right">
<Select
id="reasonalbe-adjustments-status-filter"
v-model="reasonalbeAdjustmentsStatus"
v-model="filterStatus"
class="govuk-!-margin-right-2"
>
<option value="all">
All
</option>
<option value="">
Unassigned
</option>
<option value="approved">
Approved
</option>
<option value="denied">
Denied
<option
v-for="status in reasonableAdjustmentsStatusOptions"
:key="status"
:value="status"
>
{{ status | lookup }}
</option>
</Select>
</div>
Expand All @@ -164,9 +162,9 @@
}"
@change="getTableData"
>
<template #row="{row}">
<template #row="{row, index}">
<TableCell
v-if="reasonalbeAdjustmentsStatus === 'all' || (row.candidate.reasonableAdjustmentsStatus || '') === (reasonalbeAdjustmentsStatus || '')"
v-if="hasStatus(row)"
:title="tableColumns[0].title"
>
<div class="govuk-grid-row">
Expand All @@ -186,63 +184,93 @@
View application
</RouterLink>
</div>
<div class="govuk-grid-column-full">
<h4 class="govuk-!-margin-bottom-1">
Status
</h4>
<Select
id="reasonable-adjustments-status"
:value="row.candidate.reasonableAdjustmentsStatus || ''"
@input="saveReasonableAdjustmentsStatus(row, $event)"
>
<option value="" />
<option value="approved">
Approved
</option>
<option value="denied">
Denied
</option>
</Select>
</div>

<div
v-if="hasPermissions([
PERMISSIONS.applicationRecords.permissions.canUpdateApplicationRecords.value,
])"
>
<div
v-for="(reasonableAdjustmentsState, i) in row.candidate.reasonableAdjustmentsStates"
:key="i"
class="govuk-grid-row"
>
<div class="govuk-grid-column-one-third">
<h4 class="govuk-!-margin-bottom-1">
Status
</h4>
<Select
:id="`reasonable-adjustments-status-${row.candidate.id}-${i}`"
:value="reasonableAdjustmentsState.status || ''"
@input="saveReasonableAdjustmentsStatus(row, $event, i)"
>
<option value="" />
<option
v-for="status in reasonableAdjustmentsStatusOptions"
:key="status"
:value="status"
>
{{ status | lookup }}
</option>
</Select>
</div>
<div class="govuk-grid-column-two-thirds">
<h4 class="govuk-!-margin-bottom-1">
Where the reasonable adjustments was given
</h4>
<Select
:id="`reasonable-adjustments-reason-${row.candidate.id}-${i}`"
:value="reasonableAdjustmentsState.reason || ''"
@input="saveReasonableAdjustmentsReason(row, $event, i)"
>
<option value="" />
<option
v-for="reason in reasonableAdjustmentsReasonOptions"
:key="reason"
:value="reason"
>
{{ reason | lookup }}
</option>
</Select>
<TextareaInput
:id="`reasonable-adjustments-note-${row.candidate.id}-${i}`"
:value="reasonableAdjustmentsState.note"
@input="saveReasonableAdjustmentsNote(row, $event, i)"
/>
</div>
</div>
<div class="govuk-grid-column-full">
<h4 class="govuk-!-margin-top-0 govuk-!-margin-bottom-1">
Where the reasonable adjustments was given
</h4>
<Select
id="reasonable-adjustments-from"
:value="row.candidate.reasonableAdjustmentsFrom || ''"
@input="saveReasonableAdjustmentsFrom(row, $event)"

<div class="text-right">
<button
v-if="row.candidate.reasonableAdjustmentsStates.length < reasonableAdjustmentsReasonOptions.length"
class="print-none govuk-button govuk-!-margin-bottom-0"
@click="addReasonableAdjustmentsState(index)"
>
<option value="" />
<option value="qualifying-test">
Qualifying Test
</option>
<option value="selection-day">
Selection Day
</option>
</Select>
Add another
</button>
</div>
</div>

<div class="govuk-grid-column-two-thirds">
<a
href="#"
class="govuk-link print-none"
@click.prevent="handleReasonableAdjustmentsDetailsClick(row)"
<div>
<a
href="#"
class="govuk-link print-none"
@click.prevent="handleReasonableAdjustmentsDetailsClick(row)"
>
View all reasonable adjustments<span
class="icon-expand"
:class="open[row.id] ? 'open' : 'close'"
>
View all reasonable adjustments<span
class="icon-expand"
:class="open[row.id] ? 'open' : 'close'"
>
<img src="@/assets/expand.svg">
</span>
</a>
</div>
<img src="@/assets/expand.svg">
</span>
</a>
</div>

<div v-if="open[row.id]">
<div
v-for="(ar, index) in getOtherReasonableAdjustments(row.candidate.id)"
:key="`${row.candidate.id}-${index}`"
v-for="(ar, i) in getOtherReasonableAdjustments(row.candidate.id)"
:key="`${row.candidate.id}-${i}`"
>
<hr
class="govuk-section-break govuk-section-break--m govuk-section-break--visible govuk-!-margin-top-2"
Expand Down Expand Up @@ -273,15 +301,47 @@
<p class="govuk-body">
{{ ar.candidate.reasonableAdjustmentsDetails }}
</p>
<p class="govuk-heading-s">
Status:
<span
v-if="ar.candidate.reasonableAdjustmentsStatus"
class="govuk-body"
<ul>
<li
v-for="(reasonableAdjustmentsState, idx) in ar.candidate.reasonableAdjustmentsStates"
:key="idx"
style="display: flex;"
>
{{ ar.candidate.reasonableAdjustmentsStatus | lookup }}
</span>
</p>
<span
class="govuk-heading-s"
style="flex-basis: 200px;"
>
Status:
<span
v-if="reasonableAdjustmentsState.status"
class="govuk-body"
>
{{ reasonableAdjustmentsState.status | lookup }}
</span>
</span>
<span
class="govuk-heading-s"
style="flex-basis: 220px;"
>
Reason:
<span
v-if="reasonableAdjustmentsState.reason"
class="govuk-body"
>
{{ reasonableAdjustmentsState.reason | lookup }}
</span>
</span>
<span class="govuk-heading-s">
Note:
<span
v-if="reasonableAdjustmentsState.note"
class="govuk-body"
>
{{ reasonableAdjustmentsState.note }}
</span>
</span>
</li>
</ul>
</div>
</div>
</div>
Expand All @@ -307,25 +367,33 @@ import Select from '@jac-uk/jac-kit/draftComponents/Form/Select';
import Table from '@jac-uk/jac-kit/components/Table/Table';
import TableCell from '@jac-uk/jac-kit/components/Table/TableCell';
import tableQuery from '@jac-uk/jac-kit/components/Table/tableQuery';
import TextareaInput from '@jac-uk/jac-kit/draftComponents/Form/TextareaInput';
import { downloadXLSX } from '@jac-uk/jac-kit/helpers/export';
import { EXERCISE_STAGE } from '@jac-uk/jac-kit/helpers/constants';
import { applicationRecordCounts } from '@/helpers/exerciseHelper';
import permissionMixin from '@/permissionMixin';
import { debounce } from 'lodash';

export default {
name: 'ReasonableAdjustments',
components: {
Select,
Table,
TableCell,
TextareaInput,
},
mixins: [permissionMixin],
data() {
const reasonableAdjustmentsStatusOptions = ['approved', 'denied'];
const reasonableAdjustmentsReasonOptions = ['qualifying-test', 'scenario-test', 'selection-day'];

return {
exerciseStage: 'all',
candidateStatus: 'all',
availableStatuses: null,
reasonalbeAdjustmentsStatus: 'all',
filterStatus: 'all',
reasonableAdjustmentsStatusOptions,
reasonableAdjustmentsReasonOptions,
applicationRecords: [],
tableColumns: [
{ title: 'Candidate' },
Expand Down Expand Up @@ -413,7 +481,10 @@ export default {
.onSnapshot((snap) => {
const applicationRecords = [];
snap.forEach((doc) => {
applicationRecords.push(vuexfireSerialize(doc));
const data = vuexfireSerialize(doc);
if (!data.candidate.reasonableAdjustmentsStates)
data.candidate.reasonableAdjustmentsStates = [{}];
applicationRecords.push(data);
});
this.applicationRecords = applicationRecords;
});
Expand All @@ -424,14 +495,26 @@ export default {
async candidateSearch(searchTerm) {
return await this.$store.dispatch('candidates/search', { searchTerm: searchTerm });
},
async saveReasonableAdjustmentsStatus(applicationRecord, status) {
applicationRecord.candidate.reasonableAdjustmentsStatus = status;
hasStatus(applicationRecord) {
if (this.filterStatus === 'all') return true;
return applicationRecord.candidate.reasonableAdjustmentsStates.some(state => state.status === this.filterStatus);
},
async saveReasonableAdjustmentsStatus(applicationRecord, status, index) {
applicationRecord.candidate.reasonableAdjustmentsStates[index].status = status;
await this.$store.dispatch('candidateApplications/update', [{ id: applicationRecord.id, data: applicationRecord }]);
},
async saveReasonableAdjustmentsFrom(applicationRecord, value) {
applicationRecord.candidate.reasonableAdjustmentsFrom = value;
async saveReasonableAdjustmentsReason(applicationRecord, reason, index) {
applicationRecord.candidate.reasonableAdjustmentsStates[index].reason = reason;
await this.$store.dispatch('candidateApplications/update', [{ id: applicationRecord.id, data: applicationRecord }]);
},
saveReasonableAdjustmentsNote: debounce(async function (applicationRecord, note, index) {
// use debounce
applicationRecord.candidate.reasonableAdjustmentsStates[index].note = note;
await this.$store.dispatch('candidateApplications/update', [{ id: applicationRecord.id, data: applicationRecord }]);
}, 2000),
addReasonableAdjustmentsState(index) {
this.applicationRecords[index].candidate.reasonableAdjustmentsStates.push({});
},
handleReasonableAdjustmentsDetailsClick(record) {
this.toggleReasonableAdjustmentsDetails(record.id);
const OtherReasonableAdjustments = this.getOtherReasonableAdjustments(record.candidate.id);
Expand All @@ -447,7 +530,8 @@ export default {
const firestoreRef = firestore
.collection('applicationRecords')
.where('candidate.id', '==', record.candidate.id)
.where('candidate.reasonableAdjustments', '==', true);
.where('candidate.reasonableAdjustments', '==', true)
.orderBy('exercise.referenceNumber', 'desc');
const snapshot = await firestoreRef.get();
const otherRecords = [];
snapshot.forEach(doc => {
Expand Down