diff --git a/src/components/ActionButton.vue b/src/components/ActionButton.vue index fdd7d06c7..4d8428883 100644 --- a/src/components/ActionButton.vue +++ b/src/components/ActionButton.vue @@ -1,13 +1,13 @@ + + diff --git a/src/filters.js b/src/filters.js index e97d2c630..96b9217e3 100644 --- a/src/filters.js +++ b/src/filters.js @@ -6,6 +6,8 @@ const formatDate = (value, type) => { return `${objDate.toLocaleString('en-GB', { month: 'long' })} ${objDate.getUTCFullYear()}`; case 'datetime': return objDate.toLocaleString('en-GB'); + case 'long': + return objDate.toLocaleDateString('en-GB', { year: 'numeric', month: 'long', day: 'numeric' }); default: return objDate.toLocaleDateString('en-GB'); } diff --git a/src/views/Exercises/Show/IndependentAssessments.vue b/src/views/Exercises/Show/IndependentAssessments.vue index 00994257c..2ef8db99e 100644 --- a/src/views/Exercises/Show/IndependentAssessments.vue +++ b/src/views/Exercises/Show/IndependentAssessments.vue @@ -10,7 +10,7 @@ Contact date
- {{ exercise.contactIndependentAssessors | formatDate }} + {{ exercise.contactIndependentAssessors | formatDate('long') }}
- {{ exercise.independentAssessmentsReturnDate | formatDate }} + {{ exercise.independentAssessmentsReturnDate | formatDate('long') }}
Start Assessments @@ -44,6 +45,7 @@
Send to all @@ -137,23 +139,34 @@ {{ assessment.candidate.fullName }} -

- - {{ assessment.assessor.fullName }} - -

+ + {{ assessment.assessor.fullName }} + {{ assessment.status | lookup }} - +