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

[scribe at crosswire.org]

Author: scribe
Date: 2015-11-10 17:26:54 -0700 (Tue, 10 Nov 2015)
New Revision: 1354

Modified:
   trunk/src/com/resolutions/ils/data/Group.java
Log:
Added new calls to remove and lookup group managers


Modified: trunk/src/com/resolutions/ils/data/Group.java
===================================================================
--- trunk/src/com/resolutions/ils/data/Group.java	2015-10-22 19:06:45 UTC (rev 1353)
+++ trunk/src/com/resolutions/ils/data/Group.java	2015-11-11 00:26:54 UTC (rev 1354)
@@ -15,6 +15,7 @@
     static String LOOKUPALLGROUPS = "SELECT * FROM ILSGROUP WHERE GROUPTYPEID={GROUPTYPEID} AND COMPANYID={COMPANYID} ORDER BY GROUPNAME";
     static String LOOKUPUSERGROUPS = "SELECT * FROM ILSGROUP T1, USERGROUP T2 WHERE GROUPTYPEID={GROUPTYPEID} AND T1.ILSGROUPID=T2.ILSGROUPID AND T2.USERPRID={USERPRID} AND T1.COMPANYID={COMPANYID} AND T2.COMPANYID={COMPANYID}";
     static String LOOKUPGROUPUSERS = "SELECT * FROM USERGROUP T2, USERPROFILE T3 WHERE T2.ILSGROUPID={ILSGROUPID} AND T2.COMPANYID={COMPANYID} AND T3.COMPANYID={COMPANYID} AND T3.USERPRID=T2.USERPRID";
+    static String LOOKUPGROUPMANAGERS = "SELECT * FROM MANAGERGROUP T2, USERPROFILE T3 WHERE T2.ILSGROUPID={ILSGROUPID} AND T2.COMPANYID={COMPANYID} AND T3.COMPANYID={COMPANYID} AND T3.USERPRID=T2.USERPRID";
     static String LOOKUPMANAGERGROUPS = "SELECT * FROM ILSGROUP T1, MANAGERGROUP T2 WHERE T1.ILSGROUPID=T2.ILSGROUPID AND T2.USERPRID={USERPRID} AND T1.COMPANYID={COMPANYID} AND T2.COMPANYID={COMPANYID} ORDER BY GROUPNAME";
     static String LOOKUPCOURSEGROUPS = "SELECT * FROM ILSGROUP T1, COURSEGROUP T2 WHERE T1.ILSGROUPID=T2.ILSGROUPID AND T2.COURSID={COURSID} AND T1.COMPANYID={COMPANYID} AND T2.COMPANYID={COMPANYID}";
     static String LOOKUP = "SELECT * FROM ILSGROUP WHERE ILSGROUPID={ILSGROUPID} AND COMPANYID={COMPANYID}";
@@ -29,6 +30,7 @@
 
     static String DELETEUSERGROUPS = "DELETE FROM USERGROUP WHERE USERPRID={USERPRID} AND COMPANYID={COMPANYID} AND EXISTS (SELECT * FROM ILSGROUP T2 WHERE T2.COMPANYID=USERGROUP.COMPANYID AND T2.ILSGROUPID=USERGROUP.ILSGROUPID AND T2.GROUPTYPEID={GROUPTYPEID})";
     static String DELETEMANAGERGROUPS = "DELETE FROM MANAGERGROUP WHERE USERPRID={USERPRID} AND COMPANYID={COMPANYID}";
+    static String DELETEMANAGERGROUP = "DELETE FROM MANAGERGROUP WHERE USERPRID={USERPRID} AND COMPANYID={COMPANYID} AND ILSGROUPID={ILSGROUPID}";
     static String ADDUSERGROUP = "INSERT INTO USERGROUP (COMPANYID, ILSGROUPID, USERPRID) VALUES ({COMPANYID}, {ILSGROUPID}, {USERPRID})";
     static String ADDMANAGERGROUP = "INSERT INTO MANAGERGROUP (COMPANYID, ILSGROUPID, USERPRID) VALUES ({COMPANYID}, {ILSGROUPID}, {USERPRID})";
     static String DELETECOURSEGROUPS = "DELETE FROM COURSEGROUP WHERE COURSID={COURSID} AND COMPANYID={COMPANYID} AND EXISTS (SELECT * FROM ILSGROUP T2 WHERE T2.COMPANYID=COURSEGROUP.COMPANYID AND T2.ILSGROUPID=COURSEGROUP.ILSGROUPID AND T2.GROUPTYPEID={GROUPTYPEID})";
@@ -87,6 +89,13 @@
 		return (Vector<UserProfile>)query.getDataSet(LOOKUPGROUPUSERS);
 	}
 
+	public Vector<UserProfile> getGroupManagers() {
+		UserProfile query = new UserProfile();
+		query.setValue("COMPANYID", getCompanyID());
+		query.setValue("ILSGROUPID", getGroupID());
+		return (Vector<UserProfile>)query.getDataSet(LOOKUPGROUPMANAGERS);
+	}
+
     static public Vector getUserGroups(ILSSession session, int groupTypeID, int userID) {
         Group query = new Group();
         query.setValue("COMPANYID", new Integer(session.getCompanyID()));
@@ -136,6 +145,14 @@
         return query.executeSQL(ADDMANAGERGROUP);
     }
 
+    static public int deleteManagerGroup(ILSSession session, int groupID, int userID) {
+        Group query = new Group();
+        query.setValue("COMPANYID", new Integer(session.getCompanyID()));
+        query.setValue("USERPRID", new Integer(userID));
+        query.setGroupID(groupID);
+        return query.executeSQL(DELETEMANAGERGROUP);
+    }
+
     static public int deleteGroupCourses(ILSSession session, int groupID) {
         Group query = new Group();
         query.setValue("COMPANYID", new Integer(session.getCompanyID()));
@@ -262,7 +279,13 @@
 			xml.append(">\n");
 			xml.append(" <groupDescription>"+HTTPUtils.canonize(getGroupDescription())+"</groupDescription>\n");
 			if (detail == DETAIL_EXTRA) {
-				Vector<UserProfile> users = getGroupUsers();
+				Vector<UserProfile> users = getGroupManagers();
+				xml.append("<managerProfiles count=\""+users.size()+"\">");
+				for (UserProfile u: users) {
+					xml.append(u.toXML(DETAIL_HEADERONLY));
+				}
+				xml.append("</managerProfiles>");
+				users = getGroupUsers();
 				xml.append("<userProfiles count=\""+users.size()+"\">");
 				for (UserProfile u: users) {
 					xml.append(u.toXML(DETAIL_HEADERONLY));