[Ils-source] r1272 - trunk/src/com/resolutions/ils/data
scribe at crosswire.org
scribe at crosswire.org
Thu Nov 6 10:22:20 MST 2014
Author: scribe
Date: 2014-11-06 10:22:20 -0700 (Thu, 06 Nov 2014)
New Revision: 1272
Modified:
trunk/src/com/resolutions/ils/data/Announcement.java
trunk/src/com/resolutions/ils/data/Compliance.java
trunk/src/com/resolutions/ils/data/Course.java
Log:
applied patch from Adam to include update calls to new setCompanyID and to add new lookup methods for objects
Modified: trunk/src/com/resolutions/ils/data/Announcement.java
===================================================================
--- trunk/src/com/resolutions/ils/data/Announcement.java 2014-10-09 19:45:31 UTC (rev 1271)
+++ trunk/src/com/resolutions/ils/data/Announcement.java 2014-11-06 17:22:20 UTC (rev 1272)
@@ -12,6 +12,7 @@
static String LOOKUPALL = "SELECT * FROM ANNOUNCEMENT WHERE COMPANYID={COMPANYID} ORDER BY ANNOUNCPOSTDATE DESC";
static String LOOKUPALLCURRENT = "SELECT * FROM ANNOUNCEMENT WHERE COMPANYID={COMPANYID} AND ANNOUNCEXP>{ANNOUNCEXP} ORDER BY ANNOUNCPOSTDATE DESC";
static String LOOKUP = "SELECT * FROM ANNOUNCEMENT WHERE ANNOUNCID={ANNOUNCID} AND COMPANYID={COMPANYID}";
+ static String LOOKUPBYTITLE = "SELECT * FROM ANNOUNCEMENT WHERE ANNOUNCTITLE={ANNOUNCTITLE} AND COMPANYID={COMPANYID}";
static String DELETE = "DELETE FROM ANNOUNCEMENT WHERE ANNOUNCID={ANNOUNCID} AND COMPANYID={COMPANYID}";
public Announcement() {
@@ -24,28 +25,37 @@
static public int deleteAnnouncement(ILSSession session, int announcementID) {
Announcement query = new Announcement();
query.setAnnounceID(announcementID);
- query.setValue("COMPANYID", new Integer(session.getCompanyID()));
+ query.setCompanyID(session.getCompanyID());
return query.executeSQL(DELETE);
}
- static public Announcement getAnnouncement(ILSSession session,
- int announcementID) {
+ static public Announcement getAnnouncement(ILSSession session, int announcementID) {
Announcement query = new Announcement();
query.setAnnounceID(announcementID);
- query.setValue("COMPANYID", new Integer(session.getCompanyID()));
+ query.setCompanyID(session.getCompanyID());
Vector rows = query.getDataSet(LOOKUP);
return (rows.size() > 0) ? (Announcement) rows.get(0) : null;
}
+
+ static public Announcement getAnnouncement(ILSSession session, String announcementTitle) {
+ Announcement query = new Announcement();
+ query.setAnnounceTitle(announcementTitle);
+ query.setCompanyID(session.getCompanyID());
+ Vector rows = query.getDataSet(LOOKUPBYTITLE);
+ return (rows.size() > 0) ? (Announcement) rows.get(0) : null;
+ }
+
+
static public Vector getAllAnnouncements(ILSSession session) {
Announcement query = new Announcement();
- query.setValue("COMPANYID", new Integer(session.getCompanyID()));
+ query.setCompanyID(session.getCompanyID());
return query.getDataSet(LOOKUPALL);
}
static public Vector getAllCurrentAnnouncements(ILSSession session) {
Announcement query = new Announcement();
- query.setValue("COMPANYID", new Integer(session.getCompanyID()));
+ query.setCompanyID(session.getCompanyID());
query.setAnnounceExpiration(new Date());
return query.getDataSet(LOOKUPALLCURRENT);
}
@@ -56,7 +66,7 @@
}
public Announcement saveNew(ILSSession session) {
- setValue("COMPANYID", new Integer(session.getCompanyID()));
+ setCompanyID(session.getCompanyID());
saveNew("ANNOUNCEMENT");
return (Announcement) lookupThis("ANNOUNCEMENT");
}
Modified: trunk/src/com/resolutions/ils/data/Compliance.java
===================================================================
--- trunk/src/com/resolutions/ils/data/Compliance.java 2014-10-09 19:45:31 UTC (rev 1271)
+++ trunk/src/com/resolutions/ils/data/Compliance.java 2014-11-06 17:22:20 UTC (rev 1272)
@@ -18,7 +18,7 @@
static public int deleteCompliance(ILSSession session, int id) {
Compliance query = new Compliance();
query.setComplianceID(id);
- query.setValue("COMPANYID", new Integer(session.getCompanyID()));
+ query.setCompanyID(session.getCompanyID());
return query.executeSQL(DELETE);
}
@@ -26,28 +26,37 @@
Compliance query = new Compliance();
String sql = LOOKUP + " AND COMPLCID={COMPLCID}";
query.setComplianceID(id);
- query.setValue("COMPANYID", new Integer(session.getCompanyID()));
+ query.setCompanyID(session.getCompanyID());
Vector rows = query.getDataSet(sql);
return (rows.size() > 0) ? (Compliance) rows.get(0) : null;
}
+ static public Compliance getCompliance(ILSSession session, String complianceName) {
+ Compliance query = new Compliance();
+ String sql = LOOKUP + " AND COMPLCNAME={COMPLCNAME}";
+ query.setComplianceName(complianceName);
+ query.setCompanyID(session.getCompanyID());
+ Vector rows = query.getDataSet(sql);
+ return (rows.size() > 0) ? (Compliance) rows.get(0) : null;
+ }
+
static public Vector getCourseCompliancies(ILSSession session, int courseID) {
Compliance query = new Compliance();
- query.setValue("COMPANYID", new Integer(session.getCompanyID()));
+ query.setCompanyID(session.getCompanyID());
query.setValue("COURSID", new Integer(courseID));
return query.getDataSet(LOOKUPCOURSECOMPLIANCIES);
}
static public int deleteCourseCompliancies(ILSSession session, int courseID) {
Compliance query = new Compliance();
- query.setValue("COMPANYID", new Integer(session.getCompanyID()));
+ query.setCompanyID(session.getCompanyID());
query.setValue("COURSID", new Integer(courseID));
return query.executeSQL(DELETECOURSECOMPLIANCIES);
}
static public int addCourseCompliance(ILSSession session, int courseID, int complianceID) {
Compliance query = new Compliance();
- query.setValue("COMPANYID", new Integer(session.getCompanyID()));
+ query.setCompanyID(session.getCompanyID());
query.setValue("COURSID", new Integer(courseID));
query.setComplianceID(complianceID);
return query.executeSQL(ADDCOURSECOMPLIANCE);
@@ -55,7 +64,7 @@
static public Vector getAllCompliancies(ILSSession session) {
Compliance query = new Compliance();
- query.setValue("COMPANYID", new Integer(session.getCompanyID()));
+ query.setCompanyID(session.getCompanyID());
return query.getDataSet(LOOKUP);
}
@@ -65,7 +74,7 @@
}
public Compliance saveNew(ILSSession session) {
- setValue("COMPANYID", new Integer(session.getCompanyID()));
+ setCompanyID(session.getCompanyID());
saveNew("COMPLIANCE");
return (Compliance) lookupThis("COMPLIANCE");
}
Modified: trunk/src/com/resolutions/ils/data/Course.java
===================================================================
--- trunk/src/com/resolutions/ils/data/Course.java 2014-10-09 19:45:31 UTC (rev 1271)
+++ trunk/src/com/resolutions/ils/data/Course.java 2014-11-06 17:22:20 UTC (rev 1272)
@@ -72,7 +72,7 @@
static public int deleteCourse(ILSSession session, int courseID) {
Course query = new Course();
query.setCourseID(courseID);
- query.setValue("COMPANYID", new Integer(session.getCompanyID()));
+ query.setCompanyID(session.getCompanyID());
return query.executeSQL(DELETE);
}
@@ -102,7 +102,7 @@
static public Vector getGroupCourses(ILSSession session, int groupID) {
Course query = new Course();
- query.setValue("COMPANYID", new Integer(session.getCompanyID()));
+ query.setCompanyID(session.getCompanyID());
query.setValue("ILSGROUPID", new Integer(groupID));
return query.getDataSet(LOOKUPGROUPCOURSES);
}
@@ -111,14 +111,14 @@
Course query = new Course();
String sql = LOOKUP + " AND COURSNUM={COURSNUM}";
query.setCourseNum(courseNum);
- query.setValue("COMPANYID", new Integer(session.getCompanyID()));
+ query.setCompanyID(session.getCompanyID());
Vector rows = query.getDataSet(sql);
return (rows.size() > 0) ? (Course) rows.get(0) : null;
}
static public Collection<Course> getUserCurricula(ILSSession session, int userID) {
Course query = new Course();
- query.setValue("COMPANYID", new Integer(session.getCompanyID()));
+ query.setCompanyID(session.getCompanyID());
query.setValue("USERPRID", new Integer(userID));
Map<Integer, Course> uniqueCurricula = new HashMap<Integer, Course>();
for (Object o : query.getDataSet(LOOKUPUSERCURRICULA)) {
@@ -130,13 +130,13 @@
static public Vector getAllCourses(ILSSession session) {
Course query = new Course();
- query.setValue("COMPANYID", new Integer(session.getCompanyID()));
+ query.setCompanyID(session.getCompanyID());
return query.getDataSet(LOOKUPALLCOURSES);
}
static public Vector getAllCourses(ILSSession session, boolean active) {
Course query = new Course();
- query.setValue("COMPANYID", new Integer(session.getCompanyID()));
+ query.setCompanyID(session.getCompanyID());
query.setCourseActive(active);
return query.getDataSet(LOOKUPALLCOURSESWACTCHECK);
}
@@ -149,13 +149,13 @@
static public Vector getAllQuickViews(ILSSession session) {
Course query = new Course();
- query.setValue("COMPANYID", new Integer(session.getCompanyID()));
+ query.setCompanyID(session.getCompanyID());
return query.getDataSet(LOOKUPALLQUICKVIEWS);
}
static public Vector getActiveUserCourses(ILSSession session, int userID) {
Course query = new Course();
- query.setValue("COMPANYID", new Integer(session.getCompanyID()));
+ query.setCompanyID(session.getCompanyID());
query.setValue("USERPRID", new Integer(userID));
Vector retVal = query.getDataSet(
"SELECT * FROM (" +
@@ -171,7 +171,7 @@
static public Vector getAllUserCourses(ILSSession session, int userID) {
Course query = new Course();
- query.setValue("COMPANYID", new Integer(session.getCompanyID()));
+ query.setCompanyID(session.getCompanyID());
query.setValue("USERPRID", new Integer(userID));
Vector retVal = query.getDataSet(
"SELECT * FROM (" +
@@ -212,7 +212,7 @@
static public Vector getUserQuickViews(ILSSession session, int userID) {
Course query = new Course();
- query.setValue("COMPANYID", new Integer(session.getCompanyID()));
+ query.setCompanyID(session.getCompanyID());
query.setValue("USERPRID", new Integer(userID));
return query.getDataSet(LOOKUPUSERQUICKVIEWS);
}
@@ -220,14 +220,14 @@
static public Vector getCurriculumCourses(ILSSession session,
int curriculumID) {
Course query = new Course();
- query.setValue("COMPANYID", new Integer(session.getCompanyID()));
+ query.setCompanyID(session.getCompanyID());
query.setCourseID(curriculumID);
return query.getDataSet(LOOKUPCURRICULUMCOURSES);
}
static public int deleteCurriculumCourses(ILSSession session, int courseID) {
Course query = new Course();
- query.setValue("COMPANYID", new Integer(session.getCompanyID()));
+ query.setCompanyID(session.getCompanyID());
query.setCourseID(courseID);
return query.executeSQL(DELETECURRICULUMCOURSES);
}
@@ -235,7 +235,7 @@
static public int addCourseToCurriculum(ILSSession session, int curricID,
int courseID, Integer sortOrder) {
Course query = new Course();
- query.setValue("COMPANYID", new Integer(session.getCompanyID()));
+ query.setCompanyID(session.getCompanyID());
query.setValue("CURRICID", new Integer(curricID));
query.setValue("SORTORDER", sortOrder);
query.setCourseID(courseID);
More information about the Ils-source
mailing list