[Ils-source] r1528 - in branches/1.6: . webapp webapp/WEB-INF/classes webapp/api/ccure/updatescore.vws

[scribe at crosswire.org]

Author: scribe
Date: 2017-02-14 18:16:28 -0700 (Tue, 14 Feb 2017)
New Revision: 1528

Modified:
   branches/1.6/
   branches/1.6/webapp/WEB-INF/classes/versions.properties
   branches/1.6/webapp/api/ccure/updatescore.vws/index.jsp
   branches/1.6/webapp/report_employeecourseatt.jsp
Log:
fixed a small bug in student records report when a curriculum was first in list of data to report.
added some extra CCURE debug info
Upped version to 1.81.1



Property changes on: branches/1.6
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:796-1502,1504-1505,1507,1509-1510,1512,1514-1515
   + /trunk:796-1502,1504-1505,1507,1509-1510,1512,1514-1515,1518,1527

Modified: branches/1.6/webapp/WEB-INF/classes/versions.properties
===================================================================
--- branches/1.6/webapp/WEB-INF/classes/versions.properties	2017-02-15 01:09:21 UTC (rev 1527)
+++ branches/1.6/webapp/WEB-INF/classes/versions.properties	2017-02-15 01:16:28 UTC (rev 1528)
@@ -1 +1 @@
-LMS=V1.81.0
+LMS=V1.81.1

Modified: branches/1.6/webapp/api/ccure/updatescore.vws/index.jsp
===================================================================
--- branches/1.6/webapp/api/ccure/updatescore.vws/index.jsp	2017-02-15 01:09:21 UTC (rev 1527)
+++ branches/1.6/webapp/api/ccure/updatescore.vws/index.jsp	2017-02-15 01:16:28 UTC (rev 1528)
@@ -190,7 +190,9 @@
 		try {
 			result = HTTPUtils.postURL(url, params, null, null, headers, HTTPUtils.PUT, false, httpResponse);
 			if (httpResponse.resultCode < 200 || httpResponse.resultCode > 299) {
-				out.print("<error code=\""+errCode+"\" message=\"CCURE error response: ("+httpResponse.resultCode+") " + HTTPUtils.canonize(result.toString())+"\"/>");
+				errorMsg = "<error code=\""+errCode+"\" message=\"CCURE error response: ("+httpResponse.resultCode+") " + HTTPUtils.canonize(result.toString())+"\"/>";
+				out.print(errorMsg);
+				aicc.info("CCURE: Failed to write results for: courseName=["+courseName+"] to CCURE Personnel ObjectID: ["+personID+"]: " + errorMsg);
 				return;
 			}
 			errorMsg = "OK";
@@ -199,10 +201,10 @@
 
 
 		if (!"OK".equals(errorMsg)) {
-			eventsLogger.debug("CCURE: Failed to write results for: courseName=["+courseName+"] to CCURE Personnel ObjectID: ["+personID+"]");
+			aicc.info("CCURE: Failed to write results for: courseName=["+courseName+"] to CCURE Personnel ObjectID: ["+personID+"]");
 			errorMsg = "Couldn't update personID [" + personID + "] in the CCURE Database. No result rows modified on update.";
 		}
-		eventsLogger.debug("CCURE: updatescore returning: " + errorMsg);
+		aicc.info("CCURE: updatescore returning: " + errorMsg);
 
 		response.setContentType("text/plain");
 		out.print(errorMsg);

Modified: branches/1.6/webapp/report_employeecourseatt.jsp
===================================================================
--- branches/1.6/webapp/report_employeecourseatt.jsp	2017-02-15 01:09:21 UTC (rev 1527)
+++ branches/1.6/webapp/report_employeecourseatt.jsp	2017-02-15 01:16:28 UTC (rev 1528)
@@ -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