Skip to content

Commit 6edaf49

Browse files
Merge pull request #2368 from bcgov/feature/eac-166
Small fixes
2 parents 04b7952 + 85b7258 commit 6edaf49

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

frontend/src/components/assessments/registrations/StudentRegistrations.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,7 @@ export default {
397397
clearFilters() {
398398
this.filterSearchParams.moreFilters = {};
399399
this.pageNumber = 1;
400+
this.applyDefaultFilters();
400401
this.getAssessmentStudents();
401402
},
402403
toggleFilters() {

frontend/src/components/assessments/registrations/forms/EditStudentRegistration.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,8 @@ export default {
308308
loadingCount: 0,
309309
isActive: false,
310310
isSessionEditable: false,
311-
hasError: false
311+
hasError: false,
312+
isDistrictUser: false
312313
};
313314
},
314315
computed: {
@@ -358,6 +359,7 @@ export default {
358359
easStore().getSpecialCaseCodes().then(() => {
359360
this.setupSpecialCaseCodes();
360361
this.loading = false;
362+
this.isDistrictUser = this.userInfo.activeInstituteType !== 'SCHOOL';
361363
});
362364
});
363365
this.setupProficiencyScore();

frontend/src/components/assessments/reports/AssessmentReports.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ export default {
352352
this.sessions = [];
353353
let sessionYearMinusTwo = LocalDate.now().minusYears(2).year();
354354
this.schoolYearSessions?.forEach((session) => {
355-
if(parseInt(session.courseYear) >= sessionYearMinusTwo){
355+
if(session.completionDate !== null && parseInt(session.courseYear) >= sessionYearMinusTwo){
356356
this.sessions.push({
357357
sessionCodeName: session.courseYear + '/' + session.courseMonth,
358358
sessionCode: session.courseYear + '' + session.courseMonth,

0 commit comments

Comments
 (0)