Skip to content

Commit f38ce0c

Browse files
Merge pull request #2303 from bcgov/feature/egc-310
Summer School file upload fix
2 parents f00c24f + 60be108 commit f38ce0c

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

frontend/src/components/graduation/PreviewStudentsDialog.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
:headers="summerHeaders"
1010
:summer-students="summerStudents"
1111
:district-i-d="districtID"
12+
:school-i-d="schoolID"
1213
@close="closeSheet"
1314
@process="process"
1415
/>
@@ -35,6 +36,7 @@ export default {
3536
summerHeaders: [],
3637
summerStudents: [],
3738
districtID: null,
39+
schoolID: null,
3840
options: {
3941
color: 'primary',
4042
zIndex: 2000000,
@@ -49,11 +51,12 @@ export default {
4951
}
5052
}),
5153
methods: {
52-
open(summerHeaders, summerStudents, districtID, options) {
54+
open(summerHeaders, summerStudents, districtID, schoolID, options) {
5355
this.dialog = true;
5456
this.summerHeaders = summerHeaders;
5557
this.summerStudents = summerStudents;
5658
this.districtID = districtID;
59+
this.schoolID = schoolID;
5760
this.options = Object.assign(this.options, options);
5861
return new Promise((resolve, reject) => {
5962
this.resolve = resolve;

frontend/src/components/graduation/district/upload/GradDistrictUploadDataComponent.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -949,7 +949,7 @@ export default {
949949
this.summerStudents.push(detail);
950950
this.successfulUploadCountXLS += 1;
951951
});
952-
const previewDialog = await this.$refs.previewDialog.open(this.summerHeaders, this.summerStudents, this.districtID, {color: '#fff', closeIcon: false, subtitle: false, dark: false})
952+
const previewDialog = await this.$refs.previewDialog.open(this.summerHeaders, this.summerStudents, this.districtID, null, {color: '#fff', closeIcon: false, subtitle: false, dark: false})
953953
if (!previewDialog) {
954954
this.summerStudents = [];
955955
fileJSON.error = 'Upload cancelled by the user';

frontend/src/components/graduation/school/upload/GradSchoolUploadDataComponent.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -955,7 +955,7 @@ export default {
955955
this.summerStudents.push(detail);
956956
this.successfulXLSUploadCount += 1;
957957
});
958-
const previewDialog = await this.$refs.previewDialog.open(this.summerHeaders, this.summerStudents, this.districtID, {color: '#fff', closeIcon: false, subtitle: false, dark: false})
958+
const previewDialog = await this.$refs.previewDialog.open(this.summerHeaders, this.summerStudents, null, this.schoolID, {color: '#fff', closeIcon: false, subtitle: false, dark: false})
959959
if (!previewDialog) {
960960
this.summerStudents = [];
961961
fileJSON.error = 'Upload cancelled by the user';

0 commit comments

Comments
 (0)