Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugfix/ccfri 1125 #334

Closed
wants to merge 20 commits into from
Closed

Bugfix/ccfri 1125 #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
72174bd
made spaces questions and answers mandatory
May 18, 2023
4c1d121
added required to various fields
May 18, 2023
c44dd3c
made spaces questions and answers mandatory
May 18, 2023
faaa3b2
added required to various fields
May 18, 2023
76ff4c7
Merge branch 'bugfix/CCFRI-1125' of github.com:bcgov/EDUC-CCOF into b…
May 24, 2023
e402a9b
added required to summary declaration
May 24, 2023
56a58af
adjusted formatted back to normal
Jul 10, 2023
67996ff
more formating fixes
Jul 10, 2023
8ad5297
more formating fixes
Jul 10, 2023
5f414bc
more formating fixes
Jul 10, 2023
ba52052
more formating fixes
Jul 10, 2023
2556f48
more formating fixes
Jul 10, 2023
00be6c8
more formating fixes
Jul 11, 2023
2c968fb
more formating fixes
Jul 11, 2023
41d6a1c
more formating fixes
Jul 11, 2023
e81a2ef
more formating fixes
Jul 11, 2023
a0ba302
more formating fixes
Jul 11, 2023
c4c6e81
more formating fixes
Jul 11, 2023
59d859a
Merge branch 'main' into bugfix/CCFRI-1125
roblo-cgi Jul 11, 2023
7bc2c08
added required for family
Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 41 additions & 28 deletions frontend/src/components/ccofApplication/family/FamilyFunding.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,45 +170,58 @@
<v-col cols="12" md="6">
<v-card-subtitle><strong>4 hours or less</strong> extended child care</v-card-subtitle>
<v-row class="padded-row">
<v-text-field :disabled="isLocked" outlined type="number" v-model.number="model.extendedChildCareUnder36Months4OrLess" :rules="rules.notRequired" label="Family Child Care (under 36 months)" />
<v-text-field :disabled="isLocked" outlined type="number"
v-model.number="model.extendedChildCareUnder36Months4OrLess" :rules="rules.required"
label="Family Child Care (under 36 months)" />
</v-row>
<v-row class="padded-row">
<v-text-field :disabled="isLocked" outlined type="number" v-model.number="model.extendedChildCare36MonthsToSchoolAge4OrLess" :rules="rules.notRequired" label="Family Child Care (36 months to School Age)" />
<v-text-field :disabled="isLocked" outlined type="number"
v-model.number="model.extendedChildCare36MonthsToSchoolAge4OrLess" :rules="rules.required"
label="Family Child Care (36 months to School Age)" />
</v-row>
<v-row class="padded-row">
<v-text-field :disabled="isLocked" outlined type="number" v-model.number="model.extendedChildCareSchoolAge4OrLess" :rules="rules.notRequired" label="Family Child Care (School Age / School age care on School Grounds)" />
<v-text-field :disabled="isLocked" outlined type="number"
v-model.number="model.extendedChildCareSchoolAge4OrLess" :rules="rules.required"
label="Family Child Care (School Age / School age care on School Grounds)" />
</v-row>
<v-row class="padded-row">
<v-text-field :disabled="isLocked" outlined type="number" v-model.number="model.multiAgeCare4OrLess" :rules="rules.notRequired" label="Multi-Age Care" />
<v-text-field :disabled="isLocked" outlined type="number" v-model.number="model.multiAgeCare4OrLess"
:rules="rules.required" label="Multi-Age Care" />
</v-row>
</v-col>
<v-col cols="12" md="6">
<v-card-subtitle><strong>More than 4</strong> extended child care</v-card-subtitle>
<v-row class="padded-row">
<v-text-field :disabled="isLocked" outlined type="number" v-model.number="model.extendedChildCareUnder36Months4OrMore" :rules="rules.notRequired" label="Family Child Care (under 36 months)" />
</v-row>
<v-row class="padded-row">
<v-text-field :disabled="isLocked" outlined type="number" v-model.number="model.extendedChildCare36MonthsToSchoolAge4OrMore" :rules="rules.notRequired" label="Family Child Care (36 months to School Age)" />
</v-row>
<v-row class="padded-row">
<v-text-field :disabled="isLocked" outlined type="number" v-model.number="model.extendedChildCareSchoolAge4OrMore" :rules="rules.notRequired" label="Family Child Care (School Age/ School age care on School Grounds)" />
</v-row>
<v-row class="padded-row">
<v-text-field :disabled="isLocked" outlined type="number" v-model.number="model.multiAgeCare4more" :rules="rules.notRequired" label="Multi-Age Care" />
</v-row>
</v-col>
</v-row>
</v-container>
</v-card>

