Skip to content

Commit

Permalink
Merge pull request #379 from bcgov/ofmcc-6203-wording-updates
Browse files Browse the repository at this point in the history
OFMCC-6203 - wording updates
  • Loading branch information
vietle-cgi authored Oct 2, 2024
2 parents d82e2dc + d7c28ec commit 2016277
Show file tree
Hide file tree
Showing 7 changed files with 65 additions and 39 deletions.
2 changes: 1 addition & 1 deletion frontend/src/components/TheHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion frontend/src/router/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,6 @@ const router = createRouter({
name: 'help',
component: HelpView,
meta: {
hidden: true,
requiresAuth: true,
},
},
Expand Down
31 changes: 30 additions & 1 deletion frontend/src/views/HelpView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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>
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/HomeView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/views/applications/ApplicationsHistoryView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down
6 changes: 1 addition & 5 deletions frontend/src/views/applications/EligibilityView.vue
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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");
});
});

0 comments on commit 2016277

Please sign in to comment.