From 19aa67da5f93764caf88f39ea71bd171b472cf1e Mon Sep 17 00:00:00 2001
From: Tom Russell <TR115251@hotmail.co.uk>
Date: Wed, 5 May 2021 15:35:58 +0100
Subject: [PATCH 1/8] wip

---
 .../RepeatableFields/Qualification.vue        |  16 +++
 .../SelectionInput/RankedChoice.vue           | 102 ++++++++++++++----
 .../SelectionInput/SelectionInput.vue         |  21 ++--
 src/views/Apply/FinalCheck/Review.vue         |   7 +-
 .../LocationPreferences.vue                   |   6 +-
 5 files changed, 114 insertions(+), 38 deletions(-)

diff --git a/src/components/RepeatableFields/Qualification.vue b/src/components/RepeatableFields/Qualification.vue
index 91871414e..4f6e73f57 100644
--- a/src/components/RepeatableFields/Qualification.vue
+++ b/src/components/RepeatableFields/Qualification.vue
@@ -58,6 +58,22 @@
         v-model="row.qualificationNotComplete"
         label="I did not complete pupillage"
       />
+
+      <DateInput
+        v-if="row.qualificationNotComplete && !row.notCalledToBar"
+        :id="`called_to_bar_date_${index}`"
+        v-model="row.calledToBarDate"
+        label="When were you called to the bar?"
+        type="month"
+      />
+
+      <Checkbox
+        v-if="row.qualificationNotComplete"
+        :id="`called_to_bar_${index}`"
+        v-model="row.notCalledToBar"
+        label="I was not called to the bar"
+      />
+
       <TextareaInput
         v-if="row.qualificationNotComplete"
         :id="details"
diff --git a/src/components/SelectionInput/RankedChoice.vue b/src/components/SelectionInput/RankedChoice.vue
index 6c2883f55..e9d2cbf51 100644
--- a/src/components/SelectionInput/RankedChoice.vue
+++ b/src/components/SelectionInput/RankedChoice.vue
@@ -24,10 +24,10 @@
         v-if="selected.indexOf(answer.answer) >= 0"
         v-model="ranking[answer.answer]"
         class="govuk-select"
-        @change="update"
+        @change="update($event, answer.answer)"
       >
         <option
-          v-for="score in answers.length"
+          v-for="score in selected.length"
           :key="score"
           :value="score"
         >
@@ -35,12 +35,20 @@
         </option>
       </select>      
     </div>