</v-row>

<NavButton :isNextDisplayed="true" :isSaveDisplayed="true"
:isSaveDisabled="isLocked" :isNextDisabled="!model.isCCOFComplete" :isProcessing="processing"
@previous="previous" @next="next" @validateForm="validateForm()" @save="save(true)"></NavButton>
</v-container>
</v-form>
</template>
<v-text-field :disabled="isLocked" outlined type="number"
v-model.number="model.extendedChildCareUnder36Months4OrMore" :rules="rules.required"
label="Family Child Care (under 36 months)" />
</v-row>
<v-row class="padded-row">
<v-text-field :disabled="isLocked" outlined type="number"
v-model.number="model.extendedChildCare36MonthsToSchoolAge4OrMore" :rules="rules.required"
label="Family Child Care (36 months to School Age)" />
</v-row>
<v-row class="padded-row">
<v-text-field :disabled="isLocked" outlined type="number"
v-model.number="model.extendedChildCareSchoolAge4OrMore" :rules="rules.required"
label="Family Child Care (School Age/ School age care on School Grounds)" />
</v-row>
<v-row class="padded-row">
<v-text-field :disabled="isLocked" outlined type="number" v-model.number="model.multiAgeCare4more"
:rules="rules.required" label="Multi-Age Care" />
</v-row>
</v-col>
</v-row>
</v-container>
</v-card>

</v-row>

<NavButton :isNextDisplayed="true" :isSaveDisplayed="true" :isSaveDisabled="isLocked"
:isNextDisabled="!model.isCCOFComplete" :isProcessing="processing" @previous="previous" @next="next"
@validateForm="validateForm()" @save="save(true)"></NavButton>
</v-container>
</v-form></template>

<script>

Expand Down
101 changes: 50 additions & 51 deletions frontend/src/components/ccofApplication/group/FundAmount.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,28 +109,28 @@

<v-row>
<v-col>
<v-text-field :disabled="isLocked" type="number" min="0" outlined required :rules="[...rules.required,groupValueRuleMaxGroupChildCareUnder36()]" v-model.number="model.maxGroupChildCareUnder36" label="Maximum Number for Group Child Care (under 36 months)" />
<v-text-field :disabled="isLocked" type="number" min="0" outlined required :rules="[...rules.required, groupValueRuleMaxGroupChildCareUnder36()]" v-model.number="model.maxGroupChildCareUnder36" label="Maximum Number for Group Child Care (under 36 months)" />
</v-col>
</v-row>

<v-row>
<v-col>
<v-text-field :disabled="isLocked" type="number" min="0" outlined required :rules="[...rules.required,groupValueRuleMaxGroupChildCare36()]" v-model.number="model.maxGroupChildCare36" label="Maximum Number for Group Child Care (30 months to School Age)" />
<v-text-field :disabled="isLocked" type="number" min="0" outlined required :rules="[...rules.required, groupValueRuleMaxGroupChildCare36()]" v-model.number="model.maxGroupChildCare36" label="Maximum Number for Group Child Care (30 months to School Age)" />
</v-col>
</v-row>
<v-row>
<v-col>
<v-text-field :disabled="isLocked" type="number" min="0" outlined required :rules="[...rules.required,groupValueRuleMaxPreschool()]" v-model.number="model.maxPreschool" label="Maximum Number for Preschool" />
<v-text-field :disabled="isLocked" type="number" min="0" outlined required :rules="[...rules.required, groupValueRuleMaxPreschool()]" v-model.number="model.maxPreschool" label="Maximum Number for Preschool" />
</v-col>
</v-row>
<v-row>
<v-col>
<v-text-field :disabled="isLocked" type="number" min="0" outlined required :rules="[...rules.required,groupValueRuleMaxGroupChildCareSchool()]" v-model.number="model.maxGroupChildCareSchool" label="Maximum Number for Group Child Care (School Age / School Age Care on School Grounds)" />
<v-text-field :disabled="isLocked" type="number" min="0" outlined required :rules="[...rules.required, groupValueRuleMaxGroupChildCareSchool()]" v-model.number="model.maxGroupChildCareSchool" label="Maximum Number for Group Child Care (School Age / School age care on School Grounds)" />
</v-col>
</v-row>
<v-row>
<v-col>
<v-text-field :disabled="isLocked" type="number" min="0" outlined required :rules="[...rules.required,groupValueRuleMaxGroupChildCareMultiAge()]" v-model.number="model.maxGroupChildCareMultiAge" label="Maximum Multi-Age Child Care" />
<v-text-field :disabled="isLocked" type="number" min="0" outlined required :rules="[...rules.required, groupValueRuleMaxGroupChildCareMultiAge()]" v-model.number="model.maxGroupChildCareMultiAge" label="Maximum Multi-Age Child Care" />
</v-col>
</v-row>

