[Ils-source] r1527 - trunk/webapp

[scribe at crosswire.org]

Author: scribe
Date: 2017-02-14 18:09:21 -0700 (Tue, 14 Feb 2017)
New Revision: 1527

Modified:
   trunk/webapp/report_employeecourseatt.jsp
Log:
fixed a bug where courses were not correctly grouped under a curriculum if curriculum was first in course list


Modified: trunk/webapp/report_employeecourseatt.jsp
===================================================================
--- trunk/webapp/report_employeecourseatt.jsp	2017-02-14 22:20:40 UTC (rev 1526)
+++ trunk/webapp/report_employeecourseatt.jsp	2017-02-15 01:09:21 UTC (rev 1527)
@@ -321,7 +321,8 @@
 
 		// first see if we're a course in a Curriculum
 		CourseAttempt ca = courseAttempts.get(0);
-		Integer curriculumID = courseCurriculum.get(ca.getCourseAttemptCourseID());
+		boolean isCurriculum = curriculaList.get(ca.getCourseAttemptCourseID()) != null;
+		Integer curriculumID = isCurriculum ? ca.getCourseAttemptCourseID() : courseCurriculum.get(ca.getCourseAttemptCourseID());
 		String html = "";
 		int startSize = courseAttempts.size();
 		// process curriculum first