Skip to content

Commit

Permalink
Merge pull request #602 from bcgov/ccfri-4004-ui-bugs
Browse files Browse the repository at this point in the history 
ccfri 4004, and other small ui bug fixes
  • Loading branch information
@jenbeckett
jenbeckett authored Dec 23, 2024
2 parents f20020d + 8510a05 commit a1dbf32
Show file tree
Hide file tree
Showing 11 changed files with 351 additions and 234 deletions.
5 changes: 2 additions & 3 deletions frontend/src/components/LandingPage.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@
</v-container>
</template>
<script>
import { isEmpty } from 'lodash';
import { isEmpty, orderBy } from 'lodash';
import { mapState, mapActions } from 'pinia';
import { useAuthStore } from '@/store/auth.js';
import { useAppStore } from '@/store/app.js';
Expand Down Expand Up @@ -497,7 +497,6 @@ export default {
},
ccofRenewStatus() {
if (this.applicationType === 'RENEW') {
console.log(this.applicationStatus);
if (this.applicationStatus === 'DRAFT') {
return this.RENEW_STATUS_CONTINUE;
} else if (this.isWithinRenewDate) {
Expand Down Expand Up @@ -805,7 +804,7 @@ export default {
return false;
});
if (mtfiChangeRequestListForFacility?.length > 0) {
mtfiChangeRequestListForFacility = _.orderBy(mtfiChangeRequestListForFacility, 'firstSubmissionDate', 'desc');
mtfiChangeRequestListForFacility = orderBy(mtfiChangeRequestListForFacility, 'firstSubmissionDate', 'desc');
lastMTFIChangeRequest = mtfiChangeRequestListForFacility[0];
}
}
Expand Down
154 changes: 114 additions & 40 deletions frontend/src/components/ccofApplication/family/FamilyFunding.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,47 +85,121 @@
</v-col>
</v-row>

<v-row v-show="model.hasClosedMonth === 'yes'">
<v-col>
<v-checkbox v-model="model.closedIn1" :disabled="isLocked" label="Jan" />
</v-col>
<v-col>
<v-checkbox v-model="model.closedIn2" :disabled="isLocked" label="Feb" />
</v-col>
<v-col>
<v-checkbox v-model="model.closedIn3" :disabled="isLocked" label="Mar" />
</v-col>
<v-col>
<v-checkbox v-model="model.closedIn4" :disabled="isLocked" label="Apr" />
</v-col>
<v-col>
<v-checkbox v-model="model.closedIn5" :disabled="isLocked" label="May" />
</v-col>
<v-col>
<v-checkbox v-model="model.closedIn6" :disabled="isLocked" label="Jun" />
</v-col>
</v-row>
<template v-if="model.hasClosedMonth === 'yes'">
<v-row>
<v-col>
<v-checkbox
v-model="model.closedIn1"
:true-value="1"
:false-value="0"
:disabled="isLocked"
label="Jan"
/>
</v-col>
<v-col>
<v-checkbox
v-model="model.closedIn2"
:true-value="1"
:false-value="0"
:disabled="isLocked"
label="Feb"
/>
</v-col>
<v-col>
<v-checkbox
v-model="model.closedIn3"
:true-value="1"
:false-value="0"
:disabled="isLocked"
label="Mar"
/>
</v-col>
<v-col>
<v-checkbox
v-model="model.closedIn4"
:true-value="1"
:false-value="0"
:disabled="isLocked"
label="Apr"
/>
</v-col>
<v-col>
<v-checkbox
v-model="model.closedIn5"
:true-value="1"
:false-value="0"
:disabled="isLocked"
label="May"
/>
</v-col>
<v-col>
<v-checkbox
v-model="model.closedIn6"
:true-value="1"
:false-value="0"
:disabled="isLocked"
label="Jun"
/>
</v-col>
</v-row>

<v-row v-show="model.hasClosedMonth === 'yes'">
<v-col>
<v-checkbox v-model="model.closedIn7" :disabled="isLocked" label="Jul" />
</v-col>
<v-col>
<v-checkbox v-model="model.closedIn8" :disabled="isLocked" label="Aug" />
</v-col>
<v-col>
<v-checkbox v-model="model.closedIn9" :disabled="isLocked" label="Sep" />
</v-col>
<v-col>
<v-checkbox v-model="model.closedIn10" :disabled="isLocked" label="Oct" />
</v-col>
<v-col>
<v-checkbox v-model="model.closedIn11" :disabled="isLocked" label="Nov" />
</v-col>
<v-col>
<v-checkbox v-model="model.closedIn12" :disabled="isLocked" label="Dec" />
</v-col>
</v-row>
<v-row>
<v-col>
<v-checkbox
v-model="model.closedIn7"
:true-value="1"
:false-value="0"
:disabled="isLocked"
label="Jul"
/>
</v-col>
<v-col>
<v-checkbox
v-model="model.closedIn8"
:true-value="1"
:false-value="0"
:disabled="isLocked"
label="Aug"
/>
</v-col>
<v-col>
<v-checkbox
v-model="model.closedIn9"
:true-value="1"
:false-value="0"
:disabled="isLocked"
label="Sep"
/>
</v-col>
<v-col>
<v-checkbox
v-model="model.closedIn10"
:true-value="1"
:false-value="0"
:disabled="isLocked"
label="Oct"
/>
</v-col>
<v-col>
<v-checkbox
v-model="model.closedIn11"
:true-value="1"
:false-value="0"
:disabled="isLocked"
label="Nov"
/>
</v-col>
<v-col>
<v-checkbox
v-model="model.closedIn12"
:true-value="1"
:false-value="0"
:disabled="isLocked"
label="Dec"
/>
</v-col>
</v-row>
</template>

<v-row>
<v-col cols="12" md="6">
Expand Down
154 changes: 114 additions & 40 deletions frontend/src/components/ccofApplication/group/FundAmount.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,47 +78,121 @@
</v-col>
</v-row>

<v-row v-show="model.hasClosedMonth === 'yes'">
<v-col>
<v-checkbox v-model="model.closedIn1" :disabled="isLocked" label="Jan" />
</v-col>
<v-col>
<v-checkbox v-model="model.closedIn2" :disabled="isLocked" label="Feb" />
</v-col>
<v-col>
<v-checkbox v-model="model.closedIn3" :disabled="isLocked" label="Mar" />
</v-col>
<v-col>
<v-checkbox v-model="model.closedIn4" :disabled="isLocked" label="Apr" />
</v-col>
<v-col>
<v-checkbox v-model="model.closedIn5" :disabled="isLocked" label="May" />
</v-col>
<v-col>
<v-checkbox v-model="model.closedIn6" :disabled="isLocked" label="Jun" />
</v-col>
</v-row>
<template v-if="model.hasClosedMonth === 'yes'">
<v-row>
<v-col>
<v-checkbox
v-model="model.closedIn1"
:true-value="1"
:false-value="0"
:disabled="isLocked"
label="Jan"
/>
</v-col>
<v-col>
<v-checkbox
v-model="model.closedIn2"
:true-value="1"
:false-value="0"
:disabled="isLocked"
label="Feb"
/>
</v-col>
<v-col>
<v-checkbox
v-model="model.closedIn3"
:true-value="1"
:false-value="0"
:disabled="isLocked"
label="Mar"
/>
</v-col>
<v-col>
<v-checkbox
v-model="model.closedIn4"
:true-value="1"
:false-value="0"
:disabled="isLocked"
label="Apr"
/>
</v-col>
<v-col>
<v-checkbox
v-model="model.closedIn5"
:true-value="1"
:false-value="0"
:disabled="isLocked"
label="May"
/>
</v-col>
<v-col>
<v-checkbox
v-model="model.closedIn6"
:true-value="1"
:false-value="0"
:disabled="isLocked"
label="Jun"
/>
</v-col>
</v-row>

<v-row v-show="model.hasClosedMonth === 'yes'">
<v-col>
<v-checkbox v-model="model.closedIn7" :disabled="isLocked" label="Jul" />
</v-col>
<v-col>
<v-checkbox v-model="model.closedIn8" :disabled="isLocked" label="Aug" />
</v-col>
<v-col>
<v-checkbox v-model="model.closedIn9" :disabled="isLocked" label="Sep" />
</v-col>
<v-col>
<v-checkbox v-model="model.closedIn10" :disabled="isLocked" label="Oct" />
</v-col>
<v-col>
<v-checkbox v-model="model.closedIn11" :disabled="isLocked" label="Nov" />
</v-col>
<v-col>
<v-checkbox v-model="model.closedIn12" :disabled="isLocked" label="Dec" />
</v-col>
</v-row>
<v-row>
<v-col>
<v-checkbox
v-model="model.closedIn7"
:true-value="1"
:false-value="0"
:disabled="isLocked"
label="Jul"
/>
</v-col>
<v-col>
<v-checkbox
v-model="model.closedIn8"
:true-value="1"
:false-value="0"
:disabled="isLocked"
label="Aug"
/>
</v-col>
<v-col>
<v-checkbox
v-model="model.closedIn9"
:true-value="1"
:false-value="0"
:disabled="isLocked"
label="Sep"
/>
</v-col>
<v-col>
<v-checkbox
v-model="model.closedIn10"
:true-value="1"
:false-value="0"
:disabled="isLocked"
label="Oct"
/>
</v-col>
<v-col>
<v-checkbox
v-model="model.closedIn11"
:true-value="1"
:false-value="0"
:disabled="isLocked"
label="Nov"
/>
</v-col>
<v-col>
<v-checkbox
v-model="model.closedIn12"
:true-value="1"
:false-value="0"
:disabled="isLocked"
label="Dec"
/>
</v-col>
</v-row>
</template>
</v-container>
</v-card>

Expand Down
10 changes: 7 additions & 3 deletions frontend/src/components/requestChanges/ReportChanges.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@
:height="maxChangeHistoryTableHeight"
mobile-breakpoint="md"
fixed-header
:item-class="getChangeRequestStyle"
class="elevation-4 my-4"
disable-pagination
hide-default-footer
Expand All @@ -122,6 +121,11 @@
</div>
</v-tooltip>
</template>
<template #item.externalStatus="{ item }">
<span :class="['tableText', getChangeRequestStyle(item.externalStatus)]">
{{ item.externalStatus }}
</span>
</template>
<template #item.actions="{ item }">
<v-btn
v-if="isContinueButtonDisplayed(item.externalStatus)"
Expand Down Expand Up @@ -492,8 +496,8 @@ export default {
}
return '- - - -';
},
getChangeRequestStyle(changeRequest) {
return changeRequest.externalStatus === 'Action Required' ? 'redText' : '';
getChangeRequestStyle(status) {
return status === 'Action Required' ? 'redText' : '';
},
next() {
this.$router.push(PATHS.ROOT.HOME);
Expand Down
Loading

0 comments on commit a1dbf32

Please sign in to comment.