Index: lams_admin/web/toolcontent/toolcontentlist.jsp
===================================================================
diff -u -r3a9b27c6f8b3eb0462a2a9d91a6aa0b43645442f -r3a68c970297a965f73cc4bda061a05c69a2818de
--- lams_admin/web/toolcontent/toolcontentlist.jsp (.../toolcontentlist.jsp) (revision 3a9b27c6f8b3eb0462a2a9d91a6aa0b43645442f)
+++ lams_admin/web/toolcontent/toolcontentlist.jsp (.../toolcontentlist.jsp) (revision 3a68c970297a965f73cc4bda061a05c69a2818de)
@@ -14,38 +14,23 @@
-
+
- $('div.ui-dialog-titlebar').prepend($('.customDialogButton'));
- });
-
+
-
+
@@ -67,12 +52,7 @@
-
+
${fn:length(toolLibrary)}
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java
===================================================================
diff -u -r5ad13513778d4ef1ced37eaa30fb2286705d22a7 -r3a68c970297a965f73cc4bda061a05c69a2818de
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java (.../ILeaderselectionService.java) (revision 5ad13513778d4ef1ced37eaa30fb2286705d22a7)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java (.../ILeaderselectionService.java) (revision 3a68c970297a965f73cc4bda061a05c69a2818de)
@@ -55,7 +55,7 @@
* @throws IOException
* @throws JSONException
*/
- boolean setGroupLeader(Long userId, Long toolSessionId) throws IOException;
+ boolean setGroupLeader(Long userId, Long toolSessionId);
/**
* Makes a copy of the default content and assigns it a newContentID
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java
===================================================================
diff -u -r5ad13513778d4ef1ced37eaa30fb2286705d22a7 -r3a68c970297a965f73cc4bda061a05c69a2818de
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java (.../LeaderselectionService.java) (revision 5ad13513778d4ef1ced37eaa30fb2286705d22a7)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java (.../LeaderselectionService.java) (revision 3a68c970297a965f73cc4bda061a05c69a2818de)
@@ -326,7 +326,7 @@
/* ********** ILeaderselectionService Methods ********************************* */
@Override
- public boolean setGroupLeader(Long userUid, Long toolSessionId) throws IOException {
+ public boolean setGroupLeader(Long userUid, Long toolSessionId) {
if ((userUid == null) || (toolSessionId == null)) {
return false;
}
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/MonitoringController.java
===================================================================
diff -u -r17b45f5115b0f5fd437abe9c62fa03e28cc8d5c0 -r3a68c970297a965f73cc4bda061a05c69a2818de
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 17b45f5115b0f5fd437abe9c62fa03e28cc8d5c0)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 3a68c970297a965f73cc4bda061a05c69a2818de)
@@ -64,9 +64,12 @@
import org.lamsfoundation.lams.web.util.SessionMap;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.http.MediaType;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.util.HtmlUtils;
@@ -98,17 +101,9 @@
/**
* Summary page action.
- *
- * @param mapping
- * @param form
- * @param request
- * @param response
- * @return
*/
-
@RequestMapping(value = "/summary")
private String summary(HttpServletRequest request) {
-
// get session from shared session.
HttpSession ss = SessionManager.getSession();
@@ -241,7 +236,6 @@
@RequestMapping(value = "/listReflections")
private String listReflections(HttpServletRequest request) {
-
Long sessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
Survey survey = surveyService.getSurveyBySessionId(sessionId);
@@ -303,10 +297,11 @@
/**
* Export Excel format survey data.
*/
- @RequestMapping(value = "/exportSurvey")
+ @RequestMapping(path = "/exportSurvey", method = RequestMethod.POST)
@ResponseStatus(HttpStatus.OK)
private void exportSurvey(HttpServletRequest request, HttpServletResponse response) throws IOException {
Long toolSessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
+
SortedMap>> groupList = surveyService
.exportBySessionId(toolSessionID);
@@ -486,18 +481,10 @@
/**
* Set Submission Deadline
- *
- * @param mapping
- * @param form
- * @param request
- * @param response
- * @return
- * @throws IOException
*/
-
- @RequestMapping(value = "/setSubmissionDeadline")
- public String setSubmissionDeadline(HttpServletRequest request, HttpServletResponse response) throws IOException {
-
+ @RequestMapping(path = "/setSubmissionDeadline", method = RequestMethod.POST, produces = MediaType.TEXT_PLAIN_VALUE)
+ @ResponseBody
+ public String setSubmissionDeadline(HttpServletRequest request) {
Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
Survey survey = surveyService.getSurveyByContentId(contentID);
@@ -515,8 +502,6 @@
survey.setSubmissionDeadline(tzSubmissionDeadline);
surveyService.saveOrUpdateSurvey(survey);
- response.setContentType("text/plain;charset=utf-8");
- response.getWriter().print(formattedDate);
- return null;
+ return formattedDate;
}
}