Skip to content

Commit cc4f17c

Browse files
Small bug fix for summer dates
1 parent e0626b0 commit cc4f17c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
type="warning"
192192
icon="mdi-alert"
193193
variant="text"
194-
text="Only submit data for students who are part of the 2024/2025 reporting cycle. If reporting students in the 2025/2026 school year, wait until the new reporting period opens in October."
194+
:text="'Only submit data for students who are part of the ' + currentYear + '/' + nextYear + ' reporting cycle. If reporting students in the ' + nextYear + '/' + yearAfterNext + ' school year, wait until the new reporting period opens in October.'"
195195
/>
196196
</v-col>
197197
</v-row>
@@ -883,7 +883,7 @@ export default {
883883
ApiService.apiAxios.get(ApiRoutes.gdc.ACTIVE_REPORTING_PERIODS)
884884
.then(response => {
885885
this.activeReportingPeriod = response.data;
886-
let reportingPeriodStart = LocalDateTime.parse(this.activeReportingPeriod.schYrStart);
886+
let reportingPeriodStart = LocalDateTime.parse(this.activeReportingPeriod.periodStart);
887887
this.currentYear = reportingPeriodStart.year();
888888
this.nextYear = reportingPeriodStart.plusYears(1).year();
889889
this.yearAfterNext = reportingPeriodStart.plusYears(2).year();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -835,7 +835,7 @@ export default {
835835
this.isXlsUpload = false;
836836
},
837837
setActiveReportingDates() {
838-
let reportingPeriodStart = LocalDateTime.parse(this.collectionObject.schYrStart);
838+
let reportingPeriodStart = LocalDateTime.parse(this.collectionObject.periodStart);
839839
this.currentYear = reportingPeriodStart.year();
840840
this.nextYear = reportingPeriodStart.plusYears(1).year();
841841
this.yearAfterNext = reportingPeriodStart.plusYears(2).year();

0 commit comments

Comments
 (0)