Expand All @@ -139,45 +139,48 @@

<v-card v-if="model.maxPreschool > 0" class="cc-top-level-card" width="1200">
<v-card-title>Preschool</v-card-title>
<v-card-subtitle>Please indicate how many preschool sessions your facility offers per day</v-card-subtitle>

<v-container>
<v-row>
<v-col>
<v-text-field :disabled="isLocked" type="number" outlined required :rules="rules.required" v-model.number="model.monday" label="Monday" />
</v-col>
<v-col>
<v-text-field :disabled="isLocked" type="number" outlined required :rules="rules.required" v-model.number="model.tusday" label="Tuesday" />
</v-col>
<v-col>
<v-text-field :disabled="isLocked" type="number" outlined required :rules="rules.required" v-model.number="model.wednesday" label="Wednesday" />
</v-col>
<v-col>
<v-text-field :disabled="isLocked" type="number" outlined required :rules="rules.required" v-model.number="model.thursday" label="Thursday" />
</v-col>
<v-col>
<v-text-field :disabled="isLocked" type="number" outlined required :rules="rules.required" v-model.number="model.friday" label="Friday" />
</v-col>
<v-col>
<v-text-field :readonly="!isLocked" :disabled="isLocked" type="number" outlined v-bind:value="(model.monday || 0) + (model.tusday || 0) + (model.wednesday || 0) + (model.thursday || 0) + (model.friday || 0)" label="Total" />
</v-col>
</v-row>
</v-container>
<v-container>
<v-row>
<v-col>
<label>Please indicate how many preschool sessions your facility offers per day</label>
</v-col>
</v-row>
<v-row>
<v-col>
<v-text-field :disabled="isLocked" type="number" outlined required :rules="rules.required" v-model.number="model.monday" label="Monday" />
</v-col>
<v-col>
<v-text-field :disabled="isLocked" type="number" outlined required :rules="rules.required" v-model.number="model.tusday" label="Tuesday" />
</v-col>
<v-col>
<v-text-field :disabled="isLocked" type="number" outlined required :rules="rules.required" v-model.number="model.wednesday" label="Wednesday" />
</v-col>
<v-col>
<v-text-field :disabled="isLocked" type="number" outlined required :rules="rules.required" v-model.number="model.thursday" label="Thursday" />
</v-col>
<v-col>
<v-text-field :disabled="isLocked" type="number" outlined required :rules="rules.required" v-model.number="model.friday" label="Friday" />
</v-col>
<v-col>
<v-text-field :readonly="!isLocked" :disabled="isLocked" type="number" outlined v-bind:value="(model.monday || 0) + (model.tusday || 0) + (model.wednesday || 0) + (model.thursday || 0) + (model.friday || 0)" label="Total" />
</v-col>
</v-row>
</v-container>
</v-card>

<v-card v-if="model.maxGroupChildCareSchool > 0" class="cc-top-level-card" width="1200">
<v-container>


<v-row>
<v-col>
<v-radio-group :disabled="isLocked" row v-model="model.isSchoolProperty" label="Is the facility located on school property?">
<v-radio label="Yes" value="yes" />
<v-radio label="No" value="no" />
</v-radio-group>
</v-col>
</v-row>
</v-container>
<v-col>
<v-radio-group :disabled="isLocked" row v-model="model.isSchoolProperty" :rules="rules.required" label="Is the facility located on school property?">
<v-radio label="Yes" value="yes" />
<v-radio label="No" value="no" />
</v-radio-group>
</v-col>
</v-row>
</v-container>

<v-card-title v-show="model.isSchoolProperty === 'yes'">Group Child Care (School Age Care on School Grounds)</v-card-title>

Expand Down Expand Up @@ -228,49 +231,45 @@
</v-card>

