[Ils-source] r1608 - in trunk/webapp: WEB-INF/lib api/ccure/updatescore.vws api/ccure/user/put api/course/get api/courseattempt/get api/docusign/identity/byemail api/group/get
scribe at crosswire.org
scribe at crosswire.org
Sun Jul 29 04:11:54 MST 2018
Author: scribe
Date: 2018-07-29 04:11:54 -0700 (Sun, 29 Jul 2018)
New Revision: 1608
Modified:
trunk/webapp/WEB-INF/lib/crosswire.jar
trunk/webapp/api/ccure/updatescore.vws/index.jsp
trunk/webapp/api/ccure/user/put/index.jsp
trunk/webapp/api/course/get/index.jsp
trunk/webapp/api/courseattempt/get/index.jsp
trunk/webapp/api/docusign/identity/byemail/index.jsp
trunk/webapp/api/group/get/index.jsp
Log:
updates from a full scan of all api endpoint, assuring they work with latest crosswire.jar
Modified: trunk/webapp/WEB-INF/lib/crosswire.jar
===================================================================
(Binary files differ)
Modified: trunk/webapp/api/ccure/updatescore.vws/index.jsp
===================================================================
--- trunk/webapp/api/ccure/updatescore.vws/index.jsp 2018-07-28 11:49:01 UTC (rev 1607)
+++ trunk/webapp/api/ccure/updatescore.vws/index.jsp 2018-07-29 11:11:54 UTC (rev 1608)
@@ -59,7 +59,7 @@
String guid = request.getParameter("userProfileUserData");
String userProfileID = request.getParameter("userProfileID");
String companyID = request.getParameter("companyID");
- if (companyID != null) ilsSession.setValue("COMPANYID", Integer.parseInt(companyID));
+ if (companyID != null) ilsSession.setCompanyID(Integer.parseInt(companyID));
String caCompleteDateString = request.getParameter("completeDate");
String caStatusDescription = request.getParameter("statusDescription");
Modified: trunk/webapp/api/ccure/user/put/index.jsp
===================================================================
--- trunk/webapp/api/ccure/user/put/index.jsp 2018-07-28 11:49:01 UTC (rev 1607)
+++ trunk/webapp/api/ccure/user/put/index.jsp 2018-07-29 11:11:54 UTC (rev 1608)
@@ -121,7 +121,7 @@
errCode = loopStartErrCode;
int partition = "$$Default$$".equals(record.getValue("PartitionKey")) || "1".equals(record.getValue("PartitionID")) ? 1 : 2;
- ilsSession.setValue("COMPANYID", partition);
+ ilsSession.setCompanyID(partition);
int userProfileID = -1;
String userData = record.getValue("GUID");
Modified: trunk/webapp/api/course/get/index.jsp
===================================================================
--- trunk/webapp/api/course/get/index.jsp 2018-07-28 11:49:01 UTC (rev 1607)
+++ trunk/webapp/api/course/get/index.jsp 2018-07-29 11:11:54 UTC (rev 1608)
@@ -3,18 +3,13 @@
contentType="text/html;charset=utf-8"
%>
<%@ page trimDirectiveWhitespaces="true" %>
-<%@ page import="org.crosswire.utils.HTTPUtils" %>
<%@ page import="com.resolutions.ils.Utils" %>
<%@ page import="com.resolutions.ils.ILSSession" %>
-<%@ page import="com.resolutions.ils.data.UserProfile" %>
<%@ page import="com.resolutions.ils.data.Company" %>
<%@ page import="com.resolutions.ils.data.Course" %>
-<%@ page import="java.util.Vector" %>
-<%@ page import="java.util.Date" %>
+<%@ page import="java.util.List" %>
+<%@ page import="java.util.ArrayList" %>
<%@ page import="java.util.TimeZone" %>
-<%@ page import="java.io.File" %>
-<%@ page import="java.net.URL" %>
-<%@ page import="java.util.Properties" %>
<%@ page import="java.text.SimpleDateFormat" %>
<%@ page import="org.apache.log4j.Logger" %>
@@ -62,10 +57,10 @@
++errCode;
if (courseID > -2 || courseNumber != null) {
- Vector<Course> courses = null;
+ List<Course> courses = null;
if (courseID == -1) courses = Course.getAllCourses(ilsSession);
else {
- courses = new Vector<Course>();
+ courses = new ArrayList<Course>();
Course c = null;
if (courseID > -1) c = Course.getCourse(ilsSession, courseID);
else if (courseNumber != null) c = Course.getCourseByNum(ilsSession, courseNumber);
Modified: trunk/webapp/api/courseattempt/get/index.jsp
===================================================================
--- trunk/webapp/api/courseattempt/get/index.jsp 2018-07-28 11:49:01 UTC (rev 1607)
+++ trunk/webapp/api/courseattempt/get/index.jsp 2018-07-29 11:11:54 UTC (rev 1608)
@@ -8,7 +8,8 @@
<%@ page import="com.resolutions.ils.data.Company" %>
<%@ page import="com.resolutions.ils.data.CourseAttempt" %>
<%@ page import="com.resolutions.ils.data.UserProfile" %>
-<%@ page import="java.util.Vector" %>
+<%@ page import="java.util.List" %>
+<%@ page import="java.util.ArrayList" %>
<%@ page import="java.util.Date" %>
<%@ page import="java.util.TimeZone" %>
<%@ page import="java.text.SimpleDateFormat" %>
@@ -91,11 +92,11 @@
return;
}
- Vector<CourseAttempt> cas = null;
+ List<CourseAttempt> cas = null;
++errCode;
if (courseAttemptID != -1) {
- cas = new Vector<CourseAttempt>();
+ cas = new ArrayList<CourseAttempt>();
CourseAttempt ca = CourseAttempt.getCourseAttempt(ilsSession, courseAttemptID);
if (ca == null) {
Modified: trunk/webapp/api/docusign/identity/byemail/index.jsp
===================================================================
--- trunk/webapp/api/docusign/identity/byemail/index.jsp 2018-07-28 11:49:01 UTC (rev 1607)
+++ trunk/webapp/api/docusign/identity/byemail/index.jsp 2018-07-29 11:11:54 UTC (rev 1608)
@@ -72,7 +72,7 @@
String emailBody = "Security Code: "+uuid + "\n\nYou can copy from the page footer below.";
DocusignUtils.LoginToken loginToken = DocusignUtils.login(sysConfig);
- DocusignUtils.requestSignature(loginToken, user.getUserProfileEMail(), user.getUserProfileFirstName() + " " + user.getUserProfileLastName(), "ILS Login", emailBody, uuid);
+ DocusignUtils.requestEmailSignature(loginToken, user.getUserProfileEMail(), user.getUserProfileFirstName() + " " + user.getUserProfileLastName(), "ILS Login", emailBody, uuid);
%>
<h3>To continue login...</h3>
Modified: trunk/webapp/api/group/get/index.jsp
===================================================================
--- trunk/webapp/api/group/get/index.jsp 2018-07-28 11:49:01 UTC (rev 1607)
+++ trunk/webapp/api/group/get/index.jsp 2018-07-29 11:11:54 UTC (rev 1608)
@@ -7,7 +7,8 @@
<%@ page import="com.resolutions.ils.ILSSession" %>
<%@ page import="com.resolutions.ils.data.Company" %>
<%@ page import="com.resolutions.ils.data.Group" %>
-<%@ page import="java.util.Vector" %>
+<%@ page import="java.util.List" %>
+<%@ page import="java.util.ArrayList" %>
<%@ page import="org.apache.log4j.Logger" %>
<%
@@ -51,10 +52,10 @@
String statusMsg = "";
if (groupTypeID > -1 && (groupID > -2 || groupName != null || userData != null)) {
- Vector<Group> groups = null;
+ List<Group> groups = null;
if (groupID == -1) groups = Group.getAllGroups(ilsSession, groupTypeID);
else {
- groups = new Vector<Group>();
+ groups = new ArrayList<Group>();
if (groupID > -1) try { Group g = Group.getGroup(ilsSession, groupID); if (g != null) groups.add(g); } catch (Exception e) {}
else if (groupName != null) try { Group g = Group.getGroupByName(ilsSession, groupTypeID, groupName); if (g != null) groups.add(g); } catch (Exception e) {}
else if (userData != null) try { Group g = Group.getGroupByUserData(ilsSession, groupTypeID, userData); if (g != null) groups.add(g); } catch (Exception e) {}
More information about the Ils-source
mailing list