Merge branch 'fix_diagnosis_projection_routes' into development

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## Unreleased
+### Changed
+- Fix bug in diagnosis and projection routes
+
 ## 1.4.2 - 2018-07-23
 ### Added
 - Added new url's in daily charge amount indicator

src/libs/routes/enrollment.js

@@ -549,6 +549,10 @@ enrollmentApp.get('/diagnosis', rqf.parse(), (req, res, next) => {
     let i = 0;
     while(i < enrollments.length) {
         let enrollment = enrollments[i];
+        if(!educationSchoolYear[enrollment.school_year_id]) {
+            ++i;
+            continue;
+        }
         let educationLevelHash = '' + enrollment.year + educationSchoolYear[enrollment.school_year_id].id;
         let schoolYearHash = '' + enrollment.year + enrollment.school_year_id;
 
@@ -748,12 +752,18 @@ enrollmentApp.get('/projection', rqf.parse(), (req, res, next) => {
         }
     }
 
+    console.log(educationSchoolYear);
+
     let result = [];
     let educationLevelSet = new Set();
     let schoolYearSet = new Set();
     let i = 0;
     while(i < enrollments.length) {
         let enrollment = enrollments[i];
+        if(!educationSchoolYear[enrollment.school_year_id]) {
+            ++i;
+            continue;
+        }
         let educationLevelHash = '' + enrollment.year + educationSchoolYear[enrollment.school_year_id].id;
         let schoolYearHash = '' + enrollment.year + enrollment.school_year_id;