<v-card class="cc-top-level-card" width="1200">
<v-card-subtitle>Write the maximum <strong>number of spaces</strong> you offer extended hours of child care
for
each type of service</v-card-subtitle>
<v-card-subtitle>Write the maximum <strong>number of spaces</strong> you offer extended hours of child care for each type of service</v-card-subtitle>
<v-container>
<v-row>
<v-col cols="12" md="6">
<v-card-subtitle><strong>4 hours or less</strong> extended child care</v-card-subtitle>
<v-row class="padded-row">
<v-text-field :disabled="isLocked" outlined type="number" v-model.number="model.extendedChildCareUnder36Months4OrLess" :rules="rules.notRequired" label="Group Child Care (under 36 months)" />
<v-text-field :disabled="isLocked" outlined type="number" v-model.number="model.extendedChildCareUnder36Months4OrLess" :rules="rules.required" label="Group Child Care (under 36 months)" />
</v-row>
<v-row class="padded-row">
<v-text-field :disabled="isLocked" outlined type="number" v-model.number="model.extendedChildCare36MonthsToSchoolAge4OrLess" :rules="rules.notRequired" label="Group Child Care (30 months to School Age)" />
<v-text-field :disabled="isLocked" outlined type="number" v-model.number="model.extendedChildCare36MonthsToSchoolAge4OrLess" :rules="rules.required" label="Group Child Care (30 months to School Age)" />
</v-row>
<v-row class="padded-row">
<v-text-field :disabled="isLocked" outlined type="number" v-model.number="model.extendedChildCareSchoolAge4OrLess" :rules="rules.notRequired" label="Group Child Care (School Age / School Age Care on School Grounds)" />
<v-text-field :disabled="isLocked" outlined type="number" v-model.number="model.extendedChildCareSchoolAge4OrLess" :rules="rules.required" label="Group Child Care (School Age / School age care on School Grounds)" />
</v-row>
<v-row class="padded-row">
<v-text-field :disabled="isLocked" outlined type="number" v-model.number="model.multiAgeCare4OrLess" :rules="rules.notRequired" label="Multi-Age Child Care" />
<v-text-field :disabled="isLocked" outlined type="number" v-model.number="model.multiAgeCare4OrLess" :rules="rules.required" label="Multi-Age Care" />
</v-row>
</v-col>
<v-col cols="12" md="6">
<v-card-subtitle><strong>More than 4</strong> extended child care</v-card-subtitle>
<v-row class="padded-row">
<v-text-field :disabled="isLocked" outlined type="number" v-model.number="model.extendedChildCareUnder36Months4OrMore" :rules="rules.notRequired" label="Group Child Care (under 36 months)" />
<v-text-field :disabled="isLocked" outlined type="number" v-model.number="model.extendedChildCareUnder36Months4OrMore" :rules="rules.required" label="Group Child Care (under 36 months)" />
</v-row>
<v-row class="padded-row">
<v-text-field :disabled="isLocked" outlined type="number" v-model.number="model.extendedChildCare36MonthsToSchoolAge4OrMore" :rules="rules.notRequired" label="Group Child Care (30 months to School Age)" />
<v-text-field :disabled="isLocked" outlined type="number" v-model.number="model.extendedChildCare36MonthsToSchoolAge4OrMore" :rules="rules.required" label="Group Child Care (30 months to School Age)" />
</v-row>
<v-row class="padded-row">
<v-text-field :disabled="isLocked" outlined type="number" v-model.number="model.extendedChildCareSchoolAge4OrMore" :rules="rules.notRequired" label="Group Child Care (School Age/ School Age Care on School Grounds)" />
<v-text-field :disabled="isLocked" outlined type="number" v-model.number="model.extendedChildCareSchoolAge4OrMore" :rules="rules.required" label="Group Child Care (School Age/ School age care on School Grounds)" />
</v-row>
<v-row class="padded-row">
<v-text-field :disabled="isLocked" outlined type="number" v-model.number="model.multiAgeCare4more" :rules="rules.notRequired" label="Multi-Age Child Care" />
<v-text-field :disabled="isLocked" outlined type="number" v-model.number="model.multiAgeCare4more" :rules="rules.required" label="Multi-Age Care" />
</v-row>
</v-col>
</v-row>
</v-container>
</v-card>
</v-row>

<NavButton :isNextDisplayed="true" :isSaveDisplayed="true"
:isSaveDisabled="isLocked" :isNextDisabled="!model.isCCOFComplete" :isProcessing="processing"
@previous="previous" @next="next" @validateForm="validateForm()" @save="save(true)"></NavButton>
<NavButton :isNextDisplayed="true" :isSaveDisplayed="true" :isSaveDisabled="isLocked" :isNextDisabled="!model.isCCOFComplete" :isProcessing="processing" @previous="previous" @next="next" @validateForm="validateForm()" @save="save(true)"></NavButton>
</v-container>
</v-form>
</template>
Expand Down
Loading