Skip to content

Commit 2016277

Browse files
vietle-cgivietle-cgi
authored
Merge pull request #379 from bcgov/ofmcc-6203-wording-updates
OFMCC-6203 - wording updates
2 parents d82e2dc + d7c28ec commit 2016277

File tree

7 files changed

+65
-39
lines changed

7 files changed

+65
-39
lines changed

‎frontend/src/components/TheHeader.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<v-skeleton-loader v-else type="chip" class="chip-loader" />
2929
</div>
3030
</v-col>
31-
<v-col v-if="false" class="px-0" style="width: 50px">
31+
<v-col class="px-0" style="width: 50px">
3232
<v-btn id="help_button" aria-label="Help" rounded @click="$router.push({ name: 'help' })">
3333
<v-icon aria-hidden="false" icon="mdi-help-circle-outline" size="38" color="white" />
3434
</v-btn>

‎frontend/src/router/index.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,6 @@ const router = createRouter({
294294
name: 'help',
295295
component: HelpView,
296296
meta: {
297-
hidden: true,
298297
requiresAuth: true,
299298
},
300299
},

‎frontend/src/views/HelpView.vue‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,18 @@
6060
<v-icon size="18" icon="fa:fa-regular fa-file-pdf" class="mr-1"></v-icon>
6161
<span>2023 - Policy and Procedure Manual</span>
6262
</a>
63+
<br />
64+
<br />
65+
<a href="https://www2.gov.bc.ca/assets/download/DD532A29A11B4BE1AF56FD0A1929FB26" target="_blank">
66+
<v-icon size="18" icon="fa:fa-regular fa-file-pdf" class="mr-1"></v-icon>
67+
<span>2023 - Funding Agreement Template</span>
68+
</a>
69+
<br />
70+
<br />
71+
<a href="https://www2.gov.bc.ca/assets/download/D10A0045B4724B81A235A2CE418F29DB" target="_blank">
72+
<v-icon size="18" icon="fa:fa-regular fa-file-pdf" class="mr-1"></v-icon>
73+
<span>Applicant Guide</span>
74+
</a>
6375
</v-expansion-panel-text>
6476
<v-expansion-panel-text v-if="panelComponent.id === 'training'">
6577
<a href="https://rise.articulate.com/share/_eN8nAZYN7_Jmi9tpG69W6dcza6aHsXZ#/" target="_blank">
@@ -73,6 +85,18 @@
7385
<span>Policy and Procedure Manual Training e-Module</span>
7486
</a>
7587
</v-expansion-panel-text>
88+
<v-expansion-panel-text v-if="panelComponent.id === 'other'">
89+
<a href="https://www2.gov.bc.ca/assets/download/CAF7A4B7BB5248838968459A0BBD6CC2" target="_blank">
90+
<v-icon size="18" icon="fa:fa-regular fa-file-pdf" class="mr-1"></v-icon>
91+
<span>EE $10 a Day Policy and Procedure Manual</span>
92+
</a>
93+
<br />
94+
<br />
95+
<a href="https://www2.gov.bc.ca/assets/download/37637565F3824721A91EE6D0ED0F1D7C" target="_blank">
96+
<v-icon size="18" icon="fa:fa-regular fa-file-pdf" class="mr-1"></v-icon>
97+
<span>EE $10 a Day Funding Agreement Template</span>
98+
</a>
99+
</v-expansion-panel-text>
76100
</v-expansion-panel>
77101
</v-expansion-panels>
78102
<AppBackButton id="back-home-button" size="large" width="220px" :to="{ name: 'home' }" class="mt-6">Home</AppBackButton>
@@ -121,9 +145,14 @@ export default {
121145
title: 'Training e-Modules',
122146
id: 'training',
123147
},
148+
{
149+
title: 'Other',
150+
id: 'other',
151+
},
124152
]
125153
this.generalPanels = this.allGeneralPanelIDs
126-
this.testParticipantPanels = this.allTestParticipantPanelIDs
154+
// OFMCC-6203 - Other section will be collapsed by default
155+
this.testParticipantPanels = this.allTestParticipantPanelIDs.slice(0, -1)
127156
},
128157
methods: {
129158
isEmpty,

‎frontend/src/views/HomeView.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<v-card-text>Maintain or edit organization or facility information and request a change.</v-card-text>
5050
</v-card>
5151
</v-col>
52-
<v-col v-if="false" cols="12" md="6" lg="4">
52+
<v-col cols="12" md="6" lg="4">
5353
<v-card id="help-card" class="basic-card" prepend-icon="mdi-help-circle-outline" title="Help and Resources" @click="$router.push({ name: 'help' })">
5454
<v-card-text>Need support? Find program training tools, resources and technical help.</v-card-text>
5555
</v-card>

‎frontend/src/views/applications/ApplicationsHistoryView.vue‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,9 @@ export default {
305305
return false
306306
//OFM core generates PDF upon submit - Supp App generates PDF only once approved
307307
} else if (application.applicationType === APPLICATION_TYPES.OFM) {
308-
return !this.DRAFT_STATUS_CODES.includes(application?.statusCode)
308+
return false
309+
// OFMCC-6204 - temporary hide the PDF button for Base Funding Application because of the missing fields issue
310+
// return !this.DRAFT_STATUS_CODES.includes(application?.statusCode)
309311
}
310312
return application.statusCode === SUPPLEMENTARY_APPLICATION_STATUS_CODES.APPROVED || application.statusCode === SUPPLEMENTARY_APPLICATION_STATUS_CODES.SUBMITTED
311313
},

