Merge branch 'end-to-end' of github.com:ONSdigital/eq-prototypes into…

… end-to-end
ONSdigital · May 29, 2020 · 98989ee · 98989ee
2 parents c1ff754 + 1a7f8c2
commit 98989ee
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/_prototypes/end-to-end/individual-details-language.html b/_prototypes/end-to-end/individual-details-language.html
@@ -117,12 +117,15 @@ <h3 class="collapsible__title js-collapsible-title icon--collapsible-simple u-fs
     question = question.trim();
     storageAPI.addUpdateLanguage(personId, val, question, url);
 
-    if(val === 'Other' || val === undefined) {
+    if(val === 'Other') {
       window.location.href = '../individual-details-language-other/?person_id=' + personId + (isEditing ? '&edit=true' : '');
       storageAPI.storePageData('/end-to-end/individual-details-language-other/', window.location.pathname);
     } else if(isEditing) {
       window.location.href = '../individual-details-summary/?person_id=' + personId;
       storageAPI.storePageData('/end-to-end/individual-details-summary/', window.location.pathname);
+    } else if (val === undefined) {
+      window.location.href = '../individual-details-language-english/?person_id=' + personId;
+      storageAPI.storePageData('/end-to-end/individual-details-language-english/', window.location.pathname);
     } else {
       window.location.href = '../individual-details-passport-country/?person_id=' + personId;
       storageAPI.storePageData('/end-to-end/individual-details-passport-country/', window.location.pathname);

diff --git a/_prototypes/end-to-end/individual-details-qualifications-gcse.html b/_prototypes/end-to-end/individual-details-qualifications-gcse.html
@@ -99,7 +99,7 @@ <h3 class="collapsible__title js-collapsible-title icon--collapsible-simple u-fs
                                                     <label class="label label--inline u-fs-r "
                                                            for="basic-skills"
                                                            id="basic-skills-label">
-                                                        <strong class="u-fs-r">Basic skills course</strong>
+                                                        <strong class="u-fs-r">Basic Skills course</strong>
                                                         <p class="u-fs-s u-db u-mb-no label--negative">
                                                             Skills for life, literacy, numeracy and language
                                                         </p>

diff --git a/_prototypes/end-to-end/individual-details-qualifications-nvq-equivalent.html b/_prototypes/end-to-end/individual-details-qualifications-nvq-equivalent.html
@@ -72,7 +72,7 @@ <h3 class="collapsible__title js-collapsible-title icon--collapsible-simple u-fs
                                                         <strong
                                                                 class="u-fs-r">NVQ level 3 or equivalent</strong>
                                                         <p class="u-fs-s u-db u-mb-no label--negative">
-                                                            For example BTEC National, OND or ONC, City and Guilds Advanced Craft
+                                                            For example, BTEC National, OND or ONC, City and Guilds Advanced Craft
                                                         </p>
                                                     </label>
                                                 </div>
@@ -88,7 +88,7 @@ <h3 class="collapsible__title js-collapsible-title icon--collapsible-simple u-fs
                                                         <strong
                                                                 class="u-fs-r">NVQ level 2 or equivalent</strong>
                                                         <p class="u-fs-s u-db u-mb-no label--negative">
-                                                            For example BTEC General, City and Guilds Craft
+                                                            For example, BTEC General, City and Guilds Craft
                                                         </p>
                                                     </label>
                                                 </div>

diff --git a/_prototypes/end-to-end/individual-details-summary.html b/_prototypes/end-to-end/individual-details-summary.html
@@ -301,7 +301,9 @@ <h2 class="question__title u-fs-l js-heading">
             if (individualDetails[person].employment.questionSevenDaysDescription){
                 $container.append(createListItem(individualDetails[person].employment.description ? individualDetails[person].employment.description : 'No answer provided', individualDetails[person].employment.questionSevenDaysDescription, individualDetails[person].employment.urlSevenDaysDescription));
                 $container.append(createListItem(individualDetails[person].employment.fourWeeksAgo ? individualDetails[person].employment.fourWeeksAgo : 'No answer provided', individualDetails[person].employment.questionFourWeeks, individualDetails[person].employment.urlFourWeeks));
-                $container.append(createListItem(individualDetails[person].employment.availableInTwoWeeks ? individualDetails[person].employment.availableInTwoWeeks : 'No answer provided', individualDetails[person].employment.questionAvailableTwoWeeks, individualDetails[person].employment.urlAvailableTwoWeeks));
+                if (individualDetails[person].employment.questionAvailableTwoWeeks){
+                    $container.append(createListItem(individualDetails[person].employment.availableInTwoWeeks ? individualDetails[person].employment.availableInTwoWeeks : 'No answer provided', individualDetails[person].employment.questionAvailableTwoWeeks, individualDetails[person].employment.urlAvailableTwoWeeks));
+                }
                 $container.append(createListItem(individualDetails[person].employment.paidWorkConfirm ? individualDetails[person].employment.paidWorkConfirm : 'No answer provided', individualDetails[person].employment.questionPaidWorkConfirm, individualDetails[person].employment.urlPaidWorkConfirm));
                 $container.append(createListItem(individualDetails[person].employment.acceptedJob ? individualDetails[person].employment.acceptedJob : 'No answer provided', individualDetails[person].employment.questionAcceptedJob, individualDetails[person].employment.urlAcceptedJob));
             }
@@ -312,12 +314,18 @@ <h2 class="question__title u-fs-l js-heading">
                 $container.append(createListItem(individualDetails[person].employment.jobDescription ? individualDetails[person].employment.jobDescription : 'No answer provided', individualDetails[person].employment.questionJobDescription, individualDetails[person].employment.urlJobDescription));
                 $container.append(createListItem(individualDetails[person].employment.businessActivity ? individualDetails[person].employment.businessActivity : 'No answer provided', individualDetails[person].employment.questionBusinessActivity, individualDetails[person].employment.urlBusinessActivity));
                 $container.append(createListItem(individualDetails[person].employment.responsibilities ? individualDetails[person].employment.responsibilities : 'No answer provided', individualDetails[person].employment.questionResponsibilities, individualDetails[person].employment.urlResponsibilities));
-                $container.append(createListItem(individualDetails[person].employment.hours ? individualDetails[person].employment.hours : 'No answer provided', individualDetails[person].employment.questionHoursWorked, individualDetails[person].employment.urlHoursWorked));
+                if (individualDetails[person].employment.questionHoursWorked) {
+                    $container.append(createListItem(individualDetails[person].employment.hours ? individualDetails[person].employment.hours : 'No answer provided', individualDetails[person].employment.questionHoursWorked, individualDetails[person].employment.urlHoursWorked));
+                }
                 if (individualDetails[person].employment.questionEmploymentTravel){
                     $container.append(createListItem(individualDetails[person].employment.modeOfTravel ? individualDetails[person].employment.modeOfTravel : 'No answer provided', individualDetails[person].employment.questionEmploymentTravel, individualDetails[person].employment.urlEmploymentTravel));
                 }
-                $container.append(createListItem(individualDetails[person].employment.mainlyWork ? individualDetails[person].employment.mainlyWork : 'No answer provided', individualDetails[person].employment.questionMainlyWork, individualDetails[person].employment.urlMainlyWork));
-                $container.append(createListItem(individualDetails[person].employment.workUK ? individualDetails[person].employment.workUK : 'No answer provided', individualDetails[person].employment.questionWorkUK, individualDetails[person].employment.urlWorkUK));
+                if (individualDetails[person].employment.questionMainlyWork) {
+                    $container.append(createListItem(individualDetails[person].employment.mainlyWork ? individualDetails[person].employment.mainlyWork : 'No answer provided', individualDetails[person].employment.questionMainlyWork, individualDetails[person].employment.urlMainlyWork));
+                }
+                if (individualDetails[person].employment.questionWorkUK) {
+                    $container.append(createListItem(individualDetails[person].employment.workUK ? individualDetails[person].employment.workUK : 'No answer provided', individualDetails[person].employment.questionWorkUK, individualDetails[person].employment.urlWorkUK));
+                }
                 if (individualDetails[person].employment.questionWorkOutsideUK){
                     $container.append(createListItem(individualDetails[person].employment.workOutsideUK ? individualDetails[person].employment.workOutsideUK : 'No answer provided', individualDetails[person].employment.questionWorkOutsideUK, individualDetails[person].employment.urlWorkOutsideUK));
                 }