Skip to content

Incorrect July Collection Comparison in SCH/DIS | Step 3/Step 5 of SLD (1701) #1879

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

Merged
merged 1 commit into from
Aug 29, 2024
Merged

Incorrect July Collection Comparison in SCH/DIS | Step 3/Step 5 of SLD (1701) #1879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion frontend/src/components/common/SummaryComponent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
id="compare-switch"
v-model="compareSwitch"
color="primary"
label="compare to previous September Collection"
:label="currentCollectionTypeCode === 'July' ? 'compare to previous July Collection' : 'compare to previous September Collection' "
style="justify-items: right;"
@update:model-value="compare()"
/>
Expand Down Expand Up @@ -169,6 +169,8 @@ import ApiService from '../../common/apiService';
import {ApiRoutes} from '../../utils/constants';
import HeadCountReportComponent from './HeadCountReportComponent.vue';
import {getComparisonIcon, getStatusColor} from '../../utils/common';
import {mapState} from 'pinia';
import {sdcCollectionStore} from '../../store/modules/sdcCollection';

export default {
name: 'SummaryComponent',
Expand Down Expand Up @@ -201,6 +203,9 @@ export default {
tableID: null
};
},
computed: {
...mapState(sdcCollectionStore, ['currentCollectionTypeCode']),
},
watch: {
headcountType: {
handler() {
Expand Down
5 changes: 4 additions & 1 deletion ...d/src/components/sdcCollection/sdcSchoolCollection/stepOneUploadData/SummaryComponent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
id="compare-switch"
v-model="compareSwitch"
color="primary"
label="compare to previous September Collection"
:label="currentCollectionTypeCode === 'July' ? 'compare to previous July Collection' : 'compare to previous September Collection' "
style="justify-items: right;"
@update:model-value="compare()"
/>
Expand Down Expand Up @@ -109,6 +109,8 @@ import {FTE, FRENCH_PR, CAREER_PR, SPECIALED_PR, INDSUPPORT_PR, ELL} from '../..
import {isEmpty, omitBy} from 'lodash';
import EnrollmentHeadcountsComponent from './EnrollmentHeadcountsComponent.vue';
import IndigenousHeadcountsComponent from './IndigenousHeadcountsComponent.vue';
import {mapState} from 'pinia';
import {sdcCollectionStore} from '../../../../store/modules/sdcCollection';

export default defineComponent({
name: 'SummaryComponent',
Expand Down Expand Up @@ -138,6 +140,7 @@ export default defineComponent({
};
},
computed: {
...mapState(sdcCollectionStore, ['currentCollectionTypeCode']),
config() {
if(this.selectedTab==='Overall') {
return FTE.summaryReport[0].endpoint;
Expand Down
Loading