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

[scribe at crosswire.org]

Author: scribe
Date: 2015-05-26 06:02:16 -0700 (Tue, 26 May 2015)
New Revision: 1319

Modified:
   trunk/src/com/resolutions/ils/data/Group.java
Log:
added user lookup for group


Modified: trunk/src/com/resolutions/ils/data/Group.java
===================================================================
--- trunk/src/com/resolutions/ils/data/Group.java	2015-05-14 21:54:28 UTC (rev 1318)
+++ trunk/src/com/resolutions/ils/data/Group.java	2015-05-26 13:02:16 UTC (rev 1319)
@@ -14,6 +14,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} 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}";
@@ -66,15 +67,19 @@
         return (rows.size() > 0) ? (Group) rows.get(0) : null;
     }
 
-    static public Vector getUserGroups(ILSSession session, int groupTypeID,
-                                       int userID) {
+    public Vector getGroupUsers() {
+        UserProfile query = new UserProfile();
+        query.setValue("COMPANYID", getCompanyID());
+        query.setValue("ILSGROUPID", getGroupID());
+        return query.getDataSet(LOOKUPGROUPUSERS);
+    }
+    static public Vector getUserGroups(ILSSession session, int groupTypeID, int userID) {
         Group query = new Group();
         query.setValue("COMPANYID", new Integer(session.getCompanyID()));
         query.setValue("USERPRID", new Integer(userID));
         query.setGroupTypeID(groupTypeID);
         return query.getDataSet(LOOKUPUSERGROUPS);
     }
-
     static public int deleteUserGroups(ILSSession session, int groupTypeID, int userID) {
         Group query = new Group();
         query.setValue("COMPANYID", new Integer(session.getCompanyID()));