‎frontend/src/views/applications/EligibilityView.vue‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<template>
22
<v-form ref="form">
3-
<AppAlertBanner type="info">
4-
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
5-
<a href="https://www2.gov.bc.ca/gov/content?id=F0D0FD2A00064CDDBF634CF83E4E2599" target="_blank">$10 a Day Funding website</a>
6-
for eligibility.
7-
</AppAlertBanner>
3+
<AppAlertBanner type="info">Note: If you answer "No" to any of these questions, you will not be eligible for $10 a Day Funding.</AppAlertBanner>
84
<v-card variant="outlined" class="pa-4 my-6">
95
<div>
106
<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>

‎testing/cypress/e2e/1-portal-and-crm-login-and-security/portal_login.cy.js‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
1-
const USERNAME = Cypress.env('PORTAL_USERNAME')
2-
const PASSWORD = Cypress.env('PORTAL_PASSWORD')
3-
const PORTAL_URL = Cypress.env('PORTAL_URL')
1+
const USERNAME = Cypress.env("PORTAL_USERNAME");
2+
const PASSWORD = Cypress.env("PORTAL_PASSWORD");
3+
const PORTAL_URL = Cypress.env("PORTAL_URL");
44

5-
describe('Login to Portal', () => {
6-
it('system messages', () => {
7-
cy.visit(PORTAL_URL)
8-
cy.get('div[role="alert"]').contains('Test Message')
9-
})
10-
it('successful login', () => {
11-
cy.loginToPortal(USERNAME, PASSWORD, PORTAL_URL)
12-
cy.visit(PORTAL_URL)
5+
describe("Login to Portal", () => {
6+
it("system messages", () => {
7+
cy.visit(PORTAL_URL);
8+
cy.get('div[role="alert"]').contains("Test Message");
9+
});
10+
it("successful login", () => {
11+
cy.loginToPortal(USERNAME, PASSWORD, PORTAL_URL);
12+
cy.visit(PORTAL_URL);
1313

1414
// Facility is hidden in Org header
15-
cy.get('#changeFacility').should('not.exist')
15+
cy.get("#changeFacility").should("not.exist");
1616

1717
// All cards are available to Account Manager
18-
cy.get('#reporting-card').should('exist')
19-
cy.get('#funding-card').should('exist')
20-
cy.get('#assistance-card').should('exist')
21-
cy.get('#applications-card').should('exist')
22-
cy.get('#account-mgmt-card').should('exist')
23-
cy.get('#help-card').should('not.exist')
24-
})
18+
cy.get("#reporting-card").should("exist");
19+
cy.get("#funding-card").should("exist");
20+
cy.get("#assistance-card").should("exist");
21+
cy.get("#applications-card").should("exist");
22+
cy.get("#account-mgmt-card").should("exist");
23+
cy.get("#help-card").should("exist");
24+
});
2525

26-
it('failed login', () => {
26+
it("failed login", () => {
2727
// SSO has error in application code on failed login
28-
cy.on('uncaught:exception', (e) => {
29-
return false
30-
})
31-
cy.loginToPortalNoSession('doesnotexist', 'password', PORTAL_URL)
32-
cy.visit(PORTAL_URL)
28+
cy.on("uncaught:exception", (e) => {
29+
return false;
30+
});
31+
cy.loginToPortalNoSession("doesnotexist", "password", PORTAL_URL);
32+
cy.visit(PORTAL_URL);
3333
// Should be back on Login screen
34-
cy.get('a[id=bceid-login').should('exist')
35-
cy.get('#reporting-card').should('not.exist')
36-
})
37-
})
34+
cy.get("a[id=bceid-login").should("exist");
35+
cy.get("#reporting-card").should("not.exist");
36+
});
37+
});

0 commit comments

Comments
 (0)