[Ils-source] r1407 - trunk/src/com/resolutions/ils/data

[scribe at crosswire.org]

Author: scribe
Date: 2016-03-02 15:40:25 -0700 (Wed, 02 Mar 2016)
New Revision: 1407

Modified:
   trunk/src/com/resolutions/ils/data/Course.java
   trunk/src/com/resolutions/ils/data/Group.java
Log:
added course list to output for EXTRA group XML


Modified: trunk/src/com/resolutions/ils/data/Course.java
===================================================================
--- trunk/src/com/resolutions/ils/data/Course.java	2016-03-02 20:20:20 UTC (rev 1406)
+++ trunk/src/com/resolutions/ils/data/Course.java	2016-03-02 22:40:25 UTC (rev 1407)
@@ -100,13 +100,19 @@
     }
 
 
-    static public Vector getGroupCourses(ILSSession session, int groupID) {
+	static public Vector getGroupCourses(ILSSession session, int groupID) {
+		return getGroupCourses(session.getCompanyID(), groupID);
+	}
+
+
+    static public Vector getGroupCourses(int companyID, int groupID) {
         Course query = new Course();
-        query.setCompanyID(session.getCompanyID());
+        query.setCompanyID(companyID);
         query.setValue("ILSGROUPID", new Integer(groupID));
         return query.getDataSet(LOOKUPGROUPCOURSES);
     }
 
+
     static public Course getCourseByNum(ILSSession session, String courseNum) {
         Course query = new Course();
         String sql = LOOKUP + " AND COURSNUM={COURSNUM}";

Modified: trunk/src/com/resolutions/ils/data/Group.java
===================================================================
--- trunk/src/com/resolutions/ils/data/Group.java	2016-03-02 20:20:20 UTC (rev 1406)
+++ trunk/src/com/resolutions/ils/data/Group.java	2016-03-02 22:40:25 UTC (rev 1407)
@@ -95,6 +95,9 @@
 		query.setValue("ILSGROUPID", getGroupID());
 		return (Vector<UserProfile>)query.getDataSet(LOOKUPGROUPMANAGERS);
 	}
+	public Vector<Course> getGroupCourses() {
+		return Course.getGroupCourses(getCompanyID(), getGroupID());
+	}
 
     static public Vector getUserGroups(ILSSession session, int groupTypeID, int userID) {
 	return getUserGroups(session.getCompanyID(), groupTypeID, userID);
@@ -294,6 +297,12 @@
 					xml.append(u.toXML(DETAIL_HEADERONLY));
 				}
 				xml.append("</userProfiles>");
+				Vector<Course> courses = getGroupCourses();
+				xml.append("<courses count=\""+courses.size()+"\">");
+				for (Course c: courses) {
+					xml.append(c.toXML(DETAIL_HEADERONLY));
+				}
+				xml.append("</courses>");
 			}
 			xml.append("</group>\n");
 		}