Index: lams_tool_leader/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rb32cbfc76a3cd150823b3696160d5fd4fa6cde84 -rcec2df99f0434302608306f07fe5f48c09546ff9
--- lams_tool_leader/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision b32cbfc76a3cd150823b3696160d5fd4fa6cde84)
+++ lams_tool_leader/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision cec2df99f0434302608306f07fe5f48c09546ff9)
@@ -4,6 +4,7 @@
<%@ taglib uri="tags-lams" prefix="lams"%>
<%@ attribute name="type" required="true" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
<%@ attribute name="style" required="false" rtexprvalue="true"%>
<%@ attribute name="title" required="false" rtexprvalue="true"%>
<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
@@ -88,8 +89,8 @@
-
-
+
+
${toolForm.toolSessionID}
@@ -434,4 +435,4 @@
-
+
\ No newline at end of file
Index: lams_tool_leader/web/pages/authoring/authoring.jsp
===================================================================
diff -u -ra5ee55c529ff5dbfb9e102604f7f253c141861ba -rcec2df99f0434302608306f07fe5f48c09546ff9
--- lams_tool_leader/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision a5ee55c529ff5dbfb9e102604f7f253c141861ba)
+++ lams_tool_leader/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision cec2df99f0434302608306f07fe5f48c09546ff9)
@@ -30,7 +30,7 @@
-
+
Index: lams_tool_notebook/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc05d26819a155980f333e1a4aea16afe974119e3 -rcec2df99f0434302608306f07fe5f48c09546ff9
--- lams_tool_notebook/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision c05d26819a155980f333e1a4aea16afe974119e3)
+++ lams_tool_notebook/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision cec2df99f0434302608306f07fe5f48c09546ff9)
@@ -4,6 +4,7 @@
<%@ taglib uri="tags-lams" prefix="lams"%>
<%@ attribute name="type" required="true" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
<%@ attribute name="style" required="false" rtexprvalue="true"%>
<%@ attribute name="title" required="false" rtexprvalue="true"%>
<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
@@ -88,7 +89,8 @@
-
+
+
${toolForm.toolSessionID}
@@ -433,4 +435,4 @@
-
+
\ No newline at end of file
Index: lams_tool_notebook/web/pages/authoring/authoring.jsp
===================================================================
diff -u -re1f494e2cf97728e4ae12e61620608cdc6c19ae3 -rcec2df99f0434302608306f07fe5f48c09546ff9
--- lams_tool_notebook/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision e1f494e2cf97728e4ae12e61620608cdc6c19ae3)
+++ lams_tool_notebook/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision cec2df99f0434302608306f07fe5f48c09546ff9)
@@ -14,7 +14,7 @@
-
+
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringConditionController.java
===================================================================
diff -u -re5f2fd4e04a38d5ad88706043b99ea79d32da0e1 -rcec2df99f0434302608306f07fe5f48c09546ff9
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringConditionController.java (.../AuthoringConditionController.java) (revision e5f2fd4e04a38d5ad88706043b99ea79d32da0e1)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringConditionController.java (.../AuthoringConditionController.java) (revision cec2df99f0434302608306f07fe5f48c09546ff9)
@@ -81,7 +81,7 @@
* @return
*/
- @RequestMapping("/newConditionInit")
+ @RequestMapping(value = "/newConditionInit", method = RequestMethod.POST)
public String newConditionInit(HttpServletRequest request) {
SurveyConditionForm surveyConditionForm = new SurveyConditionForm();
@@ -100,7 +100,7 @@
* @param request
* @return
*/
- @RequestMapping("/editCondition")
+ @RequestMapping(value = "/editCondition", method = RequestMethod.POST)
public String editCondition(SurveyConditionForm surveyConditionForm, HttpServletRequest request) {
String sessionMapID = surveyConditionForm.getSessionMapID();
@@ -210,7 +210,7 @@
* @param response
* @return
*/
- @RequestMapping("/upCondition")
+ @RequestMapping(value = "/upCondition", method = RequestMethod.POST)
private String upCondition(HttpServletRequest request) {
return switchItem(request, true);
}
@@ -224,12 +224,12 @@
* @param response
* @return
*/
- @RequestMapping("/downCondition")
+ @RequestMapping(value = "/downCondition", method = RequestMethod.POST)
private String downCondition(HttpServletRequest request) {
return switchItem(request, false);
}
- @RequestMapping("/switchItem")
+ @RequestMapping(value = "/switchItem", method = RequestMethod.POST)
public String switchItem(HttpServletRequest request, boolean up) {
// get back sessionMAP
String sessionMapID = WebUtil.readStrParam(request, SurveyConstants.ATTR_SESSION_MAP_ID);
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringController.java
===================================================================
diff -u -re5f2fd4e04a38d5ad88706043b99ea79d32da0e1 -rcec2df99f0434302608306f07fe5f48c09546ff9
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringController.java (.../AuthoringController.java) (revision e5f2fd4e04a38d5ad88706043b99ea79d32da0e1)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringController.java (.../AuthoringController.java) (revision cec2df99f0434302608306f07fe5f48c09546ff9)
@@ -106,7 +106,7 @@
* @param response
* @return
*/
- @RequestMapping("/removeItem")
+ @RequestMapping(value = "/removeItem", method = RequestMethod.POST)
public String removeItem(HttpServletRequest request) {
// get back sessionMAP
@@ -150,7 +150,7 @@
* @param response
* @return
*/
- @RequestMapping("/upItem")
+ @RequestMapping(value = "/upItem", method = RequestMethod.POST)
public String upItem(HttpServletRequest request) {
return switchItem(request, true);
@@ -165,13 +165,13 @@
* @param response
* @return
*/
- @RequestMapping(path = "/downItem")
+ @RequestMapping(value = "/downItem", method = RequestMethod.POST)
public String downItem(HttpServletRequest request) {
return switchItem(request, false);
}
- @RequestMapping("/switchItem")
+ @RequestMapping(value = "/switchItem", method = RequestMethod.POST)
public String switchItem(HttpServletRequest request, boolean up) {
// get back sessionMAP
String sessionMapID = WebUtil.readStrParam(request, SurveyConstants.ATTR_SESSION_MAP_ID);
@@ -212,7 +212,7 @@
* @param response
* @return
*/
- @RequestMapping("/editItemInit")
+ @RequestMapping(value = "/editItemInit", method = RequestMethod.POST)
public String editItemInit(QuestionForm surveyItemForm, HttpServletRequest request) {
// get back sessionMAP
@@ -247,7 +247,7 @@
* @param response
* @return
*/
- @RequestMapping("/newItemInit")
+ @RequestMapping(value = "/newItemInit", method = RequestMethod.POST)
public String newItemlInit(@ModelAttribute("surveyItemForm") QuestionForm surveyItemForm,
HttpServletRequest request) {
@@ -266,7 +266,7 @@
/**
* Create a new question based on existing one.
*/
- @RequestMapping("/copyItemInit")
+ @RequestMapping(value = "/copyItemInit", method = RequestMethod.POST)
public String copyItemlInit(QuestionForm surveyItemForm, HttpServletRequest request) {
String sessionMapID = WebUtil.readStrParam(request, SurveyConstants.ATTR_SESSION_MAP_ID);
SessionMap sessionMap = (SessionMap) request.getSession()
@@ -300,7 +300,7 @@
* @return
* @throws ServletException
*/
- @RequestMapping(value="/saveOrUpdateItem", method=RequestMethod.POST)
+ @RequestMapping(value = "/saveOrUpdateItem", method = RequestMethod.POST)
public String saveOrUpdateItem(@ModelAttribute("surveyItemForm") QuestionForm surveyItemForm,
HttpServletRequest request) throws Exception {
// get instructions:
@@ -345,7 +345,7 @@
* @throws ServletException
*
*/
- @RequestMapping("/start")
+ @RequestMapping(value = "/start", method = RequestMethod.POST)
public String start(SurveyForm startForm, HttpServletRequest request) throws Exception {
ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request);
@@ -420,7 +420,7 @@
return "pages/authoring/start";
}
- @RequestMapping("/definelater")
+ @RequestMapping(value = "/definelater", method = RequestMethod.POST)
public String definelater(SurveyForm startForm, HttpServletRequest request) throws Exception {
// update define later flag to true
@@ -523,7 +523,7 @@
* @return
* @throws ServletException
*/
- @RequestMapping("/init")
+ @RequestMapping(value = "/init", method = RequestMethod.POST)
public String initPage(SurveyForm startForm, HttpServletRequest request) throws ServletException {
String sessionMapID = WebUtil.readStrParam(request, SurveyConstants.ATTR_SESSION_MAP_ID);
SessionMap sessionMap = (SessionMap) request.getSession()
@@ -552,7 +552,7 @@
* @return
* @throws ServletException
*/
- @RequestMapping(value="/update", method=RequestMethod.POST)
+ @RequestMapping(value = "/update", method = RequestMethod.POST)
public String updateContent(@ModelAttribute("authoringForm") SurveyForm authoringForm, HttpServletRequest request)
throws Exception {
@@ -886,7 +886,7 @@
* @param response
* @return
*/
- @RequestMapping("/newInstruction")
+ @RequestMapping(value = "/newInstruction", method = RequestMethod.POST)
public String newInstruction(HttpServletRequest request) {
int count = NumberUtils.stringToInt(request.getParameter(AuthoringController.INSTRUCTION_ITEM_COUNT), 0);
List instructionList = new ArrayList(++count);
@@ -911,7 +911,7 @@
* @param response
* @return
*/
- @RequestMapping("/removeInstruction")
+ @RequestMapping(value = "/removeInstruction", method = RequestMethod.POST)
public String removeInstruction(HttpServletRequest request) {
int count = NumberUtils.stringToInt(request.getParameter(AuthoringController.INSTRUCTION_ITEM_COUNT), 0);
int removeIdx = NumberUtils.stringToInt(request.getParameter("removeIdx"), -1);
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/ChartController.java
===================================================================
diff -u -rbd320e8b9a1e0e966b4a9f1ca718f06c593c34d9 -rcec2df99f0434302608306f07fe5f48c09546ff9
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/ChartController.java (.../ChartController.java) (revision bd320e8b9a1e0e966b4a9f1ca718f06c593c34d9)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/ChartController.java (.../ChartController.java) (revision cec2df99f0434302608306f07fe5f48c09546ff9)
@@ -42,6 +42,7 @@
import org.springframework.context.MessageSource;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -64,7 +65,7 @@
@Qualifier("lasurvMessageSource")
private MessageSource resource;
- @RequestMapping("/showChart")
+ @RequestMapping(value = "/showChart", method = RequestMethod.POST)
public String execute(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException {
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/LearningController.java
===================================================================
diff -u -rbabdd8bd0300a6f8b7da8a8cf6c294ada939c3da -rcec2df99f0434302608306f07fe5f48c09546ff9
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/LearningController.java (.../LearningController.java) (revision babdd8bd0300a6f8b7da8a8cf6c294ada939c3da)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/LearningController.java (.../LearningController.java) (revision cec2df99f0434302608306f07fe5f48c09546ff9)
@@ -111,7 +111,7 @@
* This method will avoid read database again and lost un-saved resouce item lost when user "refresh page",
*
*/
- @RequestMapping("/start")
+ @RequestMapping(value = "/start", method = RequestMethod.POST)
private String start(AnswerForm surveyForm, HttpServletRequest request) {
// initial Session Map
@@ -243,7 +243,7 @@
}
}
- @RequestMapping("/nextQuestion")
+ @RequestMapping(value = "/nextQuestion", method = RequestMethod.POST)
private String nextQuestion(@ModelAttribute("surveyForm") AnswerForm surveyForm,
MultiValueMap errorMap, HttpServletRequest request) {
Integer questionSeqID = surveyForm.getQuestionSeqID();
@@ -286,7 +286,7 @@
return "pages/learning/learning";
}
- @RequestMapping("/previousQuestion")
+ @RequestMapping(value = "/previousQuestion", method = RequestMethod.POST)
private String previousQuestion(@ModelAttribute("surveyForm") AnswerForm surveyForm,
MultiValueMap errorMap, HttpServletRequest request) {
Integer questionSeqID = surveyForm.getQuestionSeqID();
@@ -322,7 +322,7 @@
return "pages/learning/learning";
}
- @RequestMapping("/retake")
+ @RequestMapping(value = "/retake", method = RequestMethod.POST)
private String retake(AnswerForm surveyForm, HttpServletRequest request, HttpServletResponse response) {
Integer questionSeqID = surveyForm.getQuestionSeqID();
@@ -354,7 +354,7 @@
return "pages/learning/learning";
}
- @RequestMapping("/showOtherUsersAnswers")
+ @RequestMapping(value = "/showOtherUsersAnswers", method = RequestMethod.POST)
private String showOtherUsersAnswers(HttpServletRequest request) {
String sessionMapID = request.getParameter("sessionMapID");
request.setAttribute("sessionMapID", sessionMapID);
@@ -384,7 +384,7 @@
* Get OpenResponses.
*/
- @RequestMapping("/getOpenResponses")
+ @RequestMapping(value = "/getOpenResponses", method = RequestMethod.POST)
private String getOpenResponses(HttpServletRequest request, HttpServletResponse res)
throws IOException, ServletException {
@@ -427,7 +427,7 @@
return null;
}
- @RequestMapping("/doSurvey")
+ @RequestMapping(value = "/doSurvey", method = RequestMethod.POST)
private String doSurvey(@ModelAttribute("surveyForm") AnswerForm surveyForm, HttpServletRequest request) {
Integer questionSeqID = surveyForm.getQuestionSeqID();
@@ -484,7 +484,7 @@
* @param response
* @return
*/
- @RequestMapping("/finish")
+ @RequestMapping(value = "/finish", method = RequestMethod.POST)
private String finish(HttpServletRequest request) {
// get back SessionMap
@@ -520,7 +520,7 @@
* @param response
* @return
*/
- @RequestMapping("/newReflection")
+ @RequestMapping(value = "/newReflection", method = RequestMethod.POST)
private String newReflection(@ModelAttribute("messageForm") ReflectionForm messageForm,
HttpServletRequest request) {
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/MonitoringController.java
===================================================================
diff -u -rc05d26819a155980f333e1a4aea16afe974119e3 -rcec2df99f0434302608306f07fe5f48c09546ff9
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/MonitoringController.java (.../MonitoringController.java) (revision c05d26819a155980f333e1a4aea16afe974119e3)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/MonitoringController.java (.../MonitoringController.java) (revision cec2df99f0434302608306f07fe5f48c09546ff9)
@@ -69,6 +69,7 @@
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.util.HtmlUtils;
import com.fasterxml.jackson.databind.node.ArrayNode;
@@ -107,7 +108,7 @@
* @return
*/
- @RequestMapping("/summary")
+ @RequestMapping(value = "/summary", method = RequestMethod.POST)
private String summary(HttpServletRequest request) {
// get session from shared session.
@@ -160,7 +161,7 @@
return "pages/monitoring/monitoring";
}
- @RequestMapping("/listAnswers")
+ @RequestMapping(value = "/listAnswers", method = RequestMethod.POST)
private String listAnswers(HttpServletRequest request) {
Long sessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
Long questionUid = WebUtil.readLongParam(request, SurveyConstants.ATTR_QUESTION_UID);
@@ -172,7 +173,7 @@
return "pages/monitoring/listanswers";
}
- @RequestMapping("/getAnswersJSON")
+ @RequestMapping(value = "/getAnswersJSON", method = RequestMethod.POST)
private String getAnswersJSON(HttpServletRequest request, HttpServletResponse response) throws IOException {
Long sessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
@@ -240,7 +241,7 @@
return null;
}
- @RequestMapping("/listReflections")
+ @RequestMapping(value = "/listReflections", method = RequestMethod.POST)
private String listReflections(HttpServletRequest request) {
Long sessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
@@ -251,7 +252,7 @@
return "pages/monitoring/listreflections";
}
- @RequestMapping("/getReflectionsJSON")
+ @RequestMapping(value = "/getReflectionsJSON", method = RequestMethod.POST)
private String getReflectionsJSON(HttpServletRequest request, HttpServletResponse response) throws IOException {
Long sessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
@@ -311,7 +312,7 @@
* @return
*/
- @RequestMapping("/exportSurvey")
+ @RequestMapping(value = "/exportSurvey", method = RequestMethod.POST)
private String exportSurvey(HttpServletRequest request, HttpServletResponse response) {
Long toolSessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID));
@@ -497,7 +498,7 @@
MonitoringController.log.error(e);
MultiValueMap errorMap = new LinkedMultiValueMap<>();
errorMap.add("error.monitoring.export.excel", e.toString());
- errors= errorMap.toString();
+ errors = errorMap.toString();
}
if (errors != null) {
@@ -522,7 +523,7 @@
* @throws IOException
*/
- @RequestMapping("/setSubmissionDeadline")
+ @RequestMapping(value = "/setSubmissionDeadline", method = RequestMethod.POST)
public String setSubmissionDeadline(HttpServletRequest request, HttpServletResponse response) throws IOException {
Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
Index: lams_tool_survey/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r3b3d4284d5320270195dfa1f4980c4bd21e0fea0 -rcec2df99f0434302608306f07fe5f48c09546ff9
--- lams_tool_survey/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 3b3d4284d5320270195dfa1f4980c4bd21e0fea0)
+++ lams_tool_survey/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision cec2df99f0434302608306f07fe5f48c09546ff9)
@@ -4,6 +4,7 @@
<%@ taglib uri="tags-lams" prefix="lams"%>
<%@ attribute name="type" required="true" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
<%@ attribute name="style" required="false" rtexprvalue="true"%>
<%@ attribute name="title" required="false" rtexprvalue="true"%>
<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
@@ -88,7 +89,8 @@
-
+
+
${toolForm.toolSessionID}
@@ -433,4 +435,4 @@
-
+
\ No newline at end of file
Index: lams_tool_survey/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r333795a363a0275e5f1fd182c9f6acaf7a8b7edd -rcec2df99f0434302608306f07fe5f48c09546ff9
--- lams_tool_survey/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision 333795a363a0275e5f1fd182c9f6acaf7a8b7edd)
+++ lams_tool_survey/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision cec2df99f0434302608306f07fe5f48c09546ff9)
@@ -38,7 +38,7 @@
-
+