+    selected:{{ selected }}
+    <br>
+    ranking: {{ ranking }}
+    <br>
+    <!-- selectable: {{ selectable }} -->
+    <br>
+    <!-- answers: {{ answers }} -->
   </div>
 </template>
 
 <script>
 
 export default {
+  name: 'RankedChoice',
   props: {
     id: {
       type: String,
@@ -71,29 +79,79 @@ export default {
       }
     }
   },
+  updated() {
+    // console.log(this.ranking);
+  },
   methods: {
-    update() {
-      const rankedSelection = [];
-      const cleanedRanking = {};
-      for (let i = 0, len = this.selected.length; i < len; ++i) {
-        if (!this.ranking[this.selected[i]]) { this.ranking[this.selected[i]] = this.selected.length; }
-        rankedSelection.push({ answer: this.selected[i], rank: this.ranking[this.selected[i]] });
-        cleanedRanking[this.selected[i]] = this.ranking[this.selected[i]];
-      }
-      this.ranking = cleanedRanking;
-      this.selected = rankedSelection.sort(( item1, item2 ) => {
-        if (item1.rank < item2.rank) {
-          return -1;
-        } else if (item1.rank > item2.rank) {
-          return 1;
-        } else {
-          return 0;
+    update(event, answer) {
+      const sortRanking = {};
+      // if (this.selected.length) {
+      //   // if (this.selected.length < Object.keys(this.ranking).length) {
+      if (this.selected.length > 1) {
+        this.selected.forEach((selection, i) => {
+          sortRanking[selection] = i + 1;
+        });
+      } else { 
+        this.ranking = {
+          [`${this.selected[0]}`]: 1,
+        };
+        // choice swap
+        const targetValue = parseInt(event.target.value);
+        console.log(targetValue);
+        if (targetValue) {
+          
+          const indexOfDuplicate = Object.values(sortRanking).findIndex((element) => element === targetValue);
+          const duplicateItem = Object.keys(sortRanking)[indexOfDuplicate];
+
+          sortRanking[duplicateItem] = sortRanking[answer];
+          sortRanking[answer] = targetValue;
+
+          this.ranking = sortRanking;
+          const rankedOrder = [];
+
+          for (const [item, rank] of Object.entries(this.ranking)) {
+            // console.log(item, rank);
+            rankedOrder[parseInt(rank) - 1] = item;
+          }
+
+          this.selected = rankedOrder;
+
+          this.$emit('input', this.selected);
         }
-      }).map((item) => {
-        return item.answer;
-      });
-      this.$emit('input', this.selected);
+      }
     },
+    // update() {
+    //   const rankedSelection = [];
+    //   const cleanedRanking = {};
+
+    //   if (this.selected.length > 1) {
+      
+    //     this.selected.forEach((selection) => {
+      
+    //       if (!this.ranking[selection]) { 
+    //         this.ranking[selection] = this.selected.length; 
+    //       }
+
+    //       rankedSelection.push({ answer: selection, rank: this.ranking[selection] });
+    //       cleanedRanking[selection] = this.ranking[selection];
+    //     });
+
+    //     this.ranking = cleanedRanking;
+    //     this.selected = rankedSelection.sort(( item1, item2 ) => {
+    //       if (item1.rank < item2.rank) {
+    //         return -1;
+    //       } else if (item1.rank > item2.rank) {
+    //         return 1;
+    //       } else {
+    //         return 0;
+    //       }
+    //     }).map((item) => {
+    //       return item.answer;
+    //     });
+    //   }
+
+    //   this.$emit('input', this.selected);
+    // },
   },  
 };
 
diff --git a/src/components/SelectionInput/SelectionInput.vue b/src/components/SelectionInput/SelectionInput.vue
index f2dcc7926..abddf3e9e 100644
--- a/src/components/SelectionInput/SelectionInput.vue
+++ b/src/components/SelectionInput/SelectionInput.vue
@@ -11,7 +11,7 @@
         :id="`${id}-hint`"
         class="govuk-hint"
       >
-        {{ hint }}
+        {{ typeHint }}
       </span>
 
       <SingleChoice
@@ -42,13 +42,16 @@
 import SingleChoice from '@/components/SelectionInput/SingleChoice';
 import MultipleChoice from '@/components/SelectionInput/MultipleChoice';
 import RankedChoice from '@/components/SelectionInput/RankedChoice';
+import FormField from '@/components/Form/FormField';
 
 export default {
+  name: 'SelectionInput',
   components: {
     SingleChoice,
     MultipleChoice,
     RankedChoice,
   },  
+  extends: FormField,
   props: {
     id: {
       type: String,
@@ -81,17 +84,11 @@ export default {
         this.$emit('input', val);
       },
     },
-    hint() {
-      switch (this.type) {
-      case 'single-choice':
-        return 'Select one answer';
-      case 'multiple-choice':
-        return 'Select all that apply';
-      case 'ranked-choice':
-        return 'Select and rank all that apply. With 1 being your top choice';
-      default:
-        return '';
-      }
+    typeHint(){
+      return this.type === 'single-choice' ? 'Select one answer' : 
+        this.type === 'multiple-choice' ? 'Select all that apply' :
+        this.type === 'ranked-choice' ? 'Select and rank all that apply. With 1 being your top choice' :
+        '';
     },
     isSingleChoice() {
       return this.type === 'single-choice';
diff --git a/src/views/Apply/FinalCheck/Review.vue b/src/views/Apply/FinalCheck/Review.vue
index 2629e458b..e80a977e4 100644
--- a/src/views/Apply/FinalCheck/Review.vue
+++ b/src/views/Apply/FinalCheck/Review.vue
@@ -558,11 +558,14 @@
                 class="govuk-summary-list__value"
               >
                 <p
-                  v-for="item in application.locationPreferences"
+                  v-for="(item, index) in application.locationPreferences"
                   :key="item.name"
                   class="govuk-body"
                 >
-                  {{ item }}
+                  <strong>
+                    {{ `${index + 1}:` }}
+                  </strong>
+                  {{ `${item}` }}
                 </p>
               </dd>
             </dl>
diff --git a/src/views/Apply/WorkingPreferences/LocationPreferences.vue b/src/views/Apply/WorkingPreferences/LocationPreferences.vue
index 677ca44b1..1a47dc14a 100644
--- a/src/views/Apply/WorkingPreferences/LocationPreferences.vue
+++ b/src/views/Apply/WorkingPreferences/LocationPreferences.vue
@@ -19,13 +19,15 @@
         <SelectionInput
           id="location-preferences"
           v-model="application.locationPreferences"
+          :label="`'${vacancy.locationQuestion}'`"
           :title="vacancy.locationQuestion"
           :answers="vacancy.locationQuestionAnswers"
           :type="vacancy.locationQuestionType"
+          required
         /> 
 
         <button
-          :disabled="!application.locationPreferences || application.status != 'draft'"
+          :disabled="application.status != 'draft'"
           class="govuk-button info-btn--location-pref--save-and-continue"
         >
           Save and continue
@@ -69,7 +71,7 @@ export default {
       if (this.isValid()) {
         this.application.progress.locationPreferences = true;
         await this.$store.dispatch('application/save', this.application);
-        this.$router.push({ name: 'task-list' });
+        // this.$router.push({ name: 'task-list' });
       }
     },
   },

From 57fc698724aefde8b8d0de9783084e0293058c93 Mon Sep 17 00:00:00 2001
From: Tom Russell <TR115251@hotmail.co.uk>
Date: Wed, 5 May 2021 16:59:05 +0100
Subject: [PATCH 2/8] wip

---
 .../SelectionInput/RankedChoice.vue           | 76 +++++--------------
 1 file changed, 18 insertions(+), 58 deletions(-)

diff --git a/src/components/SelectionInput/RankedChoice.vue b/src/components/SelectionInput/RankedChoice.vue
index e9d2cbf51..878e3f8c4 100644
--- a/src/components/SelectionInput/RankedChoice.vue
+++ b/src/components/SelectionInput/RankedChoice.vue
@@ -35,13 +35,6 @@
         </option>
       </select>      
     </div>
-    selected:{{ selected }}
-    <br>
-    ranking: {{ ranking }}
-    <br>
-    <!-- selectable: {{ selectable }} -->
-    <br>
-    <!-- answers: {{ answers }} -->
   </div>
 </template>
 
@@ -85,8 +78,6 @@ export default {
   methods: {
     update(event, answer) {
       const sortRanking = {};
-      // if (this.selected.length) {
-      //   // if (this.selected.length < Object.keys(this.ranking).length) {
       if (this.selected.length > 1) {
         this.selected.forEach((selection, i) => {
           sortRanking[selection] = i + 1;
@@ -95,63 +86,32 @@ export default {
         this.ranking = {
           [`${this.selected[0]}`]: 1,
         };
-        // choice swap
-        const targetValue = parseInt(event.target.value);
-        console.log(targetValue);
-        if (targetValue) {
-          
-          const indexOfDuplicate = Object.values(sortRanking).findIndex((element) => element === targetValue);
-          const duplicateItem = Object.keys(sortRanking)[indexOfDuplicate];
-
-          sortRanking[duplicateItem] = sortRanking[answer];
-          sortRanking[answer] = targetValue;
+      }
 
-          this.ranking = sortRanking;
-          const rankedOrder = [];
+      // choice swap
+      const targetValue = parseInt(event.target.value);
+      if (!isNaN(targetValue)) {
+          
+        const indexOfDuplicate = Object.values(sortRanking).findIndex((element) => element === targetValue);
+        const duplicateItem = Object.keys(sortRanking)[indexOfDuplicate];
 
-          for (const [item, rank] of Object.entries(this.ranking)) {
-            // console.log(item, rank);
-            rankedOrder[parseInt(rank) - 1] = item;
-          }
+        sortRanking[duplicateItem] = sortRanking[answer];
+        sortRanking[answer] = targetValue;
 
-          this.selected = rankedOrder;
+        this.ranking = sortRanking;
+        const rankedOrder = [];
 
-          this.$emit('input', this.selected);
+        for (const [item, rank] of Object.entries(this.ranking)) {
+          // console.log(item, rank);
+          rankedOrder[parseInt(rank) - 1] = item;
         }
-      }
-    },
-    // update() {
-    //   const rankedSelection = [];
-    //   const cleanedRanking = {};
-
-    //   if (this.selected.length > 1) {
-      
-    //     this.selected.forEach((selection) => {
-      
-    //       if (!this.ranking[selection]) { 
-    //         this.ranking[selection] = this.selected.length; 
-    //       }
 
-    //       rankedSelection.push({ answer: selection, rank: this.ranking[selection] });
-    //       cleanedRanking[selection] = this.ranking[selection];
-    //     });
+        this.selected = rankedOrder;
 
-    //     this.ranking = cleanedRanking;
-    //     this.selected = rankedSelection.sort(( item1, item2 ) => {
-    //       if (item1.rank < item2.rank) {
-    //         return -1;
-    //       } else if (item1.rank > item2.rank) {
-    //         return 1;
-    //       } else {
-    //         return 0;
-    //       }
-    //     }).map((item) => {
-    //       return item.answer;
-    //     });
-    //   }
+        this.$emit('input', this.selected);
+      }
 
-    //   this.$emit('input', this.selected);
-    // },
+    },
   },  
 };
 

From 8fc1ceb69fb4771d120e6cd42fca29166f0fc243 Mon Sep 17 00:00:00 2001
From: Tom Russell <TR115251@hotmail.co.uk>
Date: Thu, 6 May 2021 15:36:09 +0100
Subject: [PATCH 3/8] ranked choice changes

---
 .../SelectionInput/RankedChoice.vue           | 111 ++++++------------
 .../SelectionInput/SelectionInput.vue         |   2 +-
 .../LocationPreferences.vue                   |   2 +-
 3 files changed, 40 insertions(+), 75 deletions(-)

diff --git a/src/components/SelectionInput/RankedChoice.vue b/src/components/SelectionInput/RankedChoice.vue
index 878e3f8c4..fb8ab3fd2 100644
--- a/src/components/SelectionInput/RankedChoice.vue
+++ b/src/components/SelectionInput/RankedChoice.vue
@@ -1,41 +1,42 @@
 <template>
-  <div class="govuk-checkboxes">
-    <div
-      v-for="(answer, index) in answers"
-      :key="index"
-      class="govuk-checkboxes__item"
-    >
-      <input
-        :id="`${id}-answer-${index}`"
-        v-model="selected"
-        :name="`${id}-answer-${index}`"
-        :value="answer.answer"
-        type="checkbox"
-        class="govuk-checkboxes__input"
-        @change="update"
+  <!-- <table class="govuk-table"> -->
+  <table>
+    <tbody class="govuk-table__body">
+      <tr 
+        v-for="(answer, i) in answers"
+        :key="i"
+        class="govuk-table__row"
       >
-      <label
-        :for="`${id}-answer-${index}`"
-        class="govuk-label govuk-checkboxes__label"
-      >
-        {{ answer.answer }}
-      </label>
-      <select 
-        v-if="selected.indexOf(answer.answer) >= 0"
-        v-model="ranking[answer.answer]"
-        class="govuk-select"
-        @change="update($event, answer.answer)"
-      >
-        <option
-          v-for="score in selected.length"
-          :key="score"
-          :value="score"
+        <th
+          class="govuk-table__cell govuk-!-padding-top-0"
         >
-          {{ score }}
-        </option>
-      </select>      
-    </div>
-  </div>
+          <div class="govuk-checkboxes__item">
+            <input
+              v-model="selected"
+              :name="`${id}-answer-${i}`"
+              :value="answer.answer"
+              type="checkbox"
+              class="govuk-checkboxes__input"
+              @change="update"
+            >
+            <label
+              class="govuk-label govuk-checkboxes__label"
+              :for="`${id}-answer-${i}`"
+            >
+              {{ answer.answer }}  
+            </label>
+          </div>
+        </th>
+        <td class="govuk-table__cell">
+          <label
+            class="govuk-label govuk-checkboxes__label"
+          >
+            {{ selected.some(item => item === answer.answer) ? selected.findIndex(item => item === answer.answer) + 1 : '' }} 
+          </label>
+        </td>
+      </tr>
+    </tbody>
+  </table>   
 </template>
 
 <script>
@@ -72,45 +73,9 @@ export default {
       }
     }
   },
-  updated() {
-    // console.log(this.ranking);
-  },
   methods: {
-    update(event, answer) {
-      const sortRanking = {};
-      if (this.selected.length > 1) {
-        this.selected.forEach((selection, i) => {
-          sortRanking[selection] = i + 1;
-        });
-      } else { 
-        this.ranking = {
-          [`${this.selected[0]}`]: 1,
-        };
-      }
-
-      // choice swap
-      const targetValue = parseInt(event.target.value);
-      if (!isNaN(targetValue)) {
-          
-        const indexOfDuplicate = Object.values(sortRanking).findIndex((element) => element === targetValue);
-        const duplicateItem = Object.keys(sortRanking)[indexOfDuplicate];
-
-        sortRanking[duplicateItem] = sortRanking[answer];
-        sortRanking[answer] = targetValue;
-
-        this.ranking = sortRanking;
-        const rankedOrder = [];
-
-        for (const [item, rank] of Object.entries(this.ranking)) {
-          // console.log(item, rank);
-          rankedOrder[parseInt(rank) - 1] = item;
-        }
-
-        this.selected = rankedOrder;
-
-        this.$emit('input', this.selected);
-      }
-
+    update() {
+      this.$emit('input', this.selected);
     },
   },  
 };
diff --git a/src/components/SelectionInput/SelectionInput.vue b/src/components/SelectionInput/SelectionInput.vue
index abddf3e9e..6c78965a8 100644
--- a/src/components/SelectionInput/SelectionInput.vue
+++ b/src/components/SelectionInput/SelectionInput.vue
@@ -87,7 +87,7 @@ export default {
     typeHint(){
       return this.type === 'single-choice' ? 'Select one answer' : 
         this.type === 'multiple-choice' ? 'Select all that apply' :
-        this.type === 'ranked-choice' ? 'Select and rank all that apply. With 1 being your top choice' :
+        this.type === 'ranked-choice' ? 'Select in your order of preference' :
         '';
     },
     isSingleChoice() {
diff --git a/src/views/Apply/WorkingPreferences/LocationPreferences.vue b/src/views/Apply/WorkingPreferences/LocationPreferences.vue
index 1a47dc14a..8f089ed2e 100644
--- a/src/views/Apply/WorkingPreferences/LocationPreferences.vue
+++ b/src/views/Apply/WorkingPreferences/LocationPreferences.vue
@@ -71,7 +71,7 @@ export default {
       if (this.isValid()) {
         this.application.progress.locationPreferences = true;
         await this.$store.dispatch('application/save', this.application);
-        // this.$router.push({ name: 'task-list' });
+        this.$router.push({ name: 'task-list' });
       }
     },
   },

From f1306db459a180f306db53dcd41fc8899e2871fe Mon Sep 17 00:00:00 2001
From: Tom Russell <TR115251@hotmail.co.uk>
Date: Tue, 11 May 2021 11:15:44 +0100
Subject: [PATCH 4/8] remove unrelated changes

---
 .../RepeatableFields/Qualification.vue           | 16 ----------------
 .../WorkingPreferences/LocationPreferences.vue   |  2 +-
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/components/RepeatableFields/Qualification.vue b/src/components/RepeatableFields/Qualification.vue
index 4f6e73f57..91871414e 100644
--- a/src/components/RepeatableFields/Qualification.vue
+++ b/src/components/RepeatableFields/Qualification.vue
@@ -58,22 +58,6 @@
         v-model="row.qualificationNotComplete"
         label="I did not complete pupillage"
       />
-
-      <DateInput
-        v-if="row.qualificationNotComplete && !row.notCalledToBar"
-        :id="`called_to_bar_date_${index}`"
-        v-model="row.calledToBarDate"
-        label="When were you called to the bar?"
-        type="month"
-      />
-
-      <Checkbox
-        v-if="row.qualificationNotComplete"
-        :id="`called_to_bar_${index}`"
-        v-model="row.notCalledToBar"
-        label="I was not called to the bar"
-      />
-
       <TextareaInput
         v-if="row.qualificationNotComplete"
         :id="details"
diff --git a/src/views/Apply/WorkingPreferences/LocationPreferences.vue b/src/views/Apply/WorkingPreferences/LocationPreferences.vue
index 8f089ed2e..0eb2ffeaf 100644
--- a/src/views/Apply/WorkingPreferences/LocationPreferences.vue
+++ b/src/views/Apply/WorkingPreferences/LocationPreferences.vue
@@ -27,7 +27,7 @@
         /> 
 
         <button
-          :disabled="application.status != 'draft'"
+          :disabled="!application.locationPreferences || application.status != 'draft'"
           class="govuk-button info-btn--location-pref--save-and-continue"
         >
           Save and continue

From 03eae9e29fb00594369b49897d4d6ea23e3c287b Mon Sep 17 00:00:00 2001
From: Tom Russell <TR115251@hotmail.co.uk>
Date: Wed, 12 May 2021 17:06:40 +0100
Subject: [PATCH 5/8] remove padding

---
 src/components/SelectionInput/RankedChoice.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/SelectionInput/RankedChoice.vue b/src/components/SelectionInput/RankedChoice.vue
index fb8ab3fd2..0a063d831 100644
--- a/src/components/SelectionInput/RankedChoice.vue
+++ b/src/components/SelectionInput/RankedChoice.vue
@@ -27,7 +27,7 @@
             </label>
           </div>
         </th>
-        <td class="govuk-table__cell">
+        <td class="govuk-table__cell  govuk-!-padding-top-0">
           <label
             class="govuk-label govuk-checkboxes__label"
           >

From 41703d8633a7244aa56b2eb8c9310028c4f6bed8 Mon Sep 17 00:00:00 2001
From: Tom Russell <TR115251@hotmail.co.uk>
Date: Thu, 13 May 2021 13:24:56 +0100
Subject: [PATCH 6/8] remove phantom checkbox

---
 src/components/SelectionInput/RankedChoice.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/SelectionInput/RankedChoice.vue b/src/components/SelectionInput/RankedChoice.vue
index 0a063d831..b0a60371e 100644
--- a/src/components/SelectionInput/RankedChoice.vue
+++ b/src/components/SelectionInput/RankedChoice.vue
@@ -27,9 +27,9 @@
             </label>
           </div>
         </th>
-        <td class="govuk-table__cell  govuk-!-padding-top-0">
+        <td class="govuk-table__cell">
           <label
-            class="govuk-label govuk-checkboxes__label"
+            class="govuk-heading-s govuk-!-margin-bottom-0"
           >
             {{ selected.some(item => item === answer.answer) ? selected.findIndex(item => item === answer.answer) + 1 : '' }} 
           </label>

From c5eee57c273d7446fe954bf4aa34bef7e4f650b0 Mon Sep 17 00:00:00 2001
From: Tom Russell <TR115251@hotmail.co.uk>
Date: Wed, 19 May 2021 15:22:27 +0100
Subject: [PATCH 7/8] add to review page

---
 src/views/Apply/FinalCheck/Review.vue | 121 +++++++++++++++++++++++++-
 1 file changed, 118 insertions(+), 3 deletions(-)

diff --git a/src/views/Apply/FinalCheck/Review.vue b/src/views/Apply/FinalCheck/Review.vue
index e80a977e4..cc1503892 100644
--- a/src/views/Apply/FinalCheck/Review.vue
+++ b/src/views/Apply/FinalCheck/Review.vue
@@ -1279,21 +1279,136 @@
                   Law-related tasks
                 </dt>
                 <dd class="govuk-summary-list__value">
-                  <ul class="govuk-list">
+                  <ul
+                    v-if="item.tasks && item.tasks.length"
+                    class="govuk-list"
+                  >
                     <li
                       v-for="task in item.tasks"
                       :key="task.name"
                     >
+                      {{ task.name }}
+                      <p class="govuk-body govuk-!-margin-bottom-0">
+                        {{ task | lookup }}
+                      </p>
                       <p
                         v-if="task == 'other'"
                         class="govuk-body govuk-!-margin-bottom-0"
                       >
-                        <span class="govuk-caption-m">{{ task | lookup }}</span>
                         {{ item.otherTasks }}
                       </p>
-                      <span v-else>{{ task | lookup }}</span>
+                      <div
+                        v-if="task == 'judicial-functions' 
+                          && item.judicialFunctions"
+                        class="govuk-body govuk-!-margin-bottom-0"
+                      >
+                        <div class="govuk-summary-list__row">
+                          <dt class="govuk-summary-list__key">
+                            Legal Experience:
+                          </dt>
+                          <dd class="govuk-summary-list__value">
+                            {{ item.judicialFunctions.legalExperience }}
+                          </dd>
+                        </div>
+                        <div class="govuk-summary-list__row">
+                          <dt class="govuk-summary-list__key">
+                            Date:
+                          </dt>
+                          <dd class="govuk-summary-list__value">
+                            {{ item.judicialFunctions.date | formatDate }}
+                          </dd>
+                        </div>
+                        <div class="govuk-summary-list__row">
+                          <dt class="govuk-summary-list__key">
+                            Category of Law:
+                          </dt>
+                          <dd class="govuk-summary-list__value">
+                            {{ item.judicialFunctions.categoryOfLaw }}
+                          </dd>
+                        </div>
+                        <div class="govuk-summary-list__row">
+                          <dt class="govuk-summary-list__key">
+                            Time engaged in this activity:
+                          </dt>
+                          <dd class="govuk-summary-list__value">
+                            <ul
+                              class="govuk-list"
+                            >
+                              <li v-if="item.judicialFunctions.timeEngagedEnd">
+                                {{ item.judicialFunctions.timeEngagedStart | formatDate }} to {{ item.judicialFunctions.timeEngagedEnd | formatDate }}
+                              </li>
+                              <li v-else>
+                                {{ item.judicialFunctions.timeEngagedStart | formatDate }} — current
+                              </li>
+                            </ul>
+                          </dd>
+                        </div>
+                        <div class="govuk-summary-list__row">
+                          <dt class="govuk-summary-list__key">
+                            Judicial Office:
+                          </dt>
+                          <dd class="govuk-summary-list__value">
+                            {{ item.judicialFunctions.judicialOffice | toYesNo }}
+                          </dd>
+                        </div>
+                        <div 
+                          v-if="item.judicialFunctions.judicialOffice"
+                          class="govuk-summary-list__row"
+                        >
+                          <dt class="govuk-summary-list__key">
+                            Previous Judicial Office Type:
+                          </dt>
+                          <dd class="govuk-summary-list__value">
+                            {{ item.judicialFunctions.judicialOfficeType }}
+                          </dd>
+                        </div>
+                        <div class="govuk-summary-list__row">
+                          <dt class="govuk-summary-list__key">
+                            Judicial Appointment Date:
+                          </dt>
+                          <dd class="govuk-summary-list__value">
+                            {{ item.judicialFunctions.judicialAppointmentDate | formatDate }}
+                          </dd>
+                        </div>
+                        <div class="govuk-summary-list__row">
+                          <dt class="govuk-summary-list__key">
+                            Nature of Appointment:
+                          </dt>
+                          <dd class="govuk-summary-list__value">
+                            {{ item.judicialFunctions.natureOfAppointment }}
+                          </dd>
+                        </div>
+                        <div class="govuk-summary-list__row">
+                          <dt class="govuk-summary-list__key">
+                            Circuit or Region:
+                          </dt>
+                          <dd class="govuk-summary-list__value">
+                            {{ item.judicialFunctions.circuitOrRegion }}
+                          </dd>
+                        </div>
+                        <div class="govuk-summary-list__row">
+                          <dt class="govuk-summary-list__key">
+                            Jurisdiction:
+                          </dt>
+                          <dd class="govuk-summary-list__value">
+                            {{ item.judicialFunctions.jurisdiction }}
+                          </dd>
+                        </div>
+                        <div class="govuk-summary-list__row">
+                          <dt class="govuk-summary-list__key">
+                            Tribunal:
+                          </dt>
+                          <dd class="govuk-summary-list__value">
+                            {{ item.judicialFunctions.tribunal }}
+                          </dd>
+                        </div>
+                      </div>
+                      <hr>
                     </li>
                   </ul>
+                  <div v-else>
+                    No Answers provided
+                  </div>
                 </dd>
               </div>
             </dl>

From 0c123ab2f6eeac76165598f1bdf19e6c039cdf51 Mon Sep 17 00:00:00 2001
From: Tom Russell <TR115251@hotmail.co.uk>
Date: Wed, 19 May 2021 15:45:40 +0100
Subject: [PATCH 8/8] remove from review page [wrong branch]

---
 src/views/Apply/FinalCheck/Review.vue | 121 +-------------------------
 1 file changed, 3 insertions(+), 118 deletions(-)

diff --git a/src/views/Apply/FinalCheck/Review.vue b/src/views/Apply/FinalCheck/Review.vue
index cc1503892..e80a977e4 100644
--- a/src/views/Apply/FinalCheck/Review.vue
+++ b/src/views/Apply/FinalCheck/Review.vue
@@ -1279,136 +1279,21 @@
                   Law-related tasks
                 </dt>
                 <dd class="govuk-summary-list__value">
-                  <ul
-                    v-if="item.tasks && item.tasks.length"
-                    class="govuk-list"
-                  >
+                  <ul class="govuk-list">
                     <li
                       v-for="task in item.tasks"
                       :key="task.name"
                     >
-                      {{ task.name }}
-                      <p class="govuk-body govuk-!-margin-bottom-0">
-                        {{ task | lookup }}
-                      </p>
                       <p
                         v-if="task == 'other'"
                         class="govuk-body govuk-!-margin-bottom-0"
                       >
+                        <span class="govuk-caption-m">{{ task | lookup }}</span>
                         {{ item.otherTasks }}
                       </p>
-                      <div
-                        v-if="task == 'judicial-functions' 
-                          && item.judicialFunctions"
-                        class="govuk-body govuk-!-margin-bottom-0"
-                      >
-                        <div class="govuk-summary-list__row">
-                          <dt class="govuk-summary-list__key">
-                            Legal Experience:
-                          </dt>
-                          <dd class="govuk-summary-list__value">
-                            {{ item.judicialFunctions.legalExperience }}
-                          </dd>
-                        </div>
-                        <div class="govuk-summary-list__row">
-                          <dt class="govuk-summary-list__key">
-                            Date:
-                          </dt>
-                          <dd class="govuk-summary-list__value">
-                            {{ item.judicialFunctions.date | formatDate }}
-                          </dd>
-                        </div>
-                        <div class="govuk-summary-list__row">
-                          <dt class="govuk-summary-list__key">
-                            Category of Law:
-                          </dt>
-                          <dd class="govuk-summary-list__value">
-                            {{ item.judicialFunctions.categoryOfLaw }}
-                          </dd>
-                        </div>
-                        <div class="govuk-summary-list__row">
-                          <dt class="govuk-summary-list__key">
-                            Time engaged in this activity:
-                          </dt>
-                          <dd class="govuk-summary-list__value">
-                            <ul
-                              class="govuk-list"
-                            >
-                              <li v-if="item.judicialFunctions.timeEngagedEnd">
-                                {{ item.judicialFunctions.timeEngagedStart | formatDate }} to {{ item.judicialFunctions.timeEngagedEnd | formatDate }}
-                              </li>
-                              <li v-else>
-                                {{ item.judicialFunctions.timeEngagedStart | formatDate }} — current
-                              </li>
-                            </ul>
-                          </dd>
-                        </div>
-                        <div class="govuk-summary-list__row">
-                          <dt class="govuk-summary-list__key">
-                            Judicial Office:
-                          </dt>
-                          <dd class="govuk-summary-list__value">
-                            {{ item.judicialFunctions.judicialOffice | toYesNo }}
-                          </dd>
-                        </div>
-                        <div 
-                          v-if="item.judicialFunctions.judicialOffice"
-                          class="govuk-summary-list__row"
-                        >
-                          <dt class="govuk-summary-list__key">
-                            Previous Judicial Office Type:
-                          </dt>
-                          <dd class="govuk-summary-list__value">
-                            {{ item.judicialFunctions.judicialOfficeType }}
-                          </dd>
-                        </div>
-                        <div class="govuk-summary-list__row">
-                          <dt class="govuk-summary-list__key">
-                            Judicial Appointment Date:
-                          </dt>
-                          <dd class="govuk-summary-list__value">
-                            {{ item.judicialFunctions.judicialAppointmentDate | formatDate }}
-                          </dd>
-                        </div>
-                        <div class="govuk-summary-list__row">
-                          <dt class="govuk-summary-list__key">
-                            Nature of Appointment:
-                          </dt>
-                          <dd class="govuk-summary-list__value">
-                            {{ item.judicialFunctions.natureOfAppointment }}
-                          </dd>
-                        </div>
-                        <div class="govuk-summary-list__row">
-                          <dt class="govuk-summary-list__key">
-                            Circuit or Region:
-                          </dt>
-                          <dd class="govuk-summary-list__value">
-                            {{ item.judicialFunctions.circuitOrRegion }}
-                          </dd>
-                        </div>
-                        <div class="govuk-summary-list__row">
-                          <dt class="govuk-summary-list__key">
-                            Jurisdiction:
-                          </dt>
-                          <dd class="govuk-summary-list__value">
-                            {{ item.judicialFunctions.jurisdiction }}
-                          </dd>
-                        </div>
-                        <div class="govuk-summary-list__row">
-                          <dt class="govuk-summary-list__key">
-                            Tribunal:
-                          </dt>
-                          <dd class="govuk-summary-list__value">
-                            {{ item.judicialFunctions.tribunal }}
-                          </dd>
-                        </div>
-                      </div>
-                      <hr>
+                      <span v-else>{{ task | lookup }}</span>
                     </li>
                   </ul>
-                  <div v-else>
-                    No Answers provided
-                  </div>
                 </dd>
               </div>
             </dl>