Skip to content

Commit

Permalink
Merge pull request #1056 from bcgov/feature/uploadfix
Browse files Browse the repository at this point in the history
Upload fix.
  • Loading branch information
mightycox authored Sep 22, 2023
2 parents cbbe3ef + b056a45 commit 3ac0644
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
8 changes: 4 additions & 4 deletions frontend/src/components/sdcCollection/SDCCollectionView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,10 @@ export default {
},
refreshStore() {
useSdcCollectionStore().getSchoolCollection(this.$route.params.schoolCollectionID).finally(() => {
this.schoolCollectionObject = this.schoolCollection;
this.schoolID = this.schoolCollection.schoolID;
this.steps = [...this.stepsInCollectionProcess];
});
this.schoolCollectionObject = this.schoolCollection;
this.schoolID = this.schoolCollection.schoolID;
this.steps = [...this.stepsInCollectionProcess];
});
},
backToCollectionDashboard() {
this.$router.push({name: 'sdcCollectionSummary', params: {schoolID: this.schoolID}});
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/store/modules/sdcCollection.js
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ export const useSdcCollectionStore = defineStore('sdcCollection', {
this.setCollectionMetaData(response.data.sdcSchoolCollectionStatusCode);
}
},
setCollectionMetaData(sdcSchoolCollectionStatusCode) {
setCollectionMetaData(sdcSchoolCollectionStatusCode) {
switch(sdcSchoolCollectionStatusCode) {
case 'NEW':
this.setCurrentStepInCollectionProcess(this.stepsInCollectionProcess.find(step => step.label === 'STEP-1'));
Expand All @@ -162,8 +162,9 @@ export const useSdcCollectionStore = defineStore('sdcCollection', {
},
setStepsProgressState() {
this.stepsInCollectionProcess.forEach(step => {
if (step.index <= this.currentStepInCollectionProcess.index) {
if (step.index === this.currentStepInCollectionProcess.index) {
step.isStarted = true;
step.isComplete = false;
}
if(step.index < this.currentStepInCollectionProcess.index) {
step.isComplete = true;
Expand Down

0 comments on commit 3ac0644

Please sign in to comment.