Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexController.java =================================================================== diff -u -r65ed3834599c7868a2f7948a02500b28b071b579 -r92525f17be9db4e57a8551ff92d004f319fb4b73 --- lams_central/src/java/org/lamsfoundation/lams/web/IndexController.java (.../IndexController.java) (revision 65ed3834599c7868a2f7948a02500b28b071b579) +++ lams_central/src/java/org/lamsfoundation/lams/web/IndexController.java (.../IndexController.java) (revision 92525f17be9db4e57a8551ff92d004f319fb4b73) @@ -22,7 +22,6 @@ */ package org.lamsfoundation.lams.web; -import java.io.File; import java.io.IOException; import java.net.URLEncoder; import java.time.LocalDateTime; @@ -68,7 +67,6 @@ @RequestMapping("/index") public class IndexController { private static Logger log = Logger.getLogger(IndexController.class); - private static final String PATH_LAMS_PLANNER_WAR = "lams-planner.war"; @Autowired private IUserManagementService userManagementService; @@ -186,9 +184,6 @@ private static void setHeaderLinks(HttpServletRequest request) { List headerLinks = new ArrayList<>(); if (request.isUserInRole(Role.AUTHOR)) { - if (IndexController.isPedagogicalPlannerAvailable()) { - headerLinks.add(new IndexLinkBean("index.planner", "javascript:openPedagogicalPlanner()")); - } headerLinks.add(new IndexLinkBean("index.author", "javascript:showAuthoringDialog()")); } @@ -306,11 +301,4 @@ UserDTO learner = (UserDTO) ss.getAttribute(AttributeNames.USER); return learner != null ? learner.getUserID() : null; } - - private static boolean isPedagogicalPlannerAvailable() { - String lamsEarPath = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR); - String plannerPath = lamsEarPath + File.separator + PATH_LAMS_PLANNER_WAR; - File plannerDir = new File(plannerPath); - return plannerDir.exists(); - } } \ No newline at end of file Index: lams_central/web/includes/javascript/ckconfig_custom.js =================================================================== diff -u -rb25bec50334cae33c7854a721e7335946eecbc81 -r92525f17be9db4e57a8551ff92d004f319fb4b73 --- lams_central/web/includes/javascript/ckconfig_custom.js (.../ckconfig_custom.js) (revision b25bec50334cae33c7854a721e7335946eecbc81) +++ lams_central/web/includes/javascript/ckconfig_custom.js (.../ckconfig_custom.js) (revision 92525f17be9db4e57a8551ff92d004f319fb4b73) @@ -90,17 +90,6 @@ ['Format','Font','FontSize'] ]; - -CKEDITOR.config.toolbar_CustomPedplanner = [ - ['Source','-','Maximize','Preview','Bold','Italic','Underline', '-','NumberedList','BulletedList','-','Outdent','Indent','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','TextColor','BGColor','Jlatexmath'], - ['Image','Link','Iframe','Table','Font','FontSize'] -]; - -CKEDITOR.config.toolbar_CustomPedplannerInline = [ - ['Sourcedialog','-','Bold','Italic','Underline', '-','NumberedList','BulletedList','-','Outdent','Indent','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','TextColor','BGColor','Jlatexmath'], - ['Image','Link','Iframe','Table','Font','FontSize'] -]; - CKEDITOR.config.toolbar_LessonDescription = [ ['Bold','Italic','Underline', '-','Subscript','Superscript'], ['NumberedList','BulletedList','-','Outdent','Indent'], Index: lams_central/web/includes/javascript/openUrls.js =================================================================== diff -u -r7bb2487de4f3e157999e507f46f11b5800f8d574 -r92525f17be9db4e57a8551ff92d004f319fb4b73 --- lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision 7bb2487de4f3e157999e507f46f11b5800f8d574) +++ lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision 92525f17be9db4e57a8551ff92d004f319fb4b73) @@ -43,23 +43,6 @@ if (gradebookMonLessonWin && !gradebookMonLessonWin.closed) gradebookMonLessonWin.close(); } -function openPedagogicalPlanner() { - if(isMac) { - authorWin = window.open('planner/pedagogicalPlanner/start.do','aWindow','width=' + pedagogical_planner_width - + ',height=' + pedagogical_planner_height + ',resizable,scrollbars' - + getCenterParams(pedagogical_planner_width, pedagogical_planner_height)); - } else { - if(authorWin && !authorWin.closed && authorWin.location.pathname.indexOf('pedagogicalPlanner/start.do') > -1) { - authorWin.focus(); - } else { - authorWin = window.open('planner/pedagogicalPlanner/start.do','aWindow','width=' + pedagogical_planner_width - + ',height=' + pedagogical_planner_height + ',resizable,scrollbars' - + getCenterParams(pedagogical_planner_width, pedagogical_planner_height)); - authorWin.focus(); - } - } -} - function returnToMonitorLessonIntegrated( lessonID ) { window.location = '/lams/home/monitorLesson.do?lessonID='+lessonID; } Index: lams_central/web/loadVars.jsp =================================================================== diff -u -r8a46e34ba65f6f896b09f8bc0203c2b695ef776b -r92525f17be9db4e57a8551ff92d004f319fb4b73 --- lams_central/web/loadVars.jsp (.../loadVars.jsp) (revision 8a46e34ba65f6f896b09f8bc0203c2b695ef776b) +++ lams_central/web/loadVars.jsp (.../loadVars.jsp) (revision 92525f17be9db4e57a8551ff92d004f319fb4b73) @@ -36,7 +36,4 @@ var sys_admin_width = sys_admin_size.substring(0, sys_admin_size.lastIndexOf('x')); var sys_admin_height = sys_admin_size.substring(sys_admin_size.lastIndexOf('x')+1, sys_admin_size.length); - var pedagogical_planner_width = 1280; - var pedagogical_planner_height = authoring_height; - //--> Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml =================================================================== diff -u -rbfad24196397ef8759dd17934284e5dfdbc45ff6 -r92525f17be9db4e57a8551ff92d004f319fb4b73 --- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision bfad24196397ef8759dd17934284e5dfdbc45ff6) +++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision 92525f17be9db4e57a8551ff92d004f319fb4b73) @@ -28,7 +28,6 @@ org.lamsfoundation.lams.lesson org.lamsfoundation.lams.logevent org.lamsfoundation.lams.outcome - org.lamsfoundation.lams.planner org.lamsfoundation.lams.policies org.lamsfoundation.lams.qb org.lamsfoundation.lams.themes Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20211017.sql =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20211017.sql (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20211017.sql (revision 92525f17be9db4e57a8551ff92d004f319fb4b73) @@ -0,0 +1,19 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +-- Put all sql statements below here + +--LDEV-5250 Delete Pedagogical Planner table + +DROP TABLE lams_planner_activity_metadata; +DROP TABLE lams_planner_recent_learning_designs; + +ALTER TABLE lams_tool DROP COLUMN pedagogical_planner_url; +ALTER TABLE lams_system_tool DROP COLUMN pedagogical_planner_url; + +-- Put all sql statements above here + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java =================================================================== diff -u -r311592201076cbd35231d16a61b8f558fd5261bd -r92525f17be9db4e57a8551ff92d004f319fb4b73 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java (.../ToolActivity.java) (revision 311592201076cbd35231d16a61b8f558fd5261bd) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java (.../ToolActivity.java) (revision 92525f17be9db4e57a8551ff92d004f319fb4b73) @@ -29,7 +29,6 @@ import java.util.Set; import java.util.SortedSet; -import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; @@ -46,7 +45,6 @@ import org.lamsfoundation.lams.learningdesign.strategy.ToolActivityStrategy; import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.lesson.LessonClass; -import org.lamsfoundation.lams.planner.PedagogicalPlannerActivityMetadata; import org.lamsfoundation.lams.tool.GroupedToolSession; import org.lamsfoundation.lams.tool.NonGroupedToolSession; import org.lamsfoundation.lams.tool.Tool; @@ -87,9 +85,6 @@ @OneToMany(mappedBy = "activity") private Set gradebookUserActivities = new HashSet<>(); - @OneToOne(fetch = FetchType.LAZY, mappedBy = "activity", cascade = CascadeType.ALL) - private PedagogicalPlannerActivityMetadata plannerMetadata; - /** default constructor */ public ToolActivity() { super.simpleActivityStrategy = new ToolActivityStrategy(this); @@ -128,12 +123,6 @@ newToolActivity.setEvaluation(newEvaluation); } - if (this.plannerMetadata != null) { - PedagogicalPlannerActivityMetadata plannerMetadata = this.plannerMetadata.clone(); - plannerMetadata.setActivity(newToolActivity); - newToolActivity.setPlannerMetadata(plannerMetadata); - } - return newToolActivity; } @@ -284,12 +273,4 @@ public void setGradebookUserActivities(Set gradebookUserActivities) { this.gradebookUserActivities = gradebookUserActivities; } - - public PedagogicalPlannerActivityMetadata getPlannerMetadata() { - return plannerMetadata; - } - - public void setPlannerMetadata(PedagogicalPlannerActivityMetadata plannerMetadata) { - this.plannerMetadata = plannerMetadata; - } } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java =================================================================== diff -u -r58f8a894e785390508199bfb43acefd77ee63d0a -r92525f17be9db4e57a8551ff92d004f319fb4b73 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (.../AuthoringActivityDTO.java) (revision 58f8a894e785390508199bfb43acefd77ee63d0a) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (.../AuthoringActivityDTO.java) (revision 92525f17be9db4e57a8551ff92d004f319fb4b73) @@ -237,8 +237,6 @@ */ private ArrayList competenceMappingTitles; - private PlannerActivityMetadataDTO plannerMetadataDTO; - /** List of the UIIDs of the activities that are input activities for this activity */ private Integer toolActivityUIID; @@ -436,10 +434,6 @@ evaluation.add(String.valueOf(eval.getWeight())); } } - - plannerMetadataDTO = toolActivity.getPlannerMetadata() == null ? null - : new PlannerActivityMetadataDTO(toolActivity.getPlannerMetadata()); - } private void addGateActivityAttributes(Object activity, ArrayList branchMappings) { @@ -1248,12 +1242,4 @@ public void setEvaluation(List evaluation) { this.evaluation = evaluation; } - - public PlannerActivityMetadataDTO getPlannerMetadataDTO() { - return plannerMetadataDTO; - } - - public void setPlannerMetadataDTO(PlannerActivityMetadataDTO plannerActivityMetadata) { - this.plannerMetadataDTO = plannerActivityMetadata; - } } \ No newline at end of file Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/PlannerActivityMetadataDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java =================================================================== diff -u -rc9baa723b637ceafa98d9f1b9ad8e98bed53cff5 -r92525f17be9db4e57a8551ff92d004f319fb4b73 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision c9baa723b637ceafa98d9f1b9ad8e98bed53cff5) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision 92525f17be9db4e57a8551ff92d004f319fb4b73) @@ -115,7 +115,6 @@ import org.lamsfoundation.lams.learningdesign.dto.ToolOutputGateActivityEntryDTO; import org.lamsfoundation.lams.learningdesign.dto.TransitionDTO; import org.lamsfoundation.lams.lesson.LessonClass; -import org.lamsfoundation.lams.planner.PedagogicalPlannerActivityMetadata; import org.lamsfoundation.lams.qb.dao.IQbDAO; import org.lamsfoundation.lams.qb.model.QbQuestion; import org.lamsfoundation.lams.tool.SystemTool; @@ -1443,12 +1442,9 @@ // Any transitions relating with this tool will be removed! Long fromId = transDto.getFromActivityID(); Long toId = transDto.getToActivityID(); - if ((fromId != null) && removedActMap.containsKey(fromId)) { + if (((fromId != null) && removedActMap.containsKey(fromId)) || ((toId != null) && removedActMap.containsKey(toId))) { continue; } - if ((toId != null) && removedActMap.containsKey(toId)) { - continue; - } Transition trans = getTransition(transDto, activityMapper); transList.add(trans); @@ -1900,12 +1896,6 @@ ((ToolActivity) act).setToolContentId(content.getToolContentId()); ((ToolActivity) act).setToolSessions(null); } - if (actDto.getPlannerMetadataDTO() != null) { - PedagogicalPlannerActivityMetadata plannerMetadata = actDto.getPlannerMetadataDTO() - .toPlannerMetadata(); - plannerMetadata.setActivity(((ToolActivity) act)); - ((ToolActivity) act).setPlannerMetadata(plannerMetadata); - } act.setLearningLibrary(learningLibraryDAO.getLearningLibraryById(actDto.getLearningLibraryID())); break; Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/planner/PedagogicalPlannerActivityMetadata.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/planner/PedagogicalPlannerActivitySpringForm.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/tool/SystemTool.java =================================================================== diff -u -r7116e79c883ad42375d9fa3278dec8a84733ea86 -r92525f17be9db4e57a8551ff92d004f319fb4b73 --- lams_common/src/java/org/lamsfoundation/lams/tool/SystemTool.java (.../SystemTool.java) (revision 7116e79c883ad42375d9fa3278dec8a84733ea86) +++ lams_common/src/java/org/lamsfoundation/lams/tool/SystemTool.java (.../SystemTool.java) (revision 92525f17be9db4e57a8551ff92d004f319fb4b73) @@ -95,9 +95,6 @@ @Column(name = "admin_url") private String adminUrl; - @Column(name = "pedagogical_planner_url") - private String pedagogicalPlannerUrl; - @Column(name = "create_date_time") private Date createDateTime; @@ -236,12 +233,4 @@ public int hashCode() { return new HashCodeBuilder().append(getSystemToolId()).toHashCode(); } - - public String getPedagogicalPlannerUrl() { - return pedagogicalPlannerUrl; - } - - public void setPedagogicalPlannerUrl(String pedagogicalPlannerUrl) { - this.pedagogicalPlannerUrl = pedagogicalPlannerUrl; - } } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java =================================================================== diff -u -r66bda55b4291ff10c230b0ab5227dab5fa058a8a -r92525f17be9db4e57a8551ff92d004f319fb4b73 --- lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java (.../Tool.java) (revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a) +++ lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java (.../Tool.java) (revision 92525f17be9db4e57a8551ff92d004f319fb4b73) @@ -41,8 +41,6 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; import org.lamsfoundation.lams.integration.ExtServerToolAdapterMap; import org.lamsfoundation.lams.learningdesign.ToolActivity; @@ -71,9 +69,6 @@ @Column(name = "monitor_url") private String monitorUrl; - @Column(name = "pedagogical_planner_url") - private String pedagogicalPlannerUrl; - @Column(name = "help_url") private String helpUrl; @@ -102,12 +97,12 @@ private Date createDateTime; @OneToMany(mappedBy = "tool") - private Set activities = new HashSet(); + private Set activities = new HashSet<>(); @OneToMany(fetch = FetchType.EAGER) @JoinColumn(name = "tool_id") // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL) - private Set mappedServers = new HashSet(); + private Set mappedServers = new HashSet<>(); @Column(name = "grouping_support_type_id") private Integer groupingSupportTypeId; @@ -354,14 +349,6 @@ return new HashCodeBuilder().append(getToolId()).toHashCode(); } - public String getPedagogicalPlannerUrl() { - return pedagogicalPlannerUrl; - } - - public void setPedagogicalPlannerUrl(String pedagogicalPlannerUrl) { - this.pedagogicalPlannerUrl = pedagogicalPlannerUrl; - } - public Set getMappedServers() { return mappedServers; } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java =================================================================== diff -u -r2188972474f8d186d6811e3dea2e4136be669335 -r92525f17be9db4e57a8551ff92d004f319fb4b73 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java (.../User.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java (.../User.java) (revision 92525f17be9db4e57a8551ff92d004f319fb4b73) @@ -211,12 +211,6 @@ @Column(name = "first_login") private Boolean firstLogin; - @ElementCollection - @JoinTable(name = "lams_planner_recent_learning_designs", joinColumns = @JoinColumn(name = "user_id")) - @Column(name = "learning_design_id") - @OrderBy("learning_design_id") - private Set recentlyModifiedLearningDesigns = new LinkedHashSet<>(); - @Column(name = "modified_date") private Date modifiedDate; @@ -662,14 +656,6 @@ this.firstLogin = firstLogin; } - public Set getRecentlyModifiedLearningDesigns() { - return recentlyModifiedLearningDesigns; - } - - public void setRecentlyModifiedLearningDesigns(Set recentlyModifiedLearningDesigns) { - this.recentlyModifiedLearningDesigns = recentlyModifiedLearningDesigns; - } - public Date getModifiedDate() { return modifiedDate; } Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/PedagogicalPlannerController.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatPedagogicalPlannerForm.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_chat/web/WEB-INF/web.xml =================================================================== diff -u -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb -r92525f17be9db4e57a8551ff92d004f319fb4b73 --- lams_tool_chat/web/WEB-INF/web.xml (.../web.xml) (revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb) +++ lams_tool_chat/web/WEB-INF/web.xml (.../web.xml) (revision 92525f17be9db4e57a8551ff92d004f319fb4b73) @@ -218,7 +218,6 @@ /authoring/* /pages/authoring/* /authoring.do - /pedagogicalPlanner.do GET POST Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_chat/web/pages/authoring/pedagogicalPlannerForm.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/AuthoringController.java =================================================================== diff -u -r02a08907d878afbfefeb3a24c50c9981e69ad592 -r92525f17be9db4e57a8551ff92d004f319fb4b73 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 02a08907d878afbfefeb3a24c50c9981e69ad592) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 92525f17be9db4e57a8551ff92d004f319fb4b73) @@ -30,13 +30,10 @@ import java.util.Date; import java.util.HashSet; import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -57,11 +54,9 @@ import org.lamsfoundation.lams.tool.forum.model.ForumUser; import org.lamsfoundation.lams.tool.forum.model.Message; import org.lamsfoundation.lams.tool.forum.service.IForumService; -import org.lamsfoundation.lams.tool.forum.util.MessageComparator; import org.lamsfoundation.lams.tool.forum.util.MessageDtoComparator; import org.lamsfoundation.lams.tool.forum.util.PersistenceException; import org.lamsfoundation.lams.tool.forum.web.forms.ForumForm; -import org.lamsfoundation.lams.tool.forum.web.forms.ForumPedagogicalPlannerForm; import org.lamsfoundation.lams.tool.forum.web.forms.MessageForm; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.CommonConstants; @@ -779,115 +774,4 @@ private List getDeletedForumConditionList(SessionMap sessionMap) { return getListFromSession(sessionMap, ForumConstants.ATTR_DELETED_CONDITION_LIST); } - - @RequestMapping("/initPedagogicalPlannerForm") - public String initPedagogicalPlannerForm(@ModelAttribute ForumPedagogicalPlannerForm plannerForm, - HttpServletRequest request) { - - Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); - Forum forum = forumService.getForumByContentId(toolContentID); - plannerForm.fillForm(forum); - String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); - plannerForm.setContentFolderID(contentFolderId); - return "jsps/authoring/pedagogicalPlannerForm"; - - } - - @RequestMapping("/saveOrUpdatePedagogicalPlannerForm") - public String saveOrUpdatePedagogicalPlannerForm(@ModelAttribute ForumPedagogicalPlannerForm plannerForm, - HttpServletRequest request) throws IOException { - - MultiValueMap errorMap = plannerForm.validate(); - if (errorMap.isEmpty()) { - Forum forum = forumService.getForumByContentId(plannerForm.getToolContentID()); - forum.setInstructions(plannerForm.getInstructions()); - - int topicIndex = 0; - int sequenceId = 1; - Date currentDate = new Date(); - String topic = null; - String subject = null; - Message message = null; - List newTopics = new LinkedList<>(); - Set forumTopics = new TreeSet<>(new MessageComparator()); - for (Message existingMessage : forum.getMessages()) { - if (existingMessage.getIsAuthored() && existingMessage.getToolSession() == null) { - forumTopics.add(existingMessage); - } - } - Iterator forumTopicIterator = forumTopics.iterator(); - Pattern regexPattern = Pattern.compile(ForumConstants.WORD_REGEX, ForumConstants.PATTERN_MATCHING_OPTIONS); - - Matcher matcher = null; - HttpSession ss = SessionManager.getSession(); - UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - ForumUser forumUser = forumService.getUserByID(new Long(user.getUserID().intValue())); - - do { - topic = plannerForm.getTopic(topicIndex); - subject = WebUtil.removeHTMLtags(topic); - - // Getting 3 first words from body and making the subject out of it - if (StringUtils.isBlank(subject)) { - subject = null; - } else { - subject = subject.trim(); - matcher = regexPattern.matcher(subject); - int currentEnd = subject.length(); - for (short wordIndex = 0; wordIndex < ForumConstants.SUBJECT_WORD_COUNT; wordIndex++) { - if (matcher.find()) { - currentEnd = matcher.end(); - } else { - break; - } - } - subject = subject.substring(0, currentEnd).concat("..."); - } - - if (StringUtils.isEmpty(subject)) { - plannerForm.removeTopic(topicIndex); - } else if (forumTopicIterator.hasNext()) { - message = forumTopicIterator.next(); - message.setUpdated(currentDate); - message.setSubject(subject); - message.setBody(topic); - message.setSequenceId(sequenceId++); - } else { - message = new Message(); - message.setIsAuthored(true); - message.setCreated(currentDate); - message.setUpdated(currentDate); - message.setLastReplyDate(currentDate); - message.setCreatedBy(forumUser); - message.setModifiedBy(forumUser); - message.setSubject(subject); - message.setBody(topic); - message.setSequenceId(sequenceId++); - - newTopics.add(message); - message.setForum(forum); - forumService.createRootTopic(forum.getUid(), null, message); - } - topicIndex++; - } while (topic != null); - - while (forumTopicIterator.hasNext()) { - message = forumTopicIterator.next(); - forumTopicIterator.remove(); - forumService.deleteTopic(message.getUid()); - } - forum.getMessages().addAll(newTopics); - forumService.updateForum(forum); - } else { - request.setAttribute("errorMap", errorMap); - } - return "jsps/authoring/pedagogicalPlannerForm"; - } - - @RequestMapping("/createPedagogicalPlannerTopic") - public String createPedagogicalPlannerTopic(@ModelAttribute ForumPedagogicalPlannerForm plannerForm, - HttpServletRequest request) throws IOException, ServletException, PersistenceException { - plannerForm.setTopic(plannerForm.getTopicCount().intValue(), ""); - return "jsps/authoring/pedagogicalPlannerForm"; - } -} +} \ No newline at end of file Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumPedagogicalPlannerForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/authoring/pedagogicalPlannerForm.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/AuthoringController.java =================================================================== diff -u -r845b503553ad948cb5db7b89950f7c5251ada5d7 -r92525f17be9db4e57a8551ff92d004f319fb4b73 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 845b503553ad948cb5db7b89950f7c5251ada5d7) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 92525f17be9db4e57a8551ff92d004f319fb4b73) @@ -23,22 +23,19 @@ package org.lamsfoundation.lams.tool.commonCartridge.web.controller; -import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.sql.Timestamp; import java.util.ArrayList; import java.util.Date; import java.util.Iterator; import java.util.LinkedHashSet; -import java.util.LinkedList; import java.util.List; import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.apache.commons.beanutils.PropertyUtils; @@ -56,7 +53,6 @@ import org.lamsfoundation.lams.tool.commonCartridge.util.CommonCartridgeItemComparator; import org.lamsfoundation.lams.tool.commonCartridge.web.form.CommonCartridgeForm; import org.lamsfoundation.lams.tool.commonCartridge.web.form.CommonCartridgeItemForm; -import org.lamsfoundation.lams.tool.commonCartridge.web.form.CommonCartridgePedagogicalPlannerForm; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.CommonConstants; import org.lamsfoundation.lams.util.FileValidatorUtil; @@ -73,7 +69,6 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.multipart.MultipartFile; /** * @author Andrey Balan @@ -345,7 +340,7 @@ if (commonCartridge == null) { commonCartridge = commonCartridgeService.getDefaultContent(contentId); if (commonCartridge.getCommonCartridgeItems() != null) { - items = new ArrayList(commonCartridge.getCommonCartridgeItems()); + items = new ArrayList<>(commonCartridge.getCommonCartridgeItems()); } else { items = null; } @@ -423,13 +418,15 @@ /** * This method will persist all inforamtion in this authoring page, include all commonCartridge item, information * etc. - * @throws NoSuchMethodException - * @throws InvocationTargetException - * @throws IllegalAccessException + * + * @throws NoSuchMethodException + * @throws InvocationTargetException + * @throws IllegalAccessException */ @RequestMapping(path = "/update", method = RequestMethod.POST) private String updateContent(@ModelAttribute("authoringForm") CommonCartridgeForm authoringForm, - HttpServletRequest request) throws IllegalAccessException, InvocationTargetException, NoSuchMethodException { + HttpServletRequest request) + throws IllegalAccessException, InvocationTargetException, NoSuchMethodException { SessionMap sessionMap = (SessionMap) request.getSession() .getAttribute(authoringForm.getSessionMapID()); @@ -770,138 +767,4 @@ } return errorMap; } - - @RequestMapping("/initPedagogicalPlannerForm") - public String initPedagogicalPlannerForm( - @ModelAttribute("pedagogicalPlannerForm") CommonCartridgePedagogicalPlannerForm pedagogicalPlannerForm, - HttpServletRequest request) { - Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); - CommonCartridge taskList = commonCartridgeService.getCommonCartridgeByContentId(toolContentID); - String command = WebUtil.readStrParam(request, "command", true); - if (command == null) { - pedagogicalPlannerForm.fillForm(taskList); - String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); - pedagogicalPlannerForm.setContentFolderID(contentFolderId); - return "pages/authoring/pedagogicalPlannerForm"; - } - - return null; - - } - - @RequestMapping(path = "/saveOrUpdatePedagogicalPlannerForm", method = RequestMethod.POST) - public String saveOrUpdatePedagogicalPlannerForm( - @ModelAttribute("pedagogicalPlannerForm") CommonCartridgePedagogicalPlannerForm pedagogicalPlannerForm, - HttpServletRequest request) throws IOException { - MultiValueMap errorMap = pedagogicalPlannerForm.validate(); - if (errorMap.isEmpty()) { - CommonCartridge taskList = commonCartridgeService - .getCommonCartridgeByContentId(pedagogicalPlannerForm.getToolContentID()); - taskList.setInstructions(pedagogicalPlannerForm.getInstructions()); - - int itemIndex = 0; - String title = null; - CommonCartridgeItem commonCartridgeItem = null; - List newItems = new LinkedList<>(); - Set commonCartridgeItems = taskList.getCommonCartridgeItems(); - Iterator taskListItemIterator = commonCartridgeItems.iterator(); - // We need to reverse the order, since the items are delivered newest-first - LinkedList reversedCommonCartridgeItems = new LinkedList<>(); - while (taskListItemIterator.hasNext()) { - reversedCommonCartridgeItems.addFirst(taskListItemIterator.next()); - } - taskListItemIterator = reversedCommonCartridgeItems.iterator(); - do { - title = pedagogicalPlannerForm.getTitle(itemIndex); - if (StringUtils.isEmpty(title)) { - pedagogicalPlannerForm.removeItem(itemIndex); - } else { - if (taskListItemIterator.hasNext()) { - commonCartridgeItem = taskListItemIterator.next(); - } else { - commonCartridgeItem = new CommonCartridgeItem(); - commonCartridgeItem.setCreateByAuthor(true); - Date currentDate = new Date(); - commonCartridgeItem.setCreateDate(currentDate); - - HttpSession session = SessionManager.getSession(); - UserDTO user = (UserDTO) session.getAttribute(AttributeNames.USER); - CommonCartridgeUser taskListUser = commonCartridgeService.getUserByIDAndContent( - new Long(user.getUserID().intValue()), pedagogicalPlannerForm.getToolContentID()); - commonCartridgeItem.setCreateBy(taskListUser); - - newItems.add(commonCartridgeItem); - } - commonCartridgeItem.setTitle(title); - Short type = pedagogicalPlannerForm.getType(itemIndex); - commonCartridgeItem.setType(type); - boolean hasFile = commonCartridgeItem.getFileUuid() != null; - if (type.equals(CommonCartridgeConstants.RESOURCE_TYPE_BASIC_LTI)) { - commonCartridgeItem.setUrl(pedagogicalPlannerForm.getUrl(itemIndex)); - if (hasFile) { - commonCartridgeItem.setFileName(null); - commonCartridgeItem.setFileUuid(null); - commonCartridgeItem.setFileVersionId(null); - commonCartridgeItem.setFileType(null); - } - } else if (type.equals(CommonCartridgeConstants.RESOURCE_TYPE_COMMON_CARTRIDGE)) { - MultipartFile file = pedagogicalPlannerForm.getFile(itemIndex); - commonCartridgeItem.setUrl(null); - if (file != null) { - try { - if (hasFile) { - // delete the old file - commonCartridgeService.deleteFromRepository(commonCartridgeItem.getFileUuid(), - commonCartridgeItem.getFileVersionId()); - } - commonCartridgeService.uploadCommonCartridgeFile(commonCartridgeItem, file); - } catch (Exception e) { - AuthoringController.log.error(e); - errorMap.add("GLOBAL", messageService.getMessage("error.msg.io.exception")); - request.setAttribute("erroeMap", errorMap); - pedagogicalPlannerForm.setValid(false); - return "pages/authoring/pedagogicalPlannerForm"; - } - } - pedagogicalPlannerForm.setFileName(itemIndex, commonCartridgeItem.getFileName()); - pedagogicalPlannerForm.setFileUuid(itemIndex, commonCartridgeItem.getFileUuid()); - pedagogicalPlannerForm.setFileVersion(itemIndex, commonCartridgeItem.getFileVersionId()); - pedagogicalPlannerForm.setFile(itemIndex, null); - } - itemIndex++; - } - - } while (title != null); - // we need to clear it now, otherwise we get Hibernate error (item re-saved by cascade) - taskList.getCommonCartridgeItems().clear(); - while (taskListItemIterator.hasNext()) { - commonCartridgeItem = taskListItemIterator.next(); - taskListItemIterator.remove(); - commonCartridgeService.deleteCommonCartridgeItem(commonCartridgeItem.getUid()); - } - reversedCommonCartridgeItems.addAll(newItems); - - taskList.getCommonCartridgeItems().addAll(reversedCommonCartridgeItems); - commonCartridgeService.saveOrUpdateCommonCartridge(taskList); - } else { - request.setAttribute("eerorMap", errorMap); - } - return "pages/authoring/pedagogicalPlannerForm"; - } - - @RequestMapping("/createPedagogicalPlannerItem") - public String createPedagogicalPlannerItem( - @ModelAttribute("pedagogicalPlannerForm") CommonCartridgePedagogicalPlannerForm pedagogicalPlannerForm, - HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - int insertIndex = pedagogicalPlannerForm.getItemCount(); - pedagogicalPlannerForm.setTitle(insertIndex, ""); - pedagogicalPlannerForm.setType(insertIndex, - new Short(request.getParameter(CommonCartridgeConstants.ATTR_ADD_RESOURCE_TYPE))); - pedagogicalPlannerForm.setUrl(insertIndex, null); - pedagogicalPlannerForm.setFileName(insertIndex, null); - pedagogicalPlannerForm.setFile(insertIndex, null); - pedagogicalPlannerForm.setFileUuid(insertIndex, null); - pedagogicalPlannerForm.setFileVersion(insertIndex, null); - return "pages/authoring/pedagogicalPlannerForm"; - } -} +} \ No newline at end of file Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/form/CommonCartridgePedagogicalPlannerForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_imscc/web/pages/authoring/pedagogicalPlannerForm.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/PedagogicalPlannerController.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_lamc/web/WEB-INF/web.xml =================================================================== diff -u -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb -r92525f17be9db4e57a8551ff92d004f319fb4b73 --- lams_tool_lamc/web/WEB-INF/web.xml (.../web.xml) (revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb) +++ lams_tool_lamc/web/WEB-INF/web.xml (.../web.xml) (revision 92525f17be9db4e57a8551ff92d004f319fb4b73) @@ -231,7 +231,6 @@ /authoring/* /authoring.do /authoringStarter.do - /pedagogicalPlanner.do GET POST Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/PedagogicalPlannerController.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaPedagogicalPlannerForm.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_laqa/web/WEB-INF/web.xml =================================================================== diff -u -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb -r92525f17be9db4e57a8551ff92d004f319fb4b73 --- lams_tool_laqa/web/WEB-INF/web.xml (.../web.xml) (revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb) +++ lams_tool_laqa/web/WEB-INF/web.xml (.../web.xml) (revision 92525f17be9db4e57a8551ff92d004f319fb4b73) @@ -230,7 +230,6 @@ /authoring/* /authoring.do /authoringStarter.do - /pedagogicalPlanner.do GET POST Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_laqa/web/authoring/pedagogicalPlannerForm.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java =================================================================== diff -u -ra07430557603483e95a40ae22062e79b68a37778 -r92525f17be9db4e57a8551ff92d004f319fb4b73 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java (.../AuthoringController.java) (revision a07430557603483e95a40ae22062e79b68a37778) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 92525f17be9db4e57a8551ff92d004f319fb4b73) @@ -24,7 +24,6 @@ package org.lamsfoundation.lams.tool.rsrc.web.controller; import java.io.File; -import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.sql.Timestamp; @@ -34,7 +33,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashSet; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; @@ -60,7 +58,6 @@ import org.lamsfoundation.lams.tool.rsrc.util.ResourceItemComparator; import org.lamsfoundation.lams.tool.rsrc.web.form.ResourceForm; import org.lamsfoundation.lams.tool.rsrc.web.form.ResourceItemForm; -import org.lamsfoundation.lams.tool.rsrc.web.form.ResourcePedagogicalPlannerForm; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.CommonConstants; import org.lamsfoundation.lams.util.FileUtil; @@ -77,7 +74,6 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.multipart.MultipartFile; /** * @author Steve.Ni @@ -890,139 +886,6 @@ */ } - @RequestMapping("/initPedagogicalPlannerForm") - public String initPedagogicalPlannerForm(ResourcePedagogicalPlannerForm pedagogicalPlannerForm, - HttpServletRequest request) { - Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); - Resource taskList = resourceService.getResourceByContentId(toolContentID); - pedagogicalPlannerForm.fillForm(taskList); - String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); - pedagogicalPlannerForm.setContentFolderID(contentFolderId); - return "pages/authoring/pedagogicalPlannerForm"; - } - - @RequestMapping(value = "/saveOrUpdatePedagogicalPlannerForm", method = RequestMethod.POST) - public String saveOrUpdatePedagogicalPlannerForm(ResourcePedagogicalPlannerForm pedagogicalPlannerForm, - HttpServletRequest request) throws IOException { - - MultiValueMap errorMap = new LinkedMultiValueMap<>(); - pedagogicalPlannerForm.validate(messageService); - if (errorMap.isEmpty()) { - Resource taskList = resourceService.getResourceByContentId(pedagogicalPlannerForm.getToolContentID()); - taskList.setInstructions(pedagogicalPlannerForm.getInstructions()); - - int itemIndex = 0; - String title = null; - ResourceItem resourceItem = null; - List newItems = new LinkedList<>(); - // we need a copy for later Hibernate-bound processing - LinkedList resourceItems = new LinkedList<>(taskList.getResourceItems()); - Iterator taskListItemIterator = resourceItems.iterator(); - /* - * Not the case anymore (why?): - * We need to reverse the order, since the items are delivered newest-first - * LinkedList reversedResourceItems = new LinkedList(); - * while (taskListItemIterator.hasNext()) { - * reversedResourceItems.addFirst(taskListItemIterator.next()); - * } - * taskListItemIterator = reversedResourceItems.iterator(); - */ - do { - title = pedagogicalPlannerForm.getTitle(itemIndex); - if (StringUtils.isEmpty(title)) { - pedagogicalPlannerForm.removeItem(itemIndex); - } else { - if (taskListItemIterator.hasNext()) { - resourceItem = taskListItemIterator.next(); - } else { - resourceItem = new ResourceItem(); - resourceItem.setCreateByAuthor(true); - Date currentDate = new Date(); - resourceItem.setCreateDate(currentDate); - - HttpSession session = SessionManager.getSession(); - UserDTO user = (UserDTO) session.getAttribute(AttributeNames.USER); - ResourceUser taskListUser = resourceService.getUserByIDAndContent(user.getUserID().longValue(), - pedagogicalPlannerForm.getToolContentID()); - resourceItem.setCreateBy(taskListUser); - - newItems.add(resourceItem); - } - resourceItem.setTitle(title); - Short type = pedagogicalPlannerForm.getType(itemIndex); - resourceItem.setType(type); - boolean hasFile = resourceItem.getFileUuid() != null; - if (type.equals(ResourceConstants.RESOURCE_TYPE_URL)) { - resourceItem.setUrl(pedagogicalPlannerForm.getUrl(itemIndex)); - if (hasFile) { - resourceItem.setFileName(null); - resourceItem.setFileUuid(null); - resourceItem.setFileVersionId(null); - resourceItem.setFileType(null); - } - } else if (type.equals(ResourceConstants.RESOURCE_TYPE_FILE)) { - MultipartFile file = pedagogicalPlannerForm.getFile(itemIndex); - resourceItem.setUrl(null); - if (file != null && !StringUtils.isEmpty(file.getOriginalFilename())) { - try { - if (hasFile) { - // delete the old file - resourceService.deleteFromRepository(resourceItem.getFileUuid(), - resourceItem.getFileVersionId()); - } - throw new UnsupportedOperationException( - "Temporary file uploading is not implemented for Share Resources yet"); -// resourceService.uploadResourceItemFile(resourceItem, file); - } catch (Exception e) { - AuthoringController.log.error(e); - errorMap.add("GLOBAL", messageService.getMessage("error.msg.io.exception")); - request.setAttribute("errorMap", errorMap); - pedagogicalPlannerForm.setValid(false); - return "pages/authoring/pedagogicalPlannerForm"; - } -// pedagogicalPlannerForm.setFileName(itemIndex, resourceItem.getFileName()); -// pedagogicalPlannerForm.setFileUuid(itemIndex, resourceItem.getFileUuid()); -// pedagogicalPlannerForm.setFileVersion(itemIndex, resourceItem.getFileVersionId()); -// pedagogicalPlannerForm.setFile(itemIndex, null); - } - } - itemIndex++; - } - - } while (title != null); - // we need to clear it now, otherwise we get Hibernate error (item - // re-saved by cascade) - taskList.getResourceItems().clear(); - while (taskListItemIterator.hasNext()) { - resourceItem = taskListItemIterator.next(); - taskListItemIterator.remove(); - resourceService.deleteResourceItem(resourceItem.getUid()); - } - resourceItems.addAll(newItems); - - taskList.getResourceItems().addAll(resourceItems); - resourceService.saveOrUpdateResource(taskList); - } else { - request.setAttribute("errorMap", errorMap); - } - return "pages/authoring/pedagogicalPlannerForm"; - } - - @RequestMapping("/createPedagogicalPlannerItem") - public String createPedagogicalPlannerItem(ResourcePedagogicalPlannerForm pedagogicalPlannerForm, - HttpServletRequest request) throws IOException, ServletException { - int insertIndex = pedagogicalPlannerForm.getItemCount(); - pedagogicalPlannerForm.setTitle(insertIndex, ""); - pedagogicalPlannerForm.setType(insertIndex, - (short) WebUtil.readIntParam(request, ResourceConstants.ATTR_ADD_RESOURCE_TYPE)); - pedagogicalPlannerForm.setUrl(insertIndex, null); - pedagogicalPlannerForm.setFileName(insertIndex, null); - pedagogicalPlannerForm.setFile(insertIndex, null); - pedagogicalPlannerForm.setFileUuid(insertIndex, null); - pedagogicalPlannerForm.setFileVersion(insertIndex, null); - return "pages/authoring/pedagogicalPlannerForm"; - } - @RequestMapping("/switchResourceItemPosition") private String switchResourceItemPosition(HttpServletRequest request) { SessionMap sessionMap = getSessionMap(request); Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourcePedagogicalPlannerForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_larsrc/web/pages/authoring/pedagogicalPlannerForm.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/PedagogicalPlannerController.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/forms/MindmapPedagogicalPlannerForm.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_mindmap/web/WEB-INF/web.xml =================================================================== diff -u -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb -r92525f17be9db4e57a8551ff92d004f319fb4b73 --- lams_tool_mindmap/web/WEB-INF/web.xml (.../web.xml) (revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb) +++ lams_tool_mindmap/web/WEB-INF/web.xml (.../web.xml) (revision 92525f17be9db4e57a8551ff92d004f319fb4b73) @@ -226,7 +226,6 @@ /authoring/* /pages/authoring/* /authoring.do - /pedagogicalPlanner.do GET POST Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_mindmap/web/pages/authoring/pedagogicalPlannerForm.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/PedagogicalPlannerController.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbPedagogicalPlannerForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_nb/web/authoring/pedagogicalPlannerForm.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/PedagogicalPlannerController.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookPedagogicalPlannerForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_notebook/web/pages/authoring/pedagogicalPlannerForm.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/SubmitFilesPedagogicalPlannerController.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/SubmitFilesPedagogicalPlannerForm.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_sbmt/web/WEB-INF/web.xml =================================================================== diff -u -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb -r92525f17be9db4e57a8551ff92d004f319fb4b73 --- lams_tool_sbmt/web/WEB-INF/web.xml (.../web.xml) (revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb) +++ lams_tool_sbmt/web/WEB-INF/web.xml (.../web.xml) (revision 92525f17be9db4e57a8551ff92d004f319fb4b73) @@ -219,7 +219,6 @@ Authoring content /authoring/* /authoring.do - /pedagogicalPlanner.do GET POST Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_sbmt/web/authoring/pedagogicalPlannerForm.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java =================================================================== diff -u -r7276ea4054a0e0a542c4845123b24ec0b5a1e195 -r92525f17be9db4e57a8551ff92d004f319fb4b73 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 7276ea4054a0e0a542c4845123b24ec0b5a1e195) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 92525f17be9db4e57a8551ff92d004f319fb4b73) @@ -63,7 +63,6 @@ import org.lamsfoundation.lams.tool.scratchie.service.IScratchieService; import org.lamsfoundation.lams.tool.scratchie.util.ScratchieItemComparator; import org.lamsfoundation.lams.tool.scratchie.web.form.ScratchieForm; -import org.lamsfoundation.lams.tool.scratchie.web.form.ScratchiePedagogicalPlannerForm; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.CommonConstants; import org.lamsfoundation.lams.util.Configuration; @@ -78,7 +77,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; -import org.springframework.util.MultiValueMap; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -778,35 +776,6 @@ return "pages/authoring/parts/optionlist"; } - // ----------------------- PedagogicalPlannerForm --------------- - - @RequestMapping("/initPedagogicalPlannerForm") - public String initPedagogicalPlannerForm( - @ModelAttribute("pedagogicalPlannerForm") ScratchiePedagogicalPlannerForm pedagogicalPlannerForm, - HttpServletRequest request) { - Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); - Scratchie scratchie = scratchieService.getScratchieByContentId(toolContentID); - pedagogicalPlannerForm.fillForm(scratchie); - String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); - pedagogicalPlannerForm.setContentFolderID(contentFolderId); - return "pages/authoring/pedagogicalPlannerForm"; - } - - @RequestMapping(value = "/saveOrUpdatePedagogicalPlannerForm", method = RequestMethod.POST) - public String saveOrUpdatePedagogicalPlannerForm( - @ModelAttribute("pedagogicalPlannerForm") ScratchiePedagogicalPlannerForm pedagogicalPlannerForm, - HttpServletRequest request) throws IOException { - MultiValueMap errorMap = pedagogicalPlannerForm.validate(messageService); - if (errorMap.isEmpty()) { - Scratchie scratchie = scratchieService.getScratchieByContentId(pedagogicalPlannerForm.getToolContentID()); - scratchie.setInstructions(pedagogicalPlannerForm.getInstructions()); - scratchieService.saveOrUpdateScratchie(scratchie); - } else { - request.setAttribute("errorMap", errorMap); - } - return "pages/authoring/pedagogicalPlannerForm"; - } - // ************************************************************************************* // Private method // ************************************************************************************* Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchiePedagogicalPlannerForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_scratchie/web/pages/authoring/pedagogicalPlannerForm.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/controller/PedagogicalPlannerController.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/forms/ScribePedagogicalPlannerForm.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_scribe/web/WEB-INF/web.xml =================================================================== diff -u -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb -r92525f17be9db4e57a8551ff92d004f319fb4b73 --- lams_tool_scribe/web/WEB-INF/web.xml (.../web.xml) (revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb) +++ lams_tool_scribe/web/WEB-INF/web.xml (.../web.xml) (revision 92525f17be9db4e57a8551ff92d004f319fb4b73) @@ -217,7 +217,6 @@ Authoring content /pages/authoring/* /authoring.do - /pedagogicalPlanner.do GET POST Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_scribe/web/pages/authoring/pedagogicalPlannerForm.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringController.java =================================================================== diff -u -r845b503553ad948cb5db7b89950f7c5251ada5d7 -r92525f17be9db4e57a8551ff92d004f319fb4b73 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 845b503553ad948cb5db7b89950f7c5251ada5d7) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 92525f17be9db4e57a8551ff92d004f319fb4b73) @@ -23,13 +23,11 @@ package org.lamsfoundation.lams.tool.taskList.web.controller; -import java.io.IOException; import java.sql.Timestamp; import java.util.ArrayList; import java.util.Date; import java.util.Iterator; import java.util.LinkedHashSet; -import java.util.LinkedList; import java.util.List; import java.util.Set; import java.util.SortedSet; @@ -54,7 +52,6 @@ import org.lamsfoundation.lams.tool.taskList.util.TaskListItemComparator; import org.lamsfoundation.lams.tool.taskList.web.form.TaskListForm; import org.lamsfoundation.lams.tool.taskList.web.form.TaskListItemForm; -import org.lamsfoundation.lams.tool.taskList.web.form.TaskListPedagogicalPlannerForm; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.CommonConstants; import org.lamsfoundation.lams.util.MessageService; @@ -125,7 +122,7 @@ request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER.toString()); return readDatabaseData(taskListForm, request); } - + /** * Common method for "start" and "defineLater" */ @@ -152,7 +149,7 @@ if (taskList == null) { taskList = taskListService.getDefaultContent(contentId); if (taskList.getTaskListItems() != null) { - items = new ArrayList(taskList.getTaskListItems()); + items = new ArrayList<>(taskList.getTaskListItems()); } else { items = null; } @@ -689,76 +686,4 @@ } return errorMap; } - - @RequestMapping("/initPedagogicalPlannerForm") - public String initPedagogicalPlannerForm(@ModelAttribute TaskListPedagogicalPlannerForm plannerForm, - HttpServletRequest request) { - Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); - TaskList taskList = taskListService.getTaskListByContentId(toolContentID); - plannerForm.fillForm(taskList); - return "pages/authoring/pedagogicalPlannerForm"; - } - - @RequestMapping(path = "/saveOrUpdatePedagogicalPlannerForm", method = RequestMethod.POST) - public String saveOrUpdatePedagogicalPlannerForm(@ModelAttribute TaskListPedagogicalPlannerForm plannerForm, - HttpServletRequest request) throws IOException { - - MultiValueMap errorMap = plannerForm.validate(messageService); - - if (errorMap.isEmpty()) { - TaskList taskList = taskListService.getTaskListByContentId(plannerForm.getToolContentID()); - - int itemIndex = 0; - String item = null; - TaskListItem taskListItem = null; - List newItems = new LinkedList<>(); - Iterator taskListTopicIterator = taskList.getTaskListItems().iterator(); - do { - item = plannerForm.getTaskListItem(itemIndex); - if (StringUtils.isEmpty(item)) { - plannerForm.removeTaskListItem(itemIndex); - } else { - if (taskListTopicIterator.hasNext()) { - taskListItem = taskListTopicIterator.next(); - taskListItem.setTitle(item); - } else { - taskListItem = new TaskListItem(); - taskListItem.setCreateByAuthor(true); - Date currentDate = new Date(); - taskListItem.setCreateDate(currentDate); - - HttpSession session = SessionManager.getSession(); - UserDTO user = (UserDTO) session.getAttribute(AttributeNames.USER); - TaskListUser taskListUser = taskListService.getUserByIDAndContent( - new Long(user.getUserID().intValue()), plannerForm.getToolContentID()); - taskListItem.setCreateBy(taskListUser); - - taskListItem.setTitle(item); - - newItems.add(taskListItem); - } - itemIndex++; - } - - } while (item != null); - while (taskListTopicIterator.hasNext()) { - taskListItem = taskListTopicIterator.next(); - taskListTopicIterator.remove(); - taskListService.deleteTaskListItem(taskListItem.getUid()); - } - taskList.getTaskListItems().addAll(newItems); - taskListService.saveOrUpdateTaskList(taskList); - } else { - request.setAttribute("errorMap", errorMap); - } - - return "pages/authoring/pedagogicalPlannerForm"; - } - - @RequestMapping("/createPedagogicalPlannerItem") - public String createPedagogicalPlannerItem(@ModelAttribute TaskListPedagogicalPlannerForm plannerForm, - HttpServletRequest request) { - plannerForm.setTaskListItem(plannerForm.getTaskListItemCount().intValue(), ""); - return "pages/authoring/pedagogicalPlannerForm"; - } -} +} \ No newline at end of file Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListPedagogicalPlannerForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_task/web/pages/authoring/pedagogicalPlannerForm.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/VotePedagogicalPlannerController.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VotePedagogicalPlannerForm.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_vote/web/WEB-INF/web.xml =================================================================== diff -u -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb -r92525f17be9db4e57a8551ff92d004f319fb4b73 --- lams_tool_vote/web/WEB-INF/web.xml (.../web.xml) (revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb) +++ lams_tool_vote/web/WEB-INF/web.xml (.../web.xml) (revision 92525f17be9db4e57a8551ff92d004f319fb4b73) @@ -235,7 +235,6 @@ Authoring content /authoring/* /authoring.do - /pedagogicalPlanner.do GET POST Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_vote/web/authoring/pedagogicalPlannerForm.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/PedagogicalPlannerController.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiPedagogicalPlannerForm.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_wiki/web/WEB-INF/web.xml =================================================================== diff -u -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb -r92525f17be9db4e57a8551ff92d004f319fb4b73 --- lams_tool_wiki/web/WEB-INF/web.xml (.../web.xml) (revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb) +++ lams_tool_wiki/web/WEB-INF/web.xml (.../web.xml) (revision 92525f17be9db4e57a8551ff92d004f319fb4b73) @@ -216,7 +216,6 @@ Authoring content /pages/authoring/* /authoring.do - /pedagogicalPlanner.do GET POST Fisheye: Tag 92525f17be9db4e57a8551ff92d004f319fb4b73 refers to a dead (removed) revision in file `lams_tool_wiki/web/pages/authoring/pedagogicalPlannerForm.jsp'. Fisheye: No comparison available. Pass `N' to diff?