From bb5559e5b4db3940f6f5d96e7076c72c267dab1f Mon Sep 17 00:00:00 2001
From: Tom Russell <TR115251@hotmail.co.uk>
Date: Wed, 21 Apr 2021 18:30:53 +0100
Subject: [PATCH 1/4] v-html to show RTF on ASC

---
 src/views/Apply/Assessments/StatementOfEligibility.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/Apply/Assessments/StatementOfEligibility.vue b/src/views/Apply/Assessments/StatementOfEligibility.vue
index 5daeb172a..f0447f8b4 100644
--- a/src/views/Apply/Assessments/StatementOfEligibility.vue
+++ b/src/views/Apply/Assessments/StatementOfEligibility.vue
@@ -22,9 +22,12 @@
             >
               {{ item.title }}
             </p>
-            <p class="govuk-body">
-              {{ item.text }}
-            </p>
+            <!-- eslint-disable -->
+            <div 
+              class="govuk-body" 
+              v-html="item.text"
+            />
+            <!-- eslint-enable -->
 
             <RadioGroup
               :id="`meet_requirements_${index}`"

From 0ebcb072a345f2840b687cbd62afa5224c47fd5b Mon Sep 17 00:00:00 2001
From: Tom Russell <TR115251@hotmail.co.uk>
Date: Mon, 26 Apr 2021 16:58:42 +0100
Subject: [PATCH 2/4] v-html for ASC on review pages

---
 src/views/Apply/Assessments/StatementOfEligibility.vue | 2 +-
 src/views/Apply/FinalCheck/Review.vue                  | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/Apply/Assessments/StatementOfEligibility.vue b/src/views/Apply/Assessments/StatementOfEligibility.vue
index f0447f8b4..53a15db8f 100644
--- a/src/views/Apply/Assessments/StatementOfEligibility.vue
+++ b/src/views/Apply/Assessments/StatementOfEligibility.vue
@@ -25,7 +25,7 @@
             <!-- eslint-disable -->
             <div 
               class="govuk-body" 
-              v-html="item.text"
+              v-html="vacancy.selectionCriteria[index].text"
             />
             <!-- eslint-enable -->
 
diff --git a/src/views/Apply/FinalCheck/Review.vue b/src/views/Apply/FinalCheck/Review.vue
index 2629e458b..e43e473e2 100644
--- a/src/views/Apply/FinalCheck/Review.vue
+++ b/src/views/Apply/FinalCheck/Review.vue
@@ -1709,6 +1709,11 @@
               >
                 <dt class="govuk-summary-list__key">
                   {{ item.title }}
+                  <!-- eslint-disable -->
+                  <!-- <p
+                    v-html="exercise.selectionCriteria[index].text"
+                  /> -->
+                  <!-- eslint-enable -->
                 </dt>
                 <dd class="govuk-summary-list__value">
                   <span v-if="item.answer">

From ee17dd765093ec6e47cdcc907c72cecd2760a08e Mon Sep 17 00:00:00 2001
From: Tom Russell <TR115251@hotmail.co.uk>
Date: Tue, 27 Apr 2021 16:36:16 +0100
Subject: [PATCH 3/4] display RTF ASC

---
 .../Apply/Assessments/SelfAssessmentCompetencies.vue     | 9 ++++++---
 src/views/Apply/Assessments/StatementOfEligibility.vue   | 2 +-
 src/views/Apply/Assessments/StatementOfSuitability.vue   | 9 ++++++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/views/Apply/Assessments/SelfAssessmentCompetencies.vue b/src/views/Apply/Assessments/SelfAssessmentCompetencies.vue
index e655f8bdc..71bc6a298 100644
--- a/src/views/Apply/Assessments/SelfAssessmentCompetencies.vue
+++ b/src/views/Apply/Assessments/SelfAssessmentCompetencies.vue
@@ -22,9 +22,12 @@
             >
               {{ item.title }}
             </p>
-            <p class="govuk-body">
-              {{ item.text }}
-            </p>
+            <!-- eslint-disable -->
+            <div 
+              class="govuk-body" 
+              v-html="item.text"
+            />
+            <!-- eslint-enable -->
 
             <RadioGroup
               :id="`meet_requirements_${index}`"
diff --git a/src/views/Apply/Assessments/StatementOfEligibility.vue b/src/views/Apply/Assessments/StatementOfEligibility.vue
index 53a15db8f..f0447f8b4 100644
--- a/src/views/Apply/Assessments/StatementOfEligibility.vue
+++ b/src/views/Apply/Assessments/StatementOfEligibility.vue
@@ -25,7 +25,7 @@
             <!-- eslint-disable -->
             <div 
               class="govuk-body" 
