Skip to content

Commit

Permalink
Fixes for Add facility page buttons in application (#613)
Browse files Browse the repository at this point in the history 
* Fixes for Add facility page buttons in application

* disabled yes button when application is locked

* Fixed issues as per review comments and fixed colors for RFI and cancel buttons for Application and change requests.

* Updates to fix discrepancy in button sizing.

* AppDialog changes as per review comments and new fixes for delete facility application page and stay logged in pop-up

* Reverted Yes/No back to large.

* alignment and font fix

* font fix

* Syntax fix

* Some more v-dialog to AppDialog changes as suggested by Jen and removed placeholder from cancel change request pop up

* typo fix

---------

Co-authored-by: weskubo-cgi <[email protected]>
  • Loading branch information
@Panika-cgi
Panika-cgi and weskubo-cgi authored Jan 16, 2025
1 parent 52e981b commit 1de49e5
Show file tree
Hide file tree
Showing 10 changed files with 283 additions and 271 deletions.
55 changes: 29 additions & 26 deletions frontend/src/components/ModalIdle.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,32 @@
<div style="display: none">
<a id="logout_href" :href="routes.SESSION_EXPIRED" />
</div>
<v-dialog v-model="dialog" persistent max-width="525px">
<v-card>
<v-container class="pt-0 px-0 pb-2">
<v-row>
<v-col cols="7" class="py-0 pl-2" style="background-color: #234075">
<v-card-title class="text-white"> Session Time-out </v-card-title>
</v-col>
<v-col cols="5" class="d-flex justify-end" style="background-color: #234075" />
</v-row>
<v-row>
<v-col cols="12" style="background-color: #ffc72c; padding: 2px" />
</v-row>
<v-row>
<v-col cols="12" style="text-align: center">
<p class="pt-0 px-2">
Due to inactivity, you will be logged out of your current session in {{ logoutCounter }} seconds. Please
click on the "Stay logged in" button to continue with this session.
</p>
<p>
<v-btn color="primary" @click="clicked()"> Stay logged in </v-btn>
</p>
</v-col>
</v-row>
</v-container>
</v-card>
</v-dialog>
<AppDialog
v-model="dialog"
persistent
max-width="525px"
title="Session Time-out"
:loading="false"
@close="clicked()"
>
<template #content>
<v-col cols="12">
<p>
Due to inactivity, you will be logged out of your current session in {{ logoutCounter }} seconds. Please
click on the "Stay logged in" button to continue with this session.
</p>
</v-col>
</template>
<template #button>
<v-row justify="space-around">
<v-col cols="12" md="6" class="d-flex justify-center">
<p>
<AppButton :primary="true" @click="clicked()"> Stay logged in </AppButton>
</p>
</v-col>
</v-row>
</template>
</AppDialog>
</v-container>
</template>

Expand All @@ -39,6 +39,8 @@ import { useAppStore } from '@/store/app.js';
import { AuthRoutes } from '@/utils/constants.js';
import ApiService from '@/common/apiService.js';
import AppDialog from '@/components/guiComponents/AppDialog.vue';
import AppButton from '@/components/guiComponents/AppButton.vue';
function getTokenExpiredTime(jwtToken) {
const now = Date.now().valueOf();
Expand All @@ -51,6 +53,7 @@ function getTokenExpiredTime(jwtToken) {
}
export default {
components: { AppButton, AppDialog },
data() {
return {
routes: AuthRoutes,
Expand Down
46 changes: 20 additions & 26 deletions frontend/src/components/SummaryDeclaration.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -454,32 +454,24 @@
@previous="previous"
@submit="submit"
/>
<v-dialog v-model="dialog" persistent max-width="525px">
<v-card>
<v-container class="pt-0">
<v-row>
<v-col cols="7" class="py-0 pl-0" style="background-color: #234075">
<v-card-title class="text-white"> Submission Complete </v-card-title>
</v-col>
<v-col cols="5" class="d-flex justify-end" style="background-color: #234075" />
</v-row>
<v-row>
<v-col cols="12" style="background-color: #ffc72c; padding: 2px" />
</v-row>
<v-row>
<v-col cols="12" style="text-align: center">
<p class="pt-4">
Your submission has been received. Please refer to your dashboard for updates on the progress of your
application. We will contact you if more information is required.
</p>
<p>
<router-link :to="landingPage"> Return to your dashboard </router-link>
</p>
</v-col>
</v-row>
</v-container>
</v-card>
</v-dialog>
<AppDialog
v-model="dialog"
persistent
max-width="525px"
title="Submission Complete"
:loading="false"
@close="dialog = false"
>
<template #content>
<p>
Your submission has been received. Please refer to your dashboard for updates on the progress of your
application. We will contact you if more information is required.
</p>
<p>
<router-link :to="landingPage"> Return to your dashboard </router-link>
</p>
</template>
</AppDialog>
</v-form>
</v-container>
</template>
Expand All @@ -495,6 +487,7 @@ import { useApplicationStore } from '@/store/application.js';
import { useCcfriAppStore } from '@/store/ccfriApp.js';
import { useReportChangesStore } from '@/store/reportChanges.js';
import DocumentService from '@/services/documentService';
import AppDialog from '@/components/guiComponents/AppDialog.vue';
import {
AFS_STATUSES,
Expand All @@ -521,6 +514,7 @@ import { isAnyApplicationUnlocked, isAnyChangeRequestActive } from '@/utils/comm
export default {
components: {
AppDialog,
OrganizationSummary,
UploadedDocumentsSummary,
NMFSummary,
Expand Down
59 changes: 28 additions & 31 deletions frontend/src/components/SupportingDocumentUpload.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,36 +124,32 @@
/>
</v-container>

<v-dialog v-model="dialog" persistent max-width="525px">
<v-card>
<v-container class="pt-0">
<v-row>
<v-col cols="7" class="py-0 pl-0" style="background-color: #234075">
<v-card-title class="text-white"> Please confirm </v-card-title>
</v-col>
<v-col cols="5" class="d-flex justify-end" style="background-color: #234075" />
</v-row>
<v-row>
<v-col cols="12" style="background-color: #ffc72c; padding: 2px" />
</v-row>
<v-row>
<v-col cols="12" style="text-align: left">
<p class="pt-4">
Are you sure you want to change your response? This will remove any documents uploaded to the Change
Notification Form section.
</p>
<p class="pt-4">Select "Continue" to confirm.</p>
</v-col>
</v-row>
<v-row>
<v-col cols="12" style="text-align: center">
<v-btn theme="dark" color="secondary" class="mr-10" @click="backSelected()"> Back </v-btn>
<v-btn theme="dark" color="primary" @click="confirmNoSelected()"> Continue </v-btn>
</v-col>
</v-row>
</v-container>
</v-card>
</v-dialog>
<AppDialog
v-model="dialog"
persistent
max-width="525px"
title="Please Confirm"
:loading="false"
@close="dialog = false"
>
<template #content>
<p>
Are you sure you want to change your response? This will remove any documents uploaded to the Change
Notification Form section.
</p>
<p>Select "Continue" to confirm.</p>
</template>
<template #button>
<v-row>
<v-col cols="12" md="6" class="d-flex justify-center">
<AppButton :primary="false" @click="backSelected()"> Back </AppButton>
</v-col>
<v-col cols="12" md="6" class="d-flex justify-center">
<AppButton :primary="true" @click="confirmNoSelected()"> Continue </AppButton>
</v-col>
</v-row>
</template>
</AppDialog>
</v-form>
</template>

Expand All @@ -172,6 +168,7 @@ import { useSupportingDocumentUploadStore } from '@/store/supportingDocumentUplo
import AppButton from '@/components/guiComponents/AppButton.vue';
import GroupChangeDialogueContent from '@/components/requestChanges/GroupChangeDialogueContent.vue';
import NavButton from '@/components/util/NavButton.vue';
import AppDialog from '@/components/guiComponents/AppDialog.vue';
import DocumentService from '@/services/documentService';
import rules from '@/utils/rules.js';
Expand All @@ -181,7 +178,7 @@ import { deepCloneObject } from '@/utils/common.js';
import { PATHS, DOCUMENT_TYPES, FILE_REQUIREMENTS_TEXT, FILE_TYPES_ACCEPT, changeUrlGuid } from '@/utils/constants.js';
export default {
components: { AppButton, NavButton, GroupChangeDialogueContent },
components: { AppButton, AppDialog, NavButton, GroupChangeDialogueContent },
mixins: [alertMixin],
async beforeRouteLeave(_to, _from, next) {
if (!this.isLocked) {
Expand Down
86 changes: 50 additions & 36 deletions frontend/src/components/ccfriApplication/group/AddNewFees.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -472,42 +472,56 @@
@save="save(true)"
/>

<v-dialog v-model="showRfiDialog" persistent max-width="700px">
<v-card>
<v-container class="pt-0">
<v-row>
<v-col cols="7" class="py-0 pl-0" style="background-color: #234075">
<v-card-title class="text-white"> Request for Information </v-card-title>
</v-col>
<v-col cols="5" class="d-flex justify-end" style="background-color: #234075" />
</v-row>
<v-row>
<v-col cols="12" style="background-color: #ffc72c; padding: 2px" />
</v-row>
<v-row>
<v-col cols="12" style="text-align: center">
<p class="pt-4">
You have entered a parent fee above the {{ formattedProgramYear }} parent fee increase limit for the
following care categories:<br /><br />
<span v-for="item in rfi3percentCategories" :key="item">{{ item }}<br /></span>
</p>
<p>
Parent fee increases over the limit will be assessed under the Parent Fee Increase Exceptions policy
in the {{ formattedProgramYear }} <a :href="fundingUrl" target="_blank">Funding Guidelines</a>. You
can continue to the Request for Information section or press back to update your fees.
</p>
<p class="pt-4">
Please confirm you have provided your highest full-time (i.e. over 4 hours, 5 days a week) parent fee
for each care category before CCFRI is applied. Submit your daily parent fee if you only offer care
for 4 days or fewer per week.
</p>
<v-btn dark color="secondary" class="mr-10" @click="closeDialog()"> Back </v-btn>
<v-btn dark color="primary" @click="toRfi()"> Continue </v-btn>
</v-col>
</v-row>
</v-container>
</v-card>
</v-dialog>
<AppDialog
v-model="showRfiDialog"
persistent
max-width="700px"
title="Request for Information"
:loading="false"
@close="closeDialog()"
>
<template #content>
<v-col cols="12">
<p>
You have entered a parent fee above the {{ formattedProgramYear }} parent fee increase limit for the
following care categories:<br /><br />
<span v-for="item in rfi3percentCategories" :key="item">{{ item }}<br /></span>
</p>
<p>
Parent fee increases over the limit will be assessed under the Parent Fee Increase Exceptions policy in
the
{{ formattedProgramYear }} <a :href="fundingUrl" target="_blank">Funding Guidelines</a>. You can continue
to the Request for Information section or press back to update your fees.
</p>
<p>
Please confirm you have provided your highest full-time (i.e. over 4 hours, 5 days a week) parent fee for
each care category before CCFRI is applied. Submit your daily parent fee if you only offer care for 4 days
or fewer per week.
</p>
</v-col>
</template>

<template #button>
<v-row justify="center" class="pb-4">
<v-col cols="auto" class="pb-3">
<AppButton
:primary="false"
required
size="x-large"
style="width: 120px; height: 48px"
@click="closeDialog()"
>
Back
</AppButton>
</v-col>
<v-col cols="auto" class="pb-3">
<AppButton :primary="true" required size="large" style="width: 120px; height: 48px" @click="toRfi()">
Continue
</AppButton>
</v-col>
</v-row>
</template>
</AppDialog>
</v-container>
</v-form>
</template>
Expand Down
Loading

0 comments on commit 1de49e5

Please sign in to comment.