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.

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

Bugfix/ccfri 1125 #334

Closed
wants to merge 20 commits into from
Closed
Show file tree
Hide file tree
Changes from 18 commits
Commits
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
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
52 changes: 24 additions & 28 deletions frontend/src/components/ccofApplication/group/FundAmount.vue
Original file line number Diff line number Diff line change
Expand Up @@ -107,36 +107,36 @@

<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>

</v-container>
</v-card>

<v-card v-if="model.maxPreschool > 0" class="cc-top-level-card" width="1200">
<v-card-title >Preschool</v-card-title>
<v-card-title>Preschool</v-card-title>

<v-container>
<v-row>
Expand Down Expand Up @@ -170,14 +170,14 @@
<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 @@ -231,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 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 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