-              v-html="vacancy.selectionCriteria[index].text"
+              v-html="item.text"
             />
             <!-- eslint-enable -->
 
diff --git a/src/views/Apply/Assessments/StatementOfSuitability.vue b/src/views/Apply/Assessments/StatementOfSuitability.vue
index abe26ca4e..ffa5494d3 100644
--- a/src/views/Apply/Assessments/StatementOfSuitability.vue
+++ b/src/views/Apply/Assessments/StatementOfSuitability.vue
@@ -22,9 +22,12 @@
             >
               {{ item.title }}
             </p>
-            <p class="govuk-body">
-              {{ item.text }}
-            </p>
+            <!-- eslint-disable -->
+            <div 
+              class="govuk-body" 
+              v-html="item.text"
+            />
+            <!-- eslint-enable -->
 
             <RadioGroup
               :id="`meet_requirements_${index}`"

From 500fa642ecd6af5f07fba1d7d1484686fd39cf9d Mon Sep 17 00:00:00 2001
From: Tom Russell <TR115251@hotmail.co.uk>
Date: Wed, 2 Jun 2021 14:05:29 +0100
Subject: [PATCH 4/4] point asc titles to vacancy not application

---
 .../Assessments/StatementOfEligibility.vue    | 26 +++++++++----------
 src/views/Apply/FinalCheck/Review.vue         |  7 +----
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/src/views/Apply/Assessments/StatementOfEligibility.vue b/src/views/Apply/Assessments/StatementOfEligibility.vue
index f0447f8b4..b47ea3390 100644
--- a/src/views/Apply/Assessments/StatementOfEligibility.vue
+++ b/src/views/Apply/Assessments/StatementOfEligibility.vue
@@ -14,7 +14,7 @@
 
         <div v-if="vacancy.aSCApply && vacancy.selectionCriteria">
           <div
-            v-for="(item, index) in application.selectionCriteriaAnswers"
+            v-for="(item, index) in vacancy.selectionCriteria"
             :key="index"
           >
             <p
@@ -31,7 +31,7 @@
 
             <RadioGroup
               :id="`meet_requirements_${index}`"
-              v-model="item.answer"
+              v-model="application.selectionCriteriaAnswers[index].answer"
               label="Do you meet this requirement?"
             >
               <RadioItem
@@ -40,7 +40,7 @@
               >
                 <TextareaInput
                   :id="`meet_requirements_details${index}`"
-                  v-model="item.answerDetails"
+                  v-model="application.selectionCriteriaAnswers[index].answerDetails"
                   label="In 250 words, tell us how."
                   required
                 />
@@ -87,17 +87,15 @@ export default {
     };
     const data = this.$store.getters['application/data']();
     const application = { ...defaults, ...data };
-    if (application.selectionCriteriaAnswers.length === 0) {
-      const vacancy = this.$store.state.vacancy.record;
-      if (vacancy && vacancy.aSCApply && vacancy.selectionCriteria) {
-        for (let i = 0, len = vacancy.selectionCriteria.length; i < len; ++i) {
-          application.selectionCriteriaAnswers.push({
-            title: vacancy.selectionCriteria[i].title,
-            text: vacancy.selectionCriteria[i].text,
-            answer: null,
-            answerDetails: null,
-          });
-        }
+    const vacancy = this.$store.state.vacancy.record;
+    if (vacancy && vacancy.aSCApply && vacancy.selectionCriteria) {
+      const aSCArray = [];
+      for (let i = 0, len = vacancy.selectionCriteria.length; i < len; ++i) {
+        aSCArray.push({
+          answer: null,
+          answerDetails: null,
+        });
+        application.selectionCriteriaAnswers = aSCArray;
       }
     }
     return {
diff --git a/src/views/Apply/FinalCheck/Review.vue b/src/views/Apply/FinalCheck/Review.vue
index e43e473e2..9672e30c1 100644
--- a/src/views/Apply/FinalCheck/Review.vue
+++ b/src/views/Apply/FinalCheck/Review.vue
@@ -1708,12 +1708,7 @@
                 class="govuk-summary-list__row"
               >
                 <dt class="govuk-summary-list__key">
-                  {{ item.title }}
-                  <!-- eslint-disable -->
-                  <!-- <p
-                    v-html="exercise.selectionCriteria[index].text"
-                  /> -->
-                  <!-- eslint-enable -->
+                  {{ vacancy.selectionCriteria[index].title }}
                 </dt>
                 <dd class="govuk-summary-list__value">
                   <span v-if="item.answer">