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

#1071 Fix eligibility issues report #1140

Merged
merged 2 commits into from
Jan 18, 2021
+12 −24
Merged

#1071 Fix eligibility issues report #1140

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bed2577
#1071 Fix eligibility issues report
warrensearle Jan 12, 2021
3db26b5
Merge branch 'develop' into feature/1071-eligibility-issues
warrensearle Jan 18, 2021
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
36 changes: 12 additions & 24 deletions src/views/Exercises/Show/Reports/EligibilityIssues.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,10 @@
-->
<Table
data-key="id"
:data="applications"
:data="applicationRecords"
:columns="[
{ title: 'Candidate', sort: 'personalDetails.fullName', default: true },
{ title: 'Candidate' },
]"
:search="['personalDetails.fullName']"
:page-size="10"
@change="getTableData"
>
Expand All @@ -38,7 +37,7 @@
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<div class="candidate-name govuk-heading-m govuk-!-margin-bottom-0">
{{ row.referenceNumber }} <span v-if="row.personalDetails">{{ row.personalDetails.fullName }}</span>
{{ row.referenceNumber }} <span v-if="row.candidate">{{ row.candidate.fullName }}</span>
</div>
</div>
<div class="govuk-grid-column-one-third text-right">
Expand All @@ -52,7 +51,7 @@
</div>

<div
v-for="(issue, index) in row.processing.eligibilityIssues"
v-for="(issue, index) in row.issues.eligibilityIssues"
:key="index"
class="govuk-grid-row govuk-!-margin-0 govuk-!-margin-bottom-4"
>
Expand All @@ -64,16 +63,6 @@
<div class="issue">
<span class="govuk-!-font-weight-bold">{{ issue.type | lookup }}:</span> {{ issue.summary }}
</div>
<div
v-if="issue.type == 'rls-issue'"
class="relevant-info"
>
<span class="govuk-!-font-weight-bold">Date of birth:</span> {{ row.personalDetails.dateOfBirth | formatDate }}<br>
<span
v-if="row.canGiveReasonableLOS"
class="govuk-!-font-weight-bold"
>Candidate comments:</span> {{ row.cantGiveReasonableLOSDetails }}
</div>
<div
v-if="issue.comments"
class="jac-comments"
Expand Down Expand Up @@ -122,7 +111,7 @@ export default {
},
data () {
return {
applications: [],
applicationRecords: [],
refreshingReport: false,
unsubscribe: null,
};
Expand All @@ -145,18 +134,17 @@ export default {
},
getTableData(params) {
let firestoreRef = firestore
.collection('applications')
.where('exerciseId', '==', this.exercise.id)
.where('status', '==', 'applied')
.where('processing.flags.eligibilityIssues', '==', true);
firestoreRef = tableQuery(this.applications, firestoreRef, params);
.collection('applicationRecords')
.where('exercise.id', '==', this.exercise.id)
.where('flags.eligibilityIssues', '==', true);
firestoreRef = tableQuery(this.applicationRecords, firestoreRef, params);
this.unsubscribe = firestoreRef
.onSnapshot((snap) => {
const applications = [];
const applicationRecords = [];
snap.forEach((doc) => {
applications.push(vuexfireSerialize(doc));
applicationRecords.push(vuexfireSerialize(doc));
});
this.applications = applications;
this.applicationRecords = applicationRecords;
});
},
},
Expand Down