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

#808 Add the rationale for the reasonable adjustments #824

Merged
merged 2 commits into from
Aug 28, 2020
Merged

#808 Add the rationale for the reasonable adjustments #824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da31713
#808 Add the rationale for the reasonable adjustments
lloback Aug 28, 2020
73af172
#808 Add the rationale for the reasonable adjustments
lloback Aug 28, 2020
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: 0 additions & 5 deletions src/store/qualifyingTest/qualifyingTestResponses.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,7 @@ export default {
return unbindFirestoreRef('records');
}),
bindRecord: firestoreAction(({ bindFirestoreRef }, { id } ) => {

// eslint-disable-next-line no-console
// console.log('bind Qualifying test response', id);

const firestoreRef = collectionRef.doc(id);

return bindFirestoreRef('record', firestoreRef, { serialize: vuexfireSerialize });
}),
unbindRecord: firestoreAction(({ unbindFirestoreRef }) => {
Expand Down
69 changes: 50 additions & 19 deletions src/views/Exercises/Tasks/QualifyingTests/QualifyingTest/Response/View.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,15 @@
</ul>
</dd>
</div>
<div class="govuk-summary-list__row">
<div
v-if="response"
class="govuk-summary-list__row"
>
<dt class="govuk-summary-list__key">
Duration
</dt>
<dd class="govuk-summary-list__value">
{{ qualifyingTest.testDuration }} minutes
{{ response.duration.testDurationAdjusted }} minutes
</dd>
</div>
<div class="govuk-summary-list__row">
Expand All @@ -79,13 +82,41 @@
v-if="response"
class="govuk-summary-list__value"
>
<EditableField
:value="response.duration.reasonableAdjustment"
field="reasonableAdjustment"
@changefield="(obj) => actionReasonableAdjustment(obj, response.duration, responseId)"
/>
{{ response.duration.testDurationAdjusted }} minutes:
{{ response.candidate.reasonableAdjustmentsDetails }}
<table class="govuk-table">
<tr class="govuk-table__row">
<td class="govuk-table__cell">
Duration
</td>
<td class="govuk-table__cell">
{{ response.duration.testDuration }} minutes
</td>
</tr>
<tr class="govuk-table__row">
<td class="govuk-table__cell">
Adjustment
</td>
<td class="govuk-table__cell">
<EditableField
:value="response.duration.reasonableAdjustment"
field="reasonableAdjustment"
@changefield="(obj) => actionReasonableAdjustment(obj, response.duration, responseId)"
/>
{{ response.candidate.reasonableAdjustmentsDetails }}
</td>
</tr>
<tr class="govuk-table__row">
<td class="govuk-table__cell">
Justification
</td>
<td class="govuk-table__cell">
<EditableField
:value="response.duration.reasonableAdjustmentsJustification"
field="reasonableAdjustmentsJustification"
@changefield="(obj) => actionReasonableAdjustmentJustification(obj, responseId)"
/>
</td>
</tr>
</table>
</dd>
</div>
</dl>
Expand Down Expand Up @@ -151,20 +182,14 @@ export default {
computed: {
responseId() {
const id = this.$route.params.responseId;
// eslint-disable-next-line no-console
// console.log('id', id);
return id;
},
response() {
const qtList = this.$store.state.qualifyingTestResponses.record;
// eslint-disable-next-line no-console
// console.log('qtList response', qtList);
return qtList;
},
qualifyingTest() {
const qtList = this.$store.state.qualifyingTest.record;
// eslint-disable-next-line no-console
// console.log('qtList qualifyingTest', qtList);
return qtList;
},
candidate() {
Expand All @@ -183,8 +208,6 @@ export default {
},
},
async created() {
// eslint-disable-next-line no-console
// console.log('created');
this.$store.dispatch('qualifyingTestResponses/bindRecord', { id: this.responseId });
},
methods: {
Expand All @@ -193,13 +216,21 @@ export default {
const calculation = reasonableAdjustment + Number(duration.testDuration);
const returnObj = {
duration: {
...this.response.duration,
testDuration: duration.testDuration,
testDurationAdjusted: calculation,
reasonableAdjustment: reasonableAdjustment,
},
};
// eslint-disable-next-line no-console
// console.log('changeReasonableAdjustment', id, obj, duration, returnObj);
this.$store.dispatch('qualifyingTestResponses/updateRA', { data: returnObj, id: id });
},
actionReasonableAdjustmentJustification(obj, id) {
const returnObj = {
duration: {
...this.response.duration,
reasonableAdjustmentsJustification: obj.reasonableAdjustmentsJustification,
},
};
this.$store.dispatch('qualifyingTestResponses/updateRA', { data: returnObj, id: id });
},
},
Expand Down
2 changes: 0 additions & 2 deletions src/views/Exercises/Tasks/QualifyingTests/QualifyingTest/View.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,6 @@ export default {
},
qualifyingTest() {
const record = this.$store.state.qualifyingTest.record;
// eslint-disable-next-line no-console
// console.log('QT record', record);
return record;
},
hasCounts() {
Expand Down