Skip to content

Commit

Permalink
Merge pull request #1506 from bcgov/fix/edx-2451
Browse files Browse the repository at this point in the history
EDX-2451: displaying the school name and mincode when a district user…
  • Loading branch information
SodhiA1 authored May 1, 2024
2 parents 95c3044 + ab01920 commit 8d8daee
Showing 1 changed file with 16 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
no-gutters
class="mt-1 d-flex justify-start"
>
<v-col>
<v-col v-if="this.userInfo.activeInstituteType === 'DISTRICT'">
<h2>{{ sdcSchoolSchool?.schoolName }} ({{ sdcSchoolSchool?.mincode }})</h2>
<h3>{{ currentCollectionTypeCode }} {{ currentCollectionYear }} Collection</h3>
</v-col>
<v-col v-else>
<h2>{{ currentCollectionTypeCode }} {{ currentCollectionYear }} Collection</h2>
</v-col>
</v-row>
Expand Down Expand Up @@ -179,6 +183,8 @@ import StepThreeVerifyData from './stepThreeVerifyData/StepThreeVerifyData.vue';
import StepFiveSchoolDetails from './StepFiveSchoolDetails.vue';
import StepSixSchoolContacts from './StepSixSchoolContacts.vue';
import StepSevenSubmitData from './StepSevenSubmitData.vue';
import {authStore} from '../../../store/modules/auth';
import {appStore} from '../../../store/modules/app';
export default {
name: 'SDCCollectionView',
Expand Down Expand Up @@ -210,16 +216,25 @@ export default {
},
computed: {
...mapState(sdcCollectionStore, ['currentCollectionTypeCode', 'schoolCollection','currentCollectionYear']),
...mapState(appStore, ['activeSchoolsMap']),
...mapState(authStore, ['userInfo']),
stepInCollection() {
return this.getIndexOfSDCCollectionByStatusCode(this.schoolCollection?.sdcSchoolCollectionStatusCode);
},
isStepComplete() {
let indexCurrentCollection = this.getIndexOfSDCCollectionByStatusCode(this.schoolCollection.sdcSchoolCollectionStatusCode);
return this.currentStep < indexCurrentCollection;
},
sdcSchoolSchool() {
if (!this.schoolID) {
return null;
}
return this.activeSchoolsMap.get(this.schoolID);
}
},
created() {
this.isLoading = !this.isLoading;
appStore().getInstitutesData();
sdcCollectionStore().getSchoolCollection(this.$route.params.schoolCollectionID).finally(() => {
this.schoolCollectionObject = this.schoolCollection;
this.schoolID = this.schoolCollection.schoolID;
Expand Down

0 comments on commit 8d8daee

Please sign in to comment.