Index: lams_central/build.xml =================================================================== diff -u -r0b67ee804237056395e60ed4cca2948a595ddb72 -r8fd679dd28d13f8ccabe44c5a74c7873806f486b --- lams_central/build.xml (.../build.xml) (revision 0b67ee804237056395e60ed4cca2948a595ddb72) +++ lams_central/build.xml (.../build.xml) (revision 8fd679dd28d13f8ccabe44c5a74c7873806f486b) @@ -15,7 +15,6 @@ - Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java =================================================================== diff -u -rfd6ade152cf877cecaa63d3cb59d3bc53d60ca45 -r8fd679dd28d13f8ccabe44c5a74c7873806f486b --- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision fd6ade152cf877cecaa63d3cb59d3bc53d60ca45) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision 8fd679dd28d13f8ccabe44c5a74c7873806f486b) @@ -89,7 +89,6 @@ import org.lamsfoundation.lams.logevent.service.ILogEventService; import org.lamsfoundation.lams.monitoring.service.IMonitoringService; import org.lamsfoundation.lams.monitoring.service.MonitoringServiceException; -import org.lamsfoundation.lams.planner.dao.PedagogicalPlannerDAO; import org.lamsfoundation.lams.tool.SystemTool; import org.lamsfoundation.lams.tool.Tool; import org.lamsfoundation.lams.tool.ToolContentIDGenerator; @@ -149,8 +148,6 @@ protected ISystemToolDAO systemToolDAO; - protected PedagogicalPlannerDAO pedagogicalPlannerDAO; - protected ILamsCoreToolService lamsCoreToolService; protected ILearningDesignService learningDesignService; @@ -175,13 +172,8 @@ protected IBranchActivityEntryDAO branchActivityEntryDAO; public AuthoringService() { - } - public void setPedagogicalPlannerDAO(PedagogicalPlannerDAO pedagogicalPlannerDAO) { - this.pedagogicalPlannerDAO = pedagogicalPlannerDAO; - } - /*************************************************************************** * Setter Methods **************************************************************************/ Index: lams_central/src/java/org/lamsfoundation/lams/util/CentralConstants.java =================================================================== diff -u -r9352c0f9470d3fd142e688234b7946d025ec0afb -r8fd679dd28d13f8ccabe44c5a74c7873806f486b --- lams_central/src/java/org/lamsfoundation/lams/util/CentralConstants.java (.../CentralConstants.java) (revision 9352c0f9470d3fd142e688234b7946d025ec0afb) +++ lams_central/src/java/org/lamsfoundation/lams/util/CentralConstants.java (.../CentralConstants.java) (revision 8fd679dd28d13f8ccabe44c5a74c7873806f486b) @@ -148,29 +148,7 @@ public static final String ATTR_RESULT_CODE = "resultCode"; public static final String ATTR_RESULT_TEXT = "resultText"; - // Pedagogical Planner constants - public static final String ATTR_PLANNER = "planner"; - public static final String PARAM_CALL_ATTEMPTED_ID = "callAttemptedID"; - - public static final String PARAM_SEQUENCE_TITLE = "sequenceTitle"; - - public static final String PARAM_ACTIVITY_METADATA = "activityMetadataField"; - - public static final String PARAM_FORM_MESSAGE = "formMessage"; - - public static final String ERROR_PLANNER_TITLE_BLANK = "error.planner.title.blank"; - - public static final String RESOURCE_KEY_BRANCH_EMPTY = "label.planner.branch.empty"; - - public static final int PLANNER_MAX_BRANCHES = 4; - - public static final int PLANNER_MAX_OPTIONS = 4; - - public static final int PLANNER_MAX_PARALLEL_ACTIVITIES = 4; - - public static final int PLANNER_RECENT_LD_MAX_COUNT = 10; - public static final String MONITORING_SERVICE_BEAN_NAME = "monitoringService"; public static final String CENTRAL_MESSAGE_SERVICE_BEAN_NAME = "centralMessageService"; Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java =================================================================== diff -u -r9b24f3330d42579e9c7b3e807568360a617d9a8c -r8fd679dd28d13f8ccabe44c5a74c7873806f486b --- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java (.../IndexAction.java) (revision 9b24f3330d42579e9c7b3e807568360a617d9a8c) +++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java (.../IndexAction.java) (revision 8fd679dd28d13f8ccabe44c5a74c7873806f486b) @@ -63,8 +63,7 @@ */ public class IndexAction extends LamsDispatchAction { - private static final String PATH_PEDAGOGICAL_PLANNER = "pedagogical_planner"; - private static final String PATH_LAMS_CENTRAL = "lams-central.war"; + private static final String PATH_LAMS_PLANNER_WAR = "lams-planner.war"; private static Logger log = Logger.getLogger(IndexAction.class); private static IUserManagementService userManagementService; @@ -277,9 +276,8 @@ private static boolean isPedagogicalPlannerAvailable() { String lamsEarPath = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR); - String plannerPath = lamsEarPath + File.separator + PATH_LAMS_CENTRAL + File.separator - + PATH_PEDAGOGICAL_PLANNER; + String plannerPath = lamsEarPath + File.separator + PATH_LAMS_PLANNER_WAR; File plannerDir = new File(plannerPath); - return plannerDir.isDirectory(); + return plannerDir.exists(); } } \ No newline at end of file Fisheye: Tag 8fd679dd28d13f8ccabe44c5a74c7873806f486b refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8fd679dd28d13f8ccabe44c5a74c7873806f486b refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivityForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8fd679dd28d13f8ccabe44c5a74c7873806f486b refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerGroupingForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8fd679dd28d13f8ccabe44c5a74c7873806f486b refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSequenceNodeForm.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/web/WEB-INF/struts-config.xml =================================================================== diff -u -r1aff6aeac19473c0089c0f3ff578a183beb92555 -r8fd679dd28d13f8ccabe44c5a74c7873806f486b --- lams_central/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 1aff6aeac19473c0089c0f3ff578a183beb92555) +++ lams_central/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 8fd679dd28d13f8ccabe44c5a74c7873806f486b) @@ -33,14 +33,6 @@ name="uploadForm" type="org.lamsfoundation.lams.monitoring.web.FileUploadForm" /> - - @@ -307,76 +299,6 @@ /> - - - - - - - - - - - - - - -1) { authorWin.focus(); } else { - authorWin = window.open('pedagogicalPlanner.do','aWindow','width='+pedagogical_planner_width+',height='+pedagogical_planner_height+',resizable,scrollbars'); + authorWin = window.open('planner/pedagogicalPlanner.do','aWindow','width='+pedagogical_planner_width+',height='+pedagogical_planner_height+',resizable,scrollbars'); authorWin.focus(); } } Fisheye: Tag 8fd679dd28d13f8ccabe44c5a74c7873806f486b refers to a dead (removed) revision in file `lams_central/web/includes/javascript/pedagogicalPlanner.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8fd679dd28d13f8ccabe44c5a74c7873806f486b refers to a dead (removed) revision in file `lams_central/web/tutorialVideo.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8fd679dd28d13f8ccabe44c5a74c7873806f486b refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/planner/PedagogicalPlannerNodeRole.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8fd679dd28d13f8ccabe44c5a74c7873806f486b refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml =================================================================== diff -u -ra4fd7ba340a2beac7436660039f13b9c8708f172 -r8fd679dd28d13f8ccabe44c5a74c7873806f486b --- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision a4fd7ba340a2beac7436660039f13b9c8708f172) +++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision 8fd679dd28d13f8ccabe44c5a74c7873806f486b) @@ -598,11 +598,6 @@ - - - - - Index: lams_common/src/java/org/lamsfoundation/lams/planner/PedagogicalPlannerActivityForm.java =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/planner/PedagogicalPlannerActivityForm.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/planner/PedagogicalPlannerActivityForm.java (revision 8fd679dd28d13f8ccabe44c5a74c7873806f486b) @@ -0,0 +1,115 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + + +package org.lamsfoundation.lams.planner; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessages; + +/** + * The base for any Pedagogical Planner Action Forms that other activities. All Java forms need to inherit from this + * class and forms on JSP pages need to have these properties declared as hidden elements. + * + * @author Marcin Cieslak + * + */ +public abstract class PedagogicalPlannerActivityForm extends ActionForm { + /** + * Set when opening a Learning Design. + */ + private Integer activityOrderNumber; + private Long toolContentID; + /** + * Set in {@link #validate()} method. + */ + private Boolean valid = true; + /** + * Set when submitting form in base.jsp page. + */ + private Integer callID; + + /** + * Only to save. It is loaded straight from the tool. + */ + private String editingAdvice; + + public Long getToolContentID() { + return toolContentID; + } + + public void setToolContentID(Long toolContentID) { + this.toolContentID = toolContentID; + } + + public Boolean getValid() { + return valid; + } + + public void setValid(Boolean valid) { + this.valid = valid; + } + + public Integer getCallID() { + return callID; + } + + public void setCallID(Integer callID) { + this.callID = callID; + } + + @Override + public void reset(ActionMapping mapping, HttpServletRequest request) { + super.reset(mapping, request); + setValid(true); + } + + /** + * Validates form. Must set {@link #valid} property. Can be overriden by inheriting classes, although call to this + * method is only in activities themselves (and not on a higher level like lams_central). + * + * @return + */ + public ActionMessages validate() { + setValid(true); + return new ActionMessages(); + } + + public Integer getActivityOrderNumber() { + return activityOrderNumber; + } + + public void setActivityOrderNumber(Integer activityOrderNumber) { + this.activityOrderNumber = activityOrderNumber; + } + + public String getEditingAdvice() { + return editingAdvice; + } + + public void setEditingAdvice(String editingAdvice) { + this.editingAdvice = editingAdvice; + } +} \ No newline at end of file Fisheye: Tag 8fd679dd28d13f8ccabe44c5a74c7873806f486b refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/planner/PedagogicalPlannerNodeRole.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8fd679dd28d13f8ccabe44c5a74c7873806f486b refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8fd679dd28d13f8ccabe44c5a74c7873806f486b refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/planner/dao/PedagogicalPlannerDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8fd679dd28d13f8ccabe44c5a74c7873806f486b refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/planner/dao/hibernate/PedagogicalPlannerDAOHibernate.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8fd679dd28d13f8ccabe44c5a74c7873806f486b refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerActivityDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8fd679dd28d13f8ccabe44c5a74c7873806f486b refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerSequenceNodeDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8fd679dd28d13f8ccabe44c5a74c7873806f486b refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerTemplateDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java =================================================================== diff -u -r092ede3b8b3828ffa688c4db18c5d535e3364b98 -r8fd679dd28d13f8ccabe44c5a74c7873806f486b --- lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java (.../AttributeNames.java) (revision 092ede3b8b3828ffa688c4db18c5d535e3364b98) +++ lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java (.../AttributeNames.java) (revision 8fd679dd28d13f8ccabe44c5a74c7873806f486b) @@ -98,12 +98,6 @@ public static final String ATTR_ITEM_RATING_DTOS = "itemRatingDtos"; public static final String ATTR_COUNT_RATED_ITEMS = "countRatedItems"; - // for Pedagogical Planner - public static final String PARAM_COMMAND = "command"; - public static final String COMMAND_GET_EDITING_ADVICE = "getEditingAdvice"; - public static final String COMMAND_CHECK_EDITING_ADVICE = "checkEditingAdvice"; - public static final String PARAM_ACTIVITY_INDEX = "activityIndex"; - // for tutorial videos public static final String ATTR_PAGE_STR = "pageString"; public static final String ATTR_DO_NOT_SHOW_AGAIN = "doNotShowAgain";