[Ils-source] r1579 - trunk/src/com/resolutions/ils/data
scribe at crosswire.org
scribe at crosswire.org
Tue Jun 26 02:19:46 MST 2018
Author: scribe
Date: 2018-06-26 02:19:45 -0700 (Tue, 26 Jun 2018)
New Revision: 1579
Modified:
trunk/src/com/resolutions/ils/data/Course.java
trunk/src/com/resolutions/ils/data/UserProfile.java
Log:
Fixed reporting on active groups
Modified: trunk/src/com/resolutions/ils/data/Course.java
===================================================================
--- trunk/src/com/resolutions/ils/data/Course.java 2018-06-07 20:47:08 UTC (rev 1578)
+++ trunk/src/com/resolutions/ils/data/Course.java 2018-06-26 09:19:45 UTC (rev 1579)
@@ -177,8 +177,11 @@
static public List<Course> getAllUserCourses(ILSSession session, int userID) {
+ return getAllUserCourses(session.getCompanyID(), userID);
+ }
+ static public List<Course> getAllUserCourses(int companyID, int userID) {
Course query = new Course();
- query.setCompanyID(session.getCompanyID());
+ query.setCompanyID(companyID);
query.setValue("USERPRID", new Integer(userID));
List<Course> retVal = query.getDataSet(
"SELECT * FROM (" +
Modified: trunk/src/com/resolutions/ils/data/UserProfile.java
===================================================================
--- trunk/src/com/resolutions/ils/data/UserProfile.java 2018-06-07 20:47:08 UTC (rev 1578)
+++ trunk/src/com/resolutions/ils/data/UserProfile.java 2018-06-26 09:19:45 UTC (rev 1579)
@@ -101,7 +101,7 @@
+ "";
static String RECURRENT_TRAINING_REPORT_LIMIT_TO_MANAGER = " AND CASS.USERPRID IN (SELECT DISTINCT UG.USERPRID FROM MANAGERGROUP MG LEFT JOIN USERGROUP UG ON UG.COMPANYID = MG.COMPANYID AND UG.ILSGROUPID=MG.ILSGROUPID WHERE MG.COMPANYID={COMPANYID} AND MG.USERPRID={USERPRID}) AND (GROUPTYPEID <> 2 OR ILSGROUPID IN (SELECT ILSGROUPID FROM MANAGERGROUP WHERE COMPANYID={COMPANYID} AND USERPRID={USERPRID}))";
- static String STUDENT_GROUP_ACTIVITY = "SELECT G.COMPANYID, G.ILSGROUPID, G.GROUPNAME, G.GROUPTYPEID, UP.*, CS.* from ILSGROUP G LEFT JOIN USERGROUP UG ON G.COMPANYID=UG.COMPANYID AND G.ILSGROUPID=UG.ILSGROUPID LEFT JOIN COURSEATTEMPTSTATUS CS on UG.COMPANYID=CS.COMPANYID AND UG.USERPRID=CS.USERPRID LEFT JOIN USERPROFILE UP ON UP.COMPANYID=CS.COMPANYID AND UP.USERPRID=CS.USERPRID WHERE G.ILSGROUPID={ILSGROUPID}";
+ static String STUDENT_GROUP_ACTIVITY = "SELECT G.COMPANYID, G.ILSGROUPID, G.GROUPNAME, G.GROUPTYPEID, UP.*, CS.* from ILSGROUP G LEFT JOIN USERGROUP UG ON G.COMPANYID=UG.COMPANYID AND G.ILSGROUPID=UG.ILSGROUPID LEFT JOIN COURSEATTEMPTSTATUS CS on G.COMPANYID=CS.COMPANYID AND UG.USERPRID=CS.USERPRID LEFT JOIN USERPROFILE UP ON UP.COMPANYID=G.COMPANYID AND UP.USERPRID=UG.USERPRID WHERE G.ILSGROUPID={ILSGROUPID}";
private boolean isRoleLoaded = false;
@@ -734,7 +734,6 @@
}
public void setUserProfileMiddleName(String val) {
-logger.info("UserProfile.setUserProfileMiddleName: "+val);
setValue("USERPRMNAME", val);
}
@@ -907,25 +906,41 @@
return query.getDataSet(LOOKUPUSERGROUPS+(groupTypeID != -1 ? "GROUPTYPEID={GROUPTYPEID}" : ""));
}
- public int getCoursesOpen(ILSSession ilsSession) {
- if (!isCourseSummaryDataLoaded) loadCourseSummaryData(ilsSession);
- return getIntValue("COURSESOPEN");
- }
+ public int getCoursesOpen() {
+ if (!isCourseSummaryDataLoaded) loadCourseSummaryData();
+ return getIntValue("COURSESOPEN");
+ }
+ public int getCoursesOpen(ILSSession ilsSession) {
+ if (!isCourseSummaryDataLoaded) loadCourseSummaryData(ilsSession);
+ return getIntValue("COURSESOPEN");
+ }
- public int getCoursesCompleted(ILSSession ilsSession) {
- if (!isCourseSummaryDataLoaded) loadCourseSummaryData(ilsSession);
- return getIntValue("COURSESCOMPLETED");
- }
+ public int getCoursesCompleted() {
+ if (!isCourseSummaryDataLoaded) loadCourseSummaryData();
+ return getIntValue("COURSESCOMPLETED");
+ }
+ public int getCoursesCompleted(ILSSession ilsSession) {
+ if (!isCourseSummaryDataLoaded) loadCourseSummaryData(ilsSession);
+ return getIntValue("COURSESCOMPLETED");
+ }
- public int getCoursesFailed(ILSSession ilsSession) {
- if (!isCourseSummaryDataLoaded) loadCourseSummaryData(ilsSession);
- return getIntValue("COURSESFAILED");
- }
+ public int getCoursesFailed() {
+ if (!isCourseSummaryDataLoaded) loadCourseSummaryData();
+ return getIntValue("COURSESFAILED");
+ }
+ public int getCoursesFailed(ILSSession ilsSession) {
+ if (!isCourseSummaryDataLoaded) loadCourseSummaryData(ilsSession);
+ return getIntValue("COURSESFAILED");
+ }
- public Date getCoursesLastAttempt(ILSSession ilsSession) {
- if (!isCourseSummaryDataLoaded) loadCourseSummaryData(ilsSession);
- return getDateValue("COURSESLASTATTEMPT");
- }
+ public Date getCoursesLastAttempt() {
+ if (!isCourseSummaryDataLoaded) loadCourseSummaryData();
+ return getDateValue("COURSESLASTATTEMPT");
+ }
+ public Date getCoursesLastAttempt(ILSSession ilsSession) {
+ if (!isCourseSummaryDataLoaded) loadCourseSummaryData(ilsSession);
+ return getDateValue("COURSESLASTATTEMPT");
+ }
/*
@@ -943,15 +958,21 @@
isCourseSummaryDataLoaded = true;
}
*/
- private void loadCourseSummaryData(ILSSession ilsSession) {
- List<Course> courses = Course.getAllUserCourses(ilsSession, getUserProfileID());
+ private void loadCourseSummaryData(ILSSession ilsSession) {
+ loadCourseSummaryData(ilsSession.getCompanyID());
+ }
+ private void loadCourseSummaryData() {
+ loadCourseSummaryData(getCompanyID());
+ }
+ private void loadCourseSummaryData(int companyID) {
+ List<Course> courses = Course.getAllUserCourses(companyID, getUserProfileID());
Date lastDate = null;
int completed = 0;
int failed = 0;
int open = 0;
for (int k = 0; k < courses.size(); k++) {
Course cc = (Course) courses.get(k);
- List<CourseAttempt> cas = CourseAttempt.getUserCourseAttempts(ilsSession, getUserProfileID(), cc.getCourseID());
+ List<CourseAttempt> cas = CourseAttempt.getUserCourseAttempts(companyID, getUserProfileID(), cc.getCourseID(), false);
CourseAttempt ca = null;
for (int i = 0; i < cas.size(); i++) {
ca = (CourseAttempt) cas.get(i);
@@ -1045,15 +1066,15 @@
out.write("Role,");
out.write("Completed Courses,Open Courses,Last Course Completed\n");
for (UserProfile up : userProfiles) {
- Date lastDate = up.getDateValue("CACOMPLETEDATE");
+ Date lastDate = up.getCoursesLastAttempt();
String eDate = (lastDate != null) ? df.format(lastDate) : "";
out.write("\""+up.getUserProfileLastName().replaceAll("\"", "\"\"") + "\",");
out.write("\""+up.getUserProfileFirstName().replaceAll("\"", "\"\"") + "\",");
out.write("\""+up.getUserProfileNum().replaceAll("\"", "\"\"") + "\",");
out.write("\""+up.getWorkgroups().replaceAll("\"", "\"\"") + "\",");
out.write("\""+up.getRoles().replaceAll("\"", "\"\"") + "\",");
- out.write(up.getStringValue("CRS_COMPLETED") + ",");
- out.write(up.getStringValue("CRS_FAILED") + ",");
+ out.write(up.getCoursesCompleted() + ",");
+ out.write(up.getCoursesOpen() + ",");
out.write(eDate);
out.write("\n");
}
@@ -1083,7 +1104,7 @@
String subject = Utils.replaceParams(subjectTemplate, params);
String body = Utils.replaceParams(bodyTemplate, params);
body += sysConfig.getProperty("SendMailSig", "");
-logger.info("sending email to: " + to + "; body: " + body);
+logger.debug("sending email to: " + to + "; body: " + body);
SMTPMail.sendEmail(sysConfig, from, to, subject, body, "recurrentReport.csv", out.toString(), "text/csv", true);
}
catch (Exception e) {
@@ -1178,7 +1199,7 @@
String subject = Utils.replaceParams(subjectTemplate, params);
String body = Utils.replaceParams(bodyTemplate, params);
body += sysConfig.getProperty("SendMailSig", "");
-logger.info("sending email to: " + to + "; body: " + body);
+logger.debug("sending email to: " + to + "; body: " + body);
SMTPMail.sendEmail(sysConfig, from, to, subject, body, "recurrentReport.csv", out.toString(), "text/csv", true);
}
catch (Exception e) {
More information about the Ils-source
mailing list