From 86ca6292b21b62365afaa3a21f65f2658a632790 Mon Sep 17 00:00:00 2001
From: prit-cgi <prit.thakkar@cgi.com>
Date: Thu, 15 Dec 2022 18:06:48 -0400
Subject: [PATCH 1/3] 8454 added missing instructions for r30 and r31

---
 .../src/views/groupmember/AddDependent.vue    | 40 ++++++++++++++++++-
 .../src/views/groupmember/AddGroupMember.vue  | 17 ++++++++
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/frontend/src/views/groupmember/AddDependent.vue b/frontend/src/views/groupmember/AddDependent.vue
index f5a2766e..25b339d8 100644
--- a/frontend/src/views/groupmember/AddDependent.vue
+++ b/frontend/src/views/groupmember/AddDependent.vue
@@ -1,4 +1,36 @@
 <template>
+  <AppHelp>
+    <ul>
+      <li><p>Use this screen to add, or renew, a spouse or child on a group account.</p></li>
+      <li>
+        <p><b>This screen has been enhanced to allow you to also add dependents between the age of 19 and 24 who are studying at a Canadian educational institute.</b></p>
+      </li>
+    </ul>
+    <p><b>Before you begin:</b></p>
+    <ul>
+      <li><p>Use the PHN Inquiry screen to confirm that the dependent is currently eligible for publicly funded health care (Eligible? = Y) and, if they are a dependent between 19 and 24 years of age, check with your group member that their dependent's student status is confirmed.</p></li>
+    </ul>
+    <p><b>Student Status</b></p>
+    <ul>
+      <li>
+        <p>
+          A dependent <span class="red-text">child who is older than 18 and younger than 25 years of age</span> may still be covered on your group members account as an overage student if they are attending a school or educational institution located within Canada. If yes, click the "YES" button.
+        </p>
+      </li>
+      <li>
+        <p><b>Studies Completion Date</b></p>
+      </li>
+      <ul>
+        <li>
+          <p>
+            This is a mandatory field if you have selected the "YES" answer above. Enter the date (this year and month) when the dependent's studies in Canada are expected to finish. This date must be at least three months from today's date and can be up to five years in the future. If the dependent
+            is turning 25 during this period, you will be able to confirm them as a student until the month before their 25th birthday.
+          </p>
+        </li>
+      </ul>
+      <li>If the transaction was completed, the PHN is displayed. You may wish to use the PHN with Get Contract Periods to verify that the correct dependent has been added as of the correct date</li>
+    </ul>
+  </AppHelp>
   <div id="addGroupMemberDependent" v-if="inputFormActive">
     <form @submit.prevent="submitForm">
       <AppRow>
@@ -55,6 +87,7 @@
 </template>
 
 <script>
+import AppHelp from '../../components/ui/AppHelp.vue'
 import YesNoRadioButtonGroup from '../../components/ui/YesNoRadioButtonGroup.vue'
 import useVuelidate from '@vuelidate/core'
 import { helpers, required, requiredIf } from '@vuelidate/validators'
@@ -67,7 +100,7 @@ import { handleServiceError } from '../../util/utils'
 
 export default {
   name: 'AddDependent',
-  components: { YesNoRadioButtonGroup },
+  components: { YesNoRadioButtonGroup, AppHelp },
   setup() {
     const currentMonth = {
       month: new Date().getMonth(),
@@ -194,3 +227,8 @@ export default {
   },
 }
 </script>
+<style>
+.red-text {
+  color: red;
+}
+</style>
diff --git a/frontend/src/views/groupmember/AddGroupMember.vue b/frontend/src/views/groupmember/AddGroupMember.vue
index 612453a5..09485913 100644
--- a/frontend/src/views/groupmember/AddGroupMember.vue
+++ b/frontend/src/views/groupmember/AddGroupMember.vue
@@ -1,4 +1,14 @@
 <template>
+  <AppHelp>
+    <p>Use this screen to add <span class="red-text">or renew</span> a new group member and their dependents <span class="red-text">(if appliable)</span> to your MSP group account.</p>
+    <p><b>Before you begin:</b></p>
+    <ul>
+      <li><p>Use the PHN Inquiry screen to confirm that the employee and dependents are currently eligible for publicly funded health care (Eligible? = Y), and to check student status for any dependent children between 19 and 24.</p></li>
+      <li><p>A group members Home Address must be in British Columbia.</p></li>
+      <li><p>NOTE - this screen does not have CITY or PROVINCE fields. Be sure to put them in the last completed line of address i.e., Line 1: 403 1575 Main Street Line 2: Vancouver BC</p></li>
+      <li><p>If the transaction was successful, the PHN will be displayed. You may wish to use the PHN with Get Contract Periods to verify that the correct group member has been added as of the correct date.</p></li>
+    </ul>
+  </AppHelp>
   <div id="addGroupMember" v-if="addMode">
     <form @submit.prevent="submitForm">
       <AppRow>
@@ -114,6 +124,7 @@
   </div>
 </template>
 <script>
+import AppHelp from '../../components/ui/AppHelp.vue'
 import useVuelidate from '@vuelidate/core'
 import { required, requiredIf, helpers, maxLength } from '@vuelidate/validators'
 import AddListDependent from '../../components/groupmember/AddListDependent.vue'
@@ -148,6 +159,7 @@ export default {
   name: 'AddGroupMember',
   components: {
     AddListDependent,
+    AppHelp,
   },
   setup() {
     return {
@@ -372,3 +384,8 @@ export default {
   },
 }
 </script>
+<style>
+.red-text {
+  color: red;
+}
+</style>

From 5325b26011bbb373a26a401850f069869e61d460 Mon Sep 17 00:00:00 2001
From: prit-cgi <prit.thakkar@cgi.com>
Date: Thu, 15 Dec 2022 18:15:53 -0400
Subject: [PATCH 2/3] updated R31 help content

---
 frontend/src/views/groupmember/AddDependent.vue | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/frontend/src/views/groupmember/AddDependent.vue b/frontend/src/views/groupmember/AddDependent.vue
index 25b339d8..23dc12f4 100644
--- a/frontend/src/views/groupmember/AddDependent.vue
+++ b/frontend/src/views/groupmember/AddDependent.vue
@@ -17,17 +17,15 @@
           A dependent <span class="red-text">child who is older than 18 and younger than 25 years of age</span> may still be covered on your group members account as an overage student if they are attending a school or educational institution located within Canada. If yes, click the "YES" button.
         </p>
       </li>
+    </ul>
+    <p><b>Studies Completion Date</b></p>
+    <ul>
       <li>
-        <p><b>Studies Completion Date</b></p>
+        <p>
+          This is a mandatory field if you have selected the "YES" answer above. Enter the date (this year and month) when the dependent's studies in Canada are expected to finish. This date must be at least three months from today's date and can be up to five years in the future. If the dependent
+          is turning 25 during this period, you will be able to confirm them as a student until the month before their 25th birthday.
+        </p>
       </li>
-      <ul>
-        <li>
-          <p>
-            This is a mandatory field if you have selected the "YES" answer above. Enter the date (this year and month) when the dependent's studies in Canada are expected to finish. This date must be at least three months from today's date and can be up to five years in the future. If the dependent
-            is turning 25 during this period, you will be able to confirm them as a student until the month before their 25th birthday.
-          </p>
-        </li>
-      </ul>
       <li>If the transaction was completed, the PHN is displayed. You may wish to use the PHN with Get Contract Periods to verify that the correct dependent has been added as of the correct date</li>
     </ul>
   </AppHelp>

From b5bb6d9c28554b204d41c334c018713ca6dad6d9 Mon Sep 17 00:00:00 2001
From: prit-cgi <prit.thakkar@cgi.com>
Date: Thu, 15 Dec 2022 21:43:38 -0400
Subject: [PATCH 3/3] addressed review comments

---
 frontend/src/components/ui/AppHelp.vue            |  4 ++++
 frontend/src/views/groupmember/AddDependent.vue   | 13 +++----------
 frontend/src/views/groupmember/AddGroupMember.vue |  9 ++-------
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/frontend/src/components/ui/AppHelp.vue b/frontend/src/components/ui/AppHelp.vue
index 87b9aa16..380ebf2f 100644
--- a/frontend/src/components/ui/AppHelp.vue
+++ b/frontend/src/components/ui/AppHelp.vue
@@ -36,4 +36,8 @@ export default {
   list-style: disc;
   margin-left: 20px;
 }
+
+:slotted(span) {
+  color: red;
+}
 </style>
diff --git a/frontend/src/views/groupmember/AddDependent.vue b/frontend/src/views/groupmember/AddDependent.vue
index 23dc12f4..312b3421 100644
--- a/frontend/src/views/groupmember/AddDependent.vue
+++ b/frontend/src/views/groupmember/AddDependent.vue
@@ -10,19 +10,17 @@
     <ul>
       <li><p>Use the PHN Inquiry screen to confirm that the dependent is currently eligible for publicly funded health care (Eligible? = Y) and, if they are a dependent between 19 and 24 years of age, check with your group member that their dependent's student status is confirmed.</p></li>
     </ul>
-    <p><b>Student Status</b></p>
+    <p><b>Student status</b></p>
     <ul>
       <li>
-        <p>
-          A dependent <span class="red-text">child who is older than 18 and younger than 25 years of age</span> may still be covered on your group members account as an overage student if they are attending a school or educational institution located within Canada. If yes, click the "YES" button.
-        </p>
+        <p>A dependent <span>child who is older than 18 and younger than 25 years of age</span> may still be covered on your group member's account as an overage student if they are attending a school or educational institution located within Canada. If yes, click the "YES" button.</p>
       </li>
     </ul>
     <p><b>Studies Completion Date</b></p>
     <ul>
       <li>
         <p>
-          This is a mandatory field if you have selected the "YES" answer above. Enter the date (this year and month) when the dependent's studies in Canada are expected to finish. This date must be at least three months from today's date and can be up to five years in the future. If the dependent
+          This is a mandatory field if you have selected the "YES" answer above. Enter the date (the year and month) when the dependent's studies in Canada are expected to finish. This date must be at least three months from today's date and can be up to five years into the future. If the dependent
           is turning 25 during this period, you will be able to confirm them as a student until the month before their 25th birthday.
         </p>
       </li>
@@ -225,8 +223,3 @@ export default {
   },
 }
 </script>
-<style>
-.red-text {
-  color: red;
-}
-</style>
diff --git a/frontend/src/views/groupmember/AddGroupMember.vue b/frontend/src/views/groupmember/AddGroupMember.vue
index 09485913..905f0918 100644
--- a/frontend/src/views/groupmember/AddGroupMember.vue
+++ b/frontend/src/views/groupmember/AddGroupMember.vue
@@ -1,10 +1,10 @@
 <template>
   <AppHelp>
-    <p>Use this screen to add <span class="red-text">or renew</span> a new group member and their dependents <span class="red-text">(if appliable)</span> to your MSP group account.</p>
+    <p>Use this screen to add <span>or renew</span> a new group member and their dependents <span>(if applicable)</span> to your MSP group account.</p>
     <p><b>Before you begin:</b></p>
     <ul>
       <li><p>Use the PHN Inquiry screen to confirm that the employee and dependents are currently eligible for publicly funded health care (Eligible? = Y), and to check student status for any dependent children between 19 and 24.</p></li>
-      <li><p>A group members Home Address must be in British Columbia.</p></li>
+      <li><p>A group member's Home Address must be in British Columbia.</p></li>
       <li><p>NOTE - this screen does not have CITY or PROVINCE fields. Be sure to put them in the last completed line of address i.e., Line 1: 403 1575 Main Street Line 2: Vancouver BC</p></li>
       <li><p>If the transaction was successful, the PHN will be displayed. You may wish to use the PHN with Get Contract Periods to verify that the correct group member has been added as of the correct date.</p></li>
     </ul>
@@ -384,8 +384,3 @@ export default {
   },
 }
 </script>
-<style>
-.red-text {
-  color: red;
-}
-</style>