[Ils-source] r1435 - in branches/1.6: . src/com/resolutions/ils/data webapp/WEB-INF/lib

[scribe at crosswire.org]

Author: scribe
Date: 2016-04-06 17:27:40 -0700 (Wed, 06 Apr 2016)
New Revision: 1435

Modified:
   branches/1.6/
   branches/1.6/src/com/resolutions/ils/data/UserProfile.java
   branches/1.6/webapp/WEB-INF/lib/ils.jar
Log:
merged fix for getWorkgroups etc...



Property changes on: branches/1.6
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:796-1303,1306-1307,1309-1311,1319-1320,1322-1323,1325,1328-1330,1332,1334-1335,1337,1339,1349-1356,1359-1365,1369,1373-1374,1380-1383,1391,1393,1401-1404,1407,1409,1412,1416-1419,1421-1424,1427,1429,1431
   + /trunk:796-1303,1306-1307,1309-1311,1319-1320,1322-1323,1325,1328-1330,1332,1334-1335,1337,1339,1349-1356,1359-1365,1369,1373-1374,1380-1383,1391,1393,1401-1404,1407,1409,1412,1416-1419,1421-1424,1427,1429,1431,1434

Modified: branches/1.6/src/com/resolutions/ils/data/UserProfile.java
===================================================================
--- branches/1.6/src/com/resolutions/ils/data/UserProfile.java	2016-04-07 00:26:08 UTC (rev 1434)
+++ branches/1.6/src/com/resolutions/ils/data/UserProfile.java	2016-04-07 00:27:40 UTC (rev 1435)
@@ -62,7 +62,7 @@
     	" WHERE MG.COMPANYID={COMPANYID} AND UG.COMPANYID={COMPANYID}" +
     	" AND MG.ILSGROUPID=UG.ILSGROUPID AND UG.USERPRID={USERPRID}";
     
-    static String LOOKUPBYEMAIL = "SELECT USERPRNUM, USERPRPASSWD FROM USERPROFILE WHERE COMPANYID={COMPANYID} AND USERPREMAIL={USERPREMAIL}";
+    static String LOOKUPBYEMAIL = "SELECT COMPANYID, USERPRNUM, USERPRPASSWD FROM USERPROFILE WHERE COMPANYID={COMPANYID} AND USERPREMAIL={USERPREMAIL}";
     static String DELETE[] = {
     	"DELETE FROM USERGROUP     WHERE USERPRID={USERPRID} AND COMPANYID={COMPANYID}",
     	"DELETE FROM COURSEATTEMPT WHERE USERPRID={USERPRID} AND COMPANYID={COMPANYID}",
@@ -304,7 +304,7 @@
 */
 
 	static String USERCOURSESUMMARY =
-	"SELECT U.USERPRID, U.USERPRLNAME, U.USERPRFNAME, U.USERPRNUM, U.USERPRADDR2, U.USERPRHIREDATE,  " +
+	"SELECT U.COMPANYID, U.USERPRID, U.USERPRLNAME, U.USERPRFNAME, U.USERPRNUM, U.USERPRADDR2, U.USERPRHIREDATE,  " +
 	" (SELECT MAX(GROUPNAME) FROM USERGROUP UG JOIN ILSGROUP IG ON UG.ILSGROUPID=IG.ILSGROUPID AND UG.USERPRID=U.USERPRID AND GROUPTYPEID=2) WORKGROUP, " +
 	" (SELECT MAX(GROUPNAME) FROM USERGROUP UG JOIN ILSGROUP IG ON UG.ILSGROUPID=IG.ILSGROUPID AND UG.USERPRID=U.USERPRID AND GROUPTYPEID=1) ROLE, " +
 	" SUM(COALESCE(CA.CRS_COMPLETED, 0)) COURSESCOMPLETED, " +
@@ -392,7 +392,7 @@
 		String sql = null;
         if (preloadCourseData) {
 			sql = "SELECT UP2.USERPRID FROM " + tables + " WHERE " + where;
-			sql = USERCOURSESUMMARY + " WHERE U.USERPRID IN ("+sql+") GROUP BY U.USERPRID, U.USERPRLNAME, U.USERPRFNAME, U.USERPRNUM, U.USERPRADDR2, U.USERPRHIREDATE OPTION (RECOMPILE)";
+			sql = USERCOURSESUMMARY + " WHERE U.USERPRID IN ("+sql+") GROUP BY U.COMPANYID, U.USERPRID, U.USERPRLNAME, U.USERPRFNAME, U.USERPRNUM, U.USERPRADDR2, U.USERPRHIREDATE OPTION (RECOMPILE)";
         }
         else sql = "SELECT UP2.COMPANYID, UP2.USERPRID, UP2.USERPRLNAME, UP2.USERPRFNAME, UP2.USERPRNUM, UP2.USERPRADDR2, UP2.USERPRHIREDATE, " +
                         " (SELECT MAX(GROUPNAME) FROM USERGROUP UG JOIN ILSGROUP IG ON UG.ILSGROUPID=IG.ILSGROUPID AND UG.USERPRID=UP2.USERPRID AND GROUPTYPEID=2) WORKGROUP," + 

Modified: branches/1.6/webapp/WEB-INF/lib/ils.jar
===================================================================
(Binary files differ)