Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivitySpringForm.java =================================================================== diff -u -r7090e391bfb2b94be0a2ff7ffcbfa4f3e9eb5743 -r07d2252145d6e83dc2b67614077012b628286cb3 --- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivitySpringForm.java (.../PedagogicalPlannerActivitySpringForm.java) (revision 7090e391bfb2b94be0a2ff7ffcbfa4f3e9eb5743) +++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivitySpringForm.java (.../PedagogicalPlannerActivitySpringForm.java) (revision 07d2252145d6e83dc2b67614077012b628286cb3) @@ -22,7 +22,9 @@ package org.lamsfoundation.lams.web.planner; +import org.lamsfoundation.lams.util.MessageService; import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; /** * The base for any Pedagogical Planner Action Forms that other activities. All Java forms need to inherit from this @@ -85,7 +87,7 @@ * * @return */ - public LinkedMultiValueMap validate() { + public MultiValueMap validate(MessageService messageService) { setValid(true); return new LinkedMultiValueMap<>(); } Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSpringGroupingForm.java =================================================================== diff -u -ra2d9832a7b38e22d15bec905ca82b791253f7566 -r07d2252145d6e83dc2b67614077012b628286cb3 --- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSpringGroupingForm.java (.../PedagogicalPlannerSpringGroupingForm.java) (revision a2d9832a7b38e22d15bec905ca82b791253f7566) +++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSpringGroupingForm.java (.../PedagogicalPlannerSpringGroupingForm.java) (revision 07d2252145d6e83dc2b67614077012b628286cb3) @@ -26,6 +26,7 @@ import org.lamsfoundation.lams.learningdesign.Grouping; import org.lamsfoundation.lams.learningdesign.LearnerChoiceGrouping; import org.lamsfoundation.lams.learningdesign.RandomGrouping; +import org.lamsfoundation.lams.util.MessageService; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; @@ -100,7 +101,7 @@ * Checks if the provided group/learner number is a nonnegative integer. */ @Override - public LinkedMultiValueMap validate() { + public LinkedMultiValueMap validate(MessageService messageService) { MultiValueMap errorMap = new LinkedMultiValueMap<>(); boolean valid = true; boolean numberValid = true; Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbPedagogicalPlannerController.java =================================================================== diff -u -r52b9e7960ddce8e644d0e4f9a77603df1465600d -r07d2252145d6e83dc2b67614077012b628286cb3 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbPedagogicalPlannerController.java (.../NbPedagogicalPlannerController.java) (revision 52b9e7960ddce8e644d0e4f9a77603df1465600d) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbPedagogicalPlannerController.java (.../NbPedagogicalPlannerController.java) (revision 07d2252145d6e83dc2b67614077012b628286cb3) @@ -77,7 +77,7 @@ public String saveOrUpdatePedagogicalPlannerForm(@ModelAttribute NbPedagogicalPlannerForm plannerForm, HttpServletRequest request) { - MultiValueMap errorMap = plannerForm.validate(); + MultiValueMap errorMap = plannerForm.validate(null); if (errorMap.isEmpty()) { String content = plannerForm.getBasicContent(); Long toolContentID = plannerForm.getToolContentID(); Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbPedagogicalPlannerForm.java =================================================================== diff -u -r99ab61277d430fb532c14c217f14fa763aa4def9 -r07d2252145d6e83dc2b67614077012b628286cb3 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbPedagogicalPlannerForm.java (.../NbPedagogicalPlannerForm.java) (revision 99ab61277d430fb532c14c217f14fa763aa4def9) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbPedagogicalPlannerForm.java (.../NbPedagogicalPlannerForm.java) (revision 07d2252145d6e83dc2b67614077012b628286cb3) @@ -22,10 +22,11 @@ package org.lamsfoundation.lams.tool.noticeboard.web.form; -import java.util.List; - import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent; +import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivitySpringForm; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; import org.springframework.util.StringUtils; /** @@ -60,20 +61,23 @@ } } - public void validate(List messages) { + @Override + public MultiValueMap validate(MessageService messageService) { boolean valid = true; boolean allEmpty = true; if (basicContent != null && !basicContent.isEmpty()) { if (!StringUtils.isEmpty(basicContent)) { allEmpty = false; } } + MultiValueMap errorMap = new LinkedMultiValueMap<>(); if (allEmpty) { - messages.add("authoring.msg.no.tasks.save"); + errorMap.add("GLOBAL", messageService.getMessage("authoring.msg.no.tasks.save")); valid = false; basicContent = null; } setValid(valid); + return errorMap; } } \ No newline at end of file Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/PedagogicalPlannerController.java =================================================================== diff -u -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8 -r07d2252145d6e83dc2b67614077012b628286cb3 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/PedagogicalPlannerController.java (.../PedagogicalPlannerController.java) (revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/PedagogicalPlannerController.java (.../PedagogicalPlannerController.java) (revision 07d2252145d6e83dc2b67614077012b628286cb3) @@ -36,7 +36,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; -import org.springframework.validation.Errors; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -81,15 +80,12 @@ @RequestMapping(value = "/saveOrUpdatePedagogicalPlannerForm", method = RequestMethod.POST) public String saveOrUpdatePedagogicalPlannerForm(NotebookPedagogicalPlannerForm pedagogicalPlannerForm, - Errors errors, HttpServletRequest request) throws IOException { - pedagogicalPlannerForm.validate(); - if (!errors.hasErrors()) { - String instructions = pedagogicalPlannerForm.getInstructions(); - Long toolContentID = pedagogicalPlannerForm.getToolContentID(); - Notebook notebook = notebookService.getNotebookByContentId(toolContentID); - notebook.setInstructions(instructions); - notebookService.saveOrUpdateNotebook(notebook); - } + HttpServletRequest request) throws IOException { + String instructions = pedagogicalPlannerForm.getInstructions(); + Long toolContentID = pedagogicalPlannerForm.getToolContentID(); + Notebook notebook = notebookService.getNotebookByContentId(toolContentID); + notebook.setInstructions(instructions); + notebookService.saveOrUpdateNotebook(notebook); return "pages/authoring/pedagogicalPlannerForm"; } Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/SubmitFilesPedagogicalPlannerController.java =================================================================== diff -u -r9bd48180632126e711896a486782d581e2e78750 -r07d2252145d6e83dc2b67614077012b628286cb3 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/SubmitFilesPedagogicalPlannerController.java (.../SubmitFilesPedagogicalPlannerController.java) (revision 9bd48180632126e711896a486782d581e2e78750) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/SubmitFilesPedagogicalPlannerController.java (.../SubmitFilesPedagogicalPlannerController.java) (revision 07d2252145d6e83dc2b67614077012b628286cb3) @@ -32,7 +32,6 @@ import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService; import org.lamsfoundation.lams.tool.sbmt.web.form.SubmitFilesPedagogicalPlannerForm; import org.lamsfoundation.lams.util.WebUtil; -import org.lamsfoundation.lams.web.action.LamsDispatchAction; import org.lamsfoundation.lams.web.planner.PedagogicalPlannerAction; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; @@ -78,7 +77,7 @@ @RequestMapping("/saveOrUpdatePedagogicalPlannerForm") public String saveOrUpdatePedagogicalPlannerForm(@ModelAttribute SubmitFilesPedagogicalPlannerForm plannerForm, HttpServletRequest request) { - List messages = (List) plannerForm.validate(); + List messages = (List) plannerForm.validate(null); if (messages == null && messages.isEmpty()) { String content = plannerForm.getInstruction(); Long toolContentID = plannerForm.getToolContentID(); Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListPedagogicalPlannerForm.java =================================================================== diff -u -r164c032372fe265498f5492088122cc0e7df6058 -r07d2252145d6e83dc2b67614077012b628286cb3 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListPedagogicalPlannerForm.java (.../TaskListPedagogicalPlannerForm.java) (revision 164c032372fe265498f5492088122cc0e7df6058) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListPedagogicalPlannerForm.java (.../TaskListPedagogicalPlannerForm.java) (revision 07d2252145d6e83dc2b67614077012b628286cb3) @@ -29,6 +29,7 @@ import org.apache.commons.lang.StringUtils; import org.lamsfoundation.lams.tool.taskList.model.TaskList; import org.lamsfoundation.lams.tool.taskList.model.TaskListItem; +import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivitySpringForm; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; @@ -40,7 +41,7 @@ private List taskListItem; @Override - public LinkedMultiValueMap validate() { + public LinkedMultiValueMap validate(MessageService messageService) { boolean valid = true; boolean allEmpty = true; MultiValueMap errorMap = new LinkedMultiValueMap<>(); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/VotePedagogicalPlannerController.java =================================================================== diff -u -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 -r07d2252145d6e83dc2b67614077012b628286cb3 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/VotePedagogicalPlannerController.java (.../VotePedagogicalPlannerController.java) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/VotePedagogicalPlannerController.java (.../VotePedagogicalPlannerController.java) (revision 07d2252145d6e83dc2b67614077012b628286cb3) @@ -35,7 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; -import org.springframework.validation.Errors; +import org.springframework.util.MultiValueMap; import org.springframework.web.bind.annotation.RequestMapping; @Controller @@ -56,9 +56,10 @@ } @RequestMapping("/saveOrUpdatePedagogicalPlannerForm") - public String saveOrUpdatePedagogicalPlannerForm(VotePedagogicalPlannerForm plannerForm, Errors errors) { - plannerForm.validate(errors); - if (!errors.hasErrors()) { + public String saveOrUpdatePedagogicalPlannerForm(VotePedagogicalPlannerForm plannerForm, + HttpServletRequest request) { + MultiValueMap errorMap = plannerForm.validate(null); + if (errorMap.isEmpty()) { VoteContent voteContent = voteService.getVoteContent(plannerForm.getToolContentID()); voteContent.setInstructions(plannerForm.getInstructions()); @@ -97,7 +98,7 @@ } } } else { - // saveErrors(request, errors); + request.setAttribute("errorMap", errorMap); } return "/authoring/pedagogicalPlannerForm"; } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VotePedagogicalPlannerForm.java =================================================================== diff -u -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 -r07d2252145d6e83dc2b67614077012b628286cb3 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VotePedagogicalPlannerForm.java (.../VotePedagogicalPlannerForm.java) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VotePedagogicalPlannerForm.java (.../VotePedagogicalPlannerForm.java) (revision 07d2252145d6e83dc2b67614077012b628286cb3) @@ -29,8 +29,10 @@ import org.apache.commons.lang.StringUtils; import org.lamsfoundation.lams.tool.vote.pojos.VoteContent; import org.lamsfoundation.lams.tool.vote.pojos.VoteQueContent; +import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivitySpringForm; -import org.springframework.validation.Errors; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; public class VotePedagogicalPlannerForm extends PedagogicalPlannerActivitySpringForm { private List nomination; @@ -53,7 +55,8 @@ this.contentFolderID = contentFolderID; } - public void validate(Errors errors) { + @Override + public MultiValueMap validate(MessageService messageService) { boolean valid = true; boolean allEmpty = true; if (nomination != null && !nomination.isEmpty()) { @@ -64,13 +67,15 @@ } } } + MultiValueMap errorMap = new LinkedMultiValueMap<>(); if (allEmpty) { - errors.reject("nominations.none.submitted"); + errorMap.add("GLOBAL", messageService.getMessage("nominations.none.submitted")); valid = false; nomination = null; } setValid(valid); + return errorMap; } public void fillForm(VoteContent voteContent) {