From 48bed06158d9238409ccf44b9816308fd38eadbf Mon Sep 17 00:00:00 2001
From: Le <vietdung.le@cgi.com>
Date: Tue, 1 Oct 2024 16:37:02 -0700
Subject: [PATCH 1/3] ofmcc-6218 - update wording for Application Eligbility
 banner

---
 frontend/src/views/applications/EligibilityView.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/frontend/src/views/applications/EligibilityView.vue b/frontend/src/views/applications/EligibilityView.vue
index ea156cb2..508c70db 100644
--- a/frontend/src/views/applications/EligibilityView.vue
+++ b/frontend/src/views/applications/EligibilityView.vue
@@ -1,10 +1,6 @@
 <template>
   <v-form ref="form">
-    <AppAlertBanner type="info">
-      Note: If you answer "No" to any of these questions, you will not be eligible for a $10 a Day Funding. More information can be at the
-      <a href="https://www2.gov.bc.ca/gov/content?id=F0D0FD2A00064CDDBF634CF83E4E2599" target="_blank">$10 a Day Funding website</a>
-      for eligibility.
-    </AppAlertBanner>
+    <AppAlertBanner type="info">Note: If you answer "No" to any of these questions, you will not be eligible for $10 a Day Funding.</AppAlertBanner>
     <v-card variant="outlined" class="pa-4 my-6">
       <div>
         <div>Is your facility currently in receipt of Child Care Operating Funding or $10 a Day ChildCareBC funding for a minimum of 1 year?</div>

From a188abd589573e52dc829814e4390a8edcc8b35e Mon Sep 17 00:00:00 2001
From: Le <vietdung.le@cgi.com>
Date: Wed, 2 Oct 2024 09:24:23 -0700
Subject: [PATCH 2/3] ofmcc-6203, ofmcc-6153 - update Help and Resource page

---
 frontend/src/components/TheHeader.vue         |  2 +-
 frontend/src/router/index.js                  |  1 -
 frontend/src/views/HelpView.vue               | 31 +++++++++-
 frontend/src/views/HomeView.vue               |  2 +-
 .../portal_login.cy.js                        | 58 +++++++++----------
 5 files changed, 61 insertions(+), 33 deletions(-)

diff --git a/frontend/src/components/TheHeader.vue b/frontend/src/components/TheHeader.vue
index cc3551c6..d7ab6b62 100644
--- a/frontend/src/components/TheHeader.vue
+++ b/frontend/src/components/TheHeader.vue
@@ -28,7 +28,7 @@
                   <v-skeleton-loader v-else type="chip" class="chip-loader" />
                 </div>
               </v-col>
-              <v-col v-if="false" class="px-0" style="width: 50px">
+              <v-col class="px-0" style="width: 50px">
                 <v-btn id="help_button" aria-label="Help" rounded @click="$router.push({ name: 'help' })">
                   <v-icon aria-hidden="false" icon="mdi-help-circle-outline" size="38" color="white" />
                 </v-btn>
diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js
index 868f5fef..b98dcc9f 100644
--- a/frontend/src/router/index.js
+++ b/frontend/src/router/index.js
@@ -294,7 +294,6 @@ const router = createRouter({
       name: 'help',
       component: HelpView,
       meta: {
-        hidden: true,
         requiresAuth: true,
       },
     },
diff --git a/frontend/src/views/HelpView.vue b/frontend/src/views/HelpView.vue
index 5a9737ce..a1fa8bdb 100644
--- a/frontend/src/views/HelpView.vue
+++ b/frontend/src/views/HelpView.vue
@@ -60,6 +60,18 @@
             <v-icon size="18" icon="fa:fa-regular fa-file-pdf" class="mr-1"></v-icon>
             <span>2023 - Policy and Procedure Manual</span>
           </a>
+          <br />
+          <br />
+          <a href="https://www2.gov.bc.ca/assets/download/DD532A29A11B4BE1AF56FD0A1929FB26" target="_blank">
+            <v-icon size="18" icon="fa:fa-regular fa-file-pdf" class="mr-1"></v-icon>
+            <span>2023 - Funding Agreement Template</span>
+          </a>
+          <br />
+          <br />
+          <a href="https://www2.gov.bc.ca/assets/download/D10A0045B4724B81A235A2CE418F29DB" target="_blank">
+            <v-icon size="18" icon="fa:fa-regular fa-file-pdf" class="mr-1"></v-icon>
+            <span>Applicant Guide</span>
+          </a>
         </v-expansion-panel-text>
         <v-expansion-panel-text v-if="panelComponent.id === 'training'">
           <a href="https://rise.articulate.com/share/_eN8nAZYN7_Jmi9tpG69W6dcza6aHsXZ#/" target="_blank">
@@ -73,6 +85,18 @@
             <span>Policy and Procedure Manual Training e-Module</span>
           </a>
         </v-expansion-panel-text>
+        <v-expansion-panel-text v-if="panelComponent.id === 'other'">
+          <a href="https://www2.gov.bc.ca/assets/download/CAF7A4B7BB5248838968459A0BBD6CC2" target="_blank">
+            <v-icon size="18" icon="fa:fa-regular fa-file-pdf" class="mr-1"></v-icon>
+            <span>EE $10 a Day Policy and Procedure Manual</span>
+          </a>
+          <br />
+          <br />
+          <a href="https://www2.gov.bc.ca/assets/download/37637565F3824721A91EE6D0ED0F1D7C" target="_blank">
+            <v-icon size="18" icon="fa:fa-regular fa-file-pdf" class="mr-1"></v-icon>
+            <span>EE $10 a Day Funding Agreement Template</span>
+          </a>
+        </v-expansion-panel-text>
       </v-expansion-panel>
     </v-expansion-panels>
     <AppBackButton id="back-home-button" size="large" width="220px" :to="{ name: 'home' }" class="mt-6">Home</AppBackButton>
@@ -121,9 +145,14 @@ export default {
         title: 'Training e-Modules',
         id: 'training',
       },
+      {
+        title: 'Other',
+        id: 'other',
+      },
     ]
     this.generalPanels = this.allGeneralPanelIDs
-    this.testParticipantPanels = this.allTestParticipantPanelIDs
+    // OFMCC-6203 - Other section will be collapsed by default
+    this.testParticipantPanels = this.allTestParticipantPanelIDs.slice(0, -1)
   },
   methods: {
     isEmpty,
diff --git a/frontend/src/views/HomeView.vue b/frontend/src/views/HomeView.vue
index 9e2976aa..80392038 100644
--- a/frontend/src/views/HomeView.vue
+++ b/frontend/src/views/HomeView.vue
@@ -49,7 +49,7 @@
           <v-card-text>Maintain or edit organization or facility information and request a change.</v-card-text>
         </v-card>
       </v-col>
-      <v-col v-if="false" cols="12" md="6" lg="4">
+      <v-col cols="12" md="6" lg="4">
         <v-card id="help-card" class="basic-card" prepend-icon="mdi-help-circle-outline" title="Help and Resources" @click="$router.push({ name: 'help' })">
           <v-card-text>Need support? Find program training tools, resources and technical help.</v-card-text>
         </v-card>
diff --git a/testing/cypress/e2e/1-portal-and-crm-login-and-security/portal_login.cy.js b/testing/cypress/e2e/1-portal-and-crm-login-and-security/portal_login.cy.js
index 2392af73..8ee830d8 100644
--- a/testing/cypress/e2e/1-portal-and-crm-login-and-security/portal_login.cy.js
+++ b/testing/cypress/e2e/1-portal-and-crm-login-and-security/portal_login.cy.js
@@ -1,37 +1,37 @@
-const USERNAME = Cypress.env('PORTAL_USERNAME')
-const PASSWORD = Cypress.env('PORTAL_PASSWORD')
-const PORTAL_URL = Cypress.env('PORTAL_URL')
+const USERNAME = Cypress.env("PORTAL_USERNAME");
+const PASSWORD = Cypress.env("PORTAL_PASSWORD");
+const PORTAL_URL = Cypress.env("PORTAL_URL");
 
-describe('Login to Portal', () => {
-  it('system messages', () => {
-    cy.visit(PORTAL_URL)
-    cy.get('div[role="alert"]').contains('Test Message')
-  })
-  it('successful login', () => {
-    cy.loginToPortal(USERNAME, PASSWORD, PORTAL_URL)
-    cy.visit(PORTAL_URL)
+describe("Login to Portal", () => {
+  it("system messages", () => {
+    cy.visit(PORTAL_URL);
+    cy.get('div[role="alert"]').contains("Test Message");
+  });
+  it("successful login", () => {
+    cy.loginToPortal(USERNAME, PASSWORD, PORTAL_URL);
+    cy.visit(PORTAL_URL);
 
     // Facility is hidden in Org header
-    cy.get('#changeFacility').should('not.exist')
+    cy.get("#changeFacility").should("not.exist");
 
     // All cards are available to Account Manager
-    cy.get('#reporting-card').should('exist')
-    cy.get('#funding-card').should('exist')
-    cy.get('#assistance-card').should('exist')
-    cy.get('#applications-card').should('exist')
-    cy.get('#account-mgmt-card').should('exist')
-    cy.get('#help-card').should('not.exist')
-  })
+    cy.get("#reporting-card").should("exist");
+    cy.get("#funding-card").should("exist");
+    cy.get("#assistance-card").should("exist");
+    cy.get("#applications-card").should("exist");
+    cy.get("#account-mgmt-card").should("exist");
+    cy.get("#help-card").should("exist");
+  });
 
-  it('failed login', () => {
+  it("failed login", () => {
     // SSO has error in application code on failed login
-    cy.on('uncaught:exception', (e) => {
-      return false
-    })
-    cy.loginToPortalNoSession('doesnotexist', 'password', PORTAL_URL)
-    cy.visit(PORTAL_URL)
+    cy.on("uncaught:exception", (e) => {
+      return false;
+    });
+    cy.loginToPortalNoSession("doesnotexist", "password", PORTAL_URL);
+    cy.visit(PORTAL_URL);
     // Should be back on Login screen
-    cy.get('a[id=bceid-login').should('exist')
-    cy.get('#reporting-card').should('not.exist')
-  })
-})
+    cy.get("a[id=bceid-login").should("exist");
+    cy.get("#reporting-card").should("not.exist");
+  });
+});

From d7c28eca946f9edfc9df91357d49883005cbfcb4 Mon Sep 17 00:00:00 2001
From: Le <vietdung.le@cgi.com>
Date: Wed, 2 Oct 2024 09:36:53 -0700
Subject: [PATCH 3/3] ofmcc-6204 - hide PDF button for Base Application

---
 frontend/src/views/applications/ApplicationsHistoryView.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/src/views/applications/ApplicationsHistoryView.vue b/frontend/src/views/applications/ApplicationsHistoryView.vue
index 24178f16..523a98fe 100644
--- a/frontend/src/views/applications/ApplicationsHistoryView.vue
+++ b/frontend/src/views/applications/ApplicationsHistoryView.vue
@@ -305,7 +305,9 @@ export default {
         return false
         //OFM core generates PDF upon submit - Supp App generates PDF only once approved
       } else if (application.applicationType === APPLICATION_TYPES.OFM) {
-        return !this.DRAFT_STATUS_CODES.includes(application?.statusCode)
+        return false
+        // OFMCC-6204 - temporary hide the PDF button for Base Funding Application because of the missing fields issue
+        // return !this.DRAFT_STATUS_CODES.includes(application?.statusCode)
       }
       return application.statusCode === SUPPLEMENTARY_APPLICATION_STATUS_CODES.APPROVED || application.statusCode === SUPPLEMENTARY_APPLICATION_STATUS_CODES.SUBMITTED
     },