Index: lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml =================================================================== diff -u -r053f4adbf9e3b8f5eca3e67b4fba0350e65e78fc -rfdbf7a3cfb10831b1ac581efa42807d3207a71ff --- lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml (.../authoringApplicationContext.xml) (revision 053f4adbf9e3b8f5eca3e67b4fba0350e65e78fc) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml (.../authoringApplicationContext.xml) (revision fdbf7a3cfb10831b1ac581efa42807d3207a71ff) @@ -26,6 +26,8 @@ + + @@ -46,6 +48,8 @@ + + @@ -54,6 +58,7 @@ + Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java =================================================================== diff -u -rde304f6a5609560a89244cf1e7e8e8705bd098c9 -rfdbf7a3cfb10831b1ac581efa42807d3207a71ff --- lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java (.../AuthoringAction.java) (revision de304f6a5609560a89244cf1e7e8e8705bd098c9) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java (.../AuthoringAction.java) (revision fdbf7a3cfb10831b1ac581efa42807d3207a71ff) @@ -127,7 +127,7 @@ try { Long learningDesignID = WebUtil.readLongParam(request,"learningDesignID",false); wddxPacket = authoringService.getLearningDesignDetails(learningDesignID, getUserLanguage()); - log.debug("Import LD wddx packet: " + wddxPacket); + log.debug("LD wddx packet: " + wddxPacket); } catch (Exception e) { wddxPacket = handleException(e, "getLearningDesignDetails", authoringService, true).serializeMessage(); } Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/CompetenceServlet.java =================================================================== diff -u --- lams_central/src/java/org/lamsfoundation/lams/authoring/web/CompetenceServlet.java (revision 0) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/CompetenceServlet.java (revision fdbf7a3cfb10831b1ac581efa42807d3207a71ff) @@ -0,0 +1,97 @@ +package org.lamsfoundation.lams.authoring.web; + +import org.apache.log4j.Logger; + +import java.util.Set; + +import java.util.Hashtable; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + +import org.lamsfoundation.lams.authoring.service.AuthoringService; +import org.lamsfoundation.lams.authoring.service.IAuthoringService; +import org.lamsfoundation.lams.usermanagement.dto.UserDTO; +import org.lamsfoundation.lams.util.wddx.FlashMessage; +import org.lamsfoundation.lams.web.servlet.AbstractStoreWDDXPacketServlet; +import org.lamsfoundation.lams.web.session.SessionManager; +import org.lamsfoundation.lams.web.util.AttributeNames; +import org.lamsfoundation.lams.learningdesign.LearningDesign; +import org.lamsfoundation.lams.learningdesign.Competence; +import org.springframework.web.context.WebApplicationContext; +import org.springframework.web.context.support.WebApplicationContextUtils; +import org.lamsfoundation.lams.util.wddx.WDDXProcessor; + + +/** + *@web:servlet name="competenceServlet" + * @web:servlet-mapping url-pattern="/competenceServlet" + */ +public class CompetenceServlet extends AbstractStoreWDDXPacketServlet { + + protected Logger log = Logger.getLogger(CompetenceServlet.class); + private long learningDesignID; + + protected String process(String lessonPackage, HttpServletRequest request) throws Exception { + //get User infomation from shared session. + HttpSession ss = SessionManager.getSession(); + + UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); + Integer userID = (user != null) ? user.getUserID() : null; + + if(userID == null){ + log.error("Can not find valid login user information"); + FlashMessage flashMessage = new FlashMessage("createLesson", + "Can not find valid login user information", + FlashMessage.ERROR); + return flashMessage.serializeMessage(); + } + + if ( log.isDebugEnabled() ) { + log.debug("InitializeLessonServlet process received packet "+lessonPackage); + } + + try { + + + IAuthoringService authoringService = getAuthoringService(); + + // get ldid from wddx packet + Hashtable table = (Hashtable)WDDXProcessor.deserialize(lessonPackage); + + + + // parse WDDX values + //String title = WDDXProcessor.convertToString("lessonName", table.get("lessonName")); // competenceTitle + //String desc = WDDXProcessor.convertToString("lessonDescription", table.get("lessonDescription")); // competenceDescription + + + LearningDesign ld = authoringService.getLearningDesign(learningDesignID); + + //Set competences = ld.getCompetences(); + + // synchronise competence list with wddx packet + + authoringService.saveLearningDesign(ld); + + + //IMonitoringService monitoringService = getMonitoringService(); + //return monitoringService.initializeLesson(userID, lessonPackage); + } catch ( Exception e ) { + log.error("Exception thrown while creating lesson class.",e); + FlashMessage flashMessage = FlashMessage.getExceptionOccured("initializeLesson",e.getMessage()); + + return flashMessage.serializeMessage(); + } + return "duh"; + } + + protected String getMessageKey(String packet, HttpServletRequest request) { + return "duh"; + } + + public IAuthoringService getAuthoringService(){ + WebApplicationContext webContext = WebApplicationContextUtils.getRequiredWebApplicationContext(getServletContext()); + return (IAuthoringService) webContext.getBean("authoringService"); + } +} Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml =================================================================== diff -u -r6e4ed3724bd76354c2ee43c88979385c4a162a0e -rfdbf7a3cfb10831b1ac581efa42807d3207a71ff --- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision 6e4ed3724bd76354c2ee43c88979385c4a162a0e) +++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision fdbf7a3cfb10831b1ac581efa42807d3207a71ff) @@ -52,6 +52,8 @@ org/lamsfoundation/lams/learningdesign/Group.hbm.xml org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml + org/lamsfoundation/lams/learningdesign/Competence.hbm.xml + org/lamsfoundation/lams/learningdesign/CompetenceMapping.hbm.xml org/lamsfoundation/lams/learningdesign/LearningLibrary.hbm.xml org/lamsfoundation/lams/learningdesign/Transition.hbm.xml org/lamsfoundation/lams/learningdesign/License.hbm.xml @@ -362,6 +364,14 @@ + + + + + + + + competences; /** persistent field */ private WorkspaceFolder workspaceFolder; @@ -277,7 +280,7 @@ newDesign.setLicense(design.getLicense()); newDesign.setLicenseText(design.getLicenseText()); newDesign.setLastModifiedDateTime(new Date()); - + if(designCopyType.intValue()!=COPY_TYPE_NONE) newDesign.setReadOnly(new Boolean(true)); else @@ -554,5 +557,15 @@ return uiid != null && uiidOffset > 0 ? new Integer(uiid.intValue() + uiidOffset) : uiid; } + public Set getCompetences() { + return competences; + } + + public void setCompetences(Set competences) { + this.competences = competences; + } + + + } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java =================================================================== diff -u -r6d0ec5db1add705fb9da59656aaa4916e1163893 -rfdbf7a3cfb10831b1ac581efa42807d3207a71ff --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java (.../ToolActivity.java) (revision 6d0ec5db1add705fb9da59656aaa4916e1163893) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java (.../ToolActivity.java) (revision fdbf7a3cfb10831b1ac581efa42807d3207a71ff) @@ -28,10 +28,12 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; +import java.util.HashSet; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.log4j.Logger; import org.lamsfoundation.lams.learningdesign.strategy.ToolActivityStrategy; +import org.lamsfoundation.lams.learningdesign.CompetenceMapping; import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.lesson.LessonClass; import org.lamsfoundation.lams.tool.GroupedToolSession; @@ -58,7 +60,7 @@ /** List of sessions associated with this ToolActivity */ private Set toolSessions; - + private Set competenceMappings; /** full constructor */ public ToolActivity(Long activityId, @@ -84,7 +86,8 @@ Set inputActivities, Tool tool, Long toolContentId, - Set branchActivityEntries) + Set branchActivityEntries, + Set competenceMappings) { super(activityId, id, @@ -110,6 +113,7 @@ branchActivityEntries); this.tool = tool; this.toolContentId = toolContentId; + this.competenceMappings = competenceMappings; super.simpleActivityStrategy = new ToolActivityStrategy(this); } @@ -156,7 +160,18 @@ ToolActivity newToolActivity = new ToolActivity(); copyToNewActivity(newToolActivity, uiidOffset); newToolActivity.setTool(this.getTool()); - newToolActivity.setToolContentId(this.getToolContentId()); + newToolActivity.setToolContentId(this.getToolContentId()); + + Set newCompetenceMappings = new HashSet(); + for (CompetenceMapping compMap : this.competenceMappings) + { + CompetenceMapping newComp = new CompetenceMapping(); + newComp.setCompetence(compMap.getCompetence()); + newComp.setToolActivity(compMap.getToolActivity()); + newCompetenceMappings.add(compMap); + } + newToolActivity.setCompetenceMappings(newCompetenceMappings); + return newToolActivity; } @@ -300,8 +315,24 @@ public void setToolSessions(Set toolSessions) { this.toolSessions = toolSessions; } + + /** + * + * @return + */ + public Set getCompetenceMappings() { + return competenceMappings; + } - /** + /** + * + * @param competenceMappings + */ + public void setCompetenceMappings(Set competenceMappings) { + this.competenceMappings = competenceMappings; + } + + /** * @see org.lamsfoundation.lams.util.Nullable#isNull() */ public boolean isNull() @@ -318,4 +349,6 @@ toolActivities.add(this); } + + } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ICompetenceDAO.java =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ICompetenceDAO.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ICompetenceDAO.java (revision fdbf7a3cfb10831b1ac581efa42807d3207a71ff) @@ -0,0 +1,16 @@ +package org.lamsfoundation.lams.learningdesign.dao; + +import java.util.Set; + +import org.lamsfoundation.lams.learningdesign.Competence; +import org.lamsfoundation.lams.learningdesign.LearningDesign; + +public interface ICompetenceDAO +{ + public void saveOrUpdate(Competence competence); + public Competence getCompetence(LearningDesign design, String competenceTitle); + public void delete(Competence competence); + public void deleteAll(Set competence); +} + + Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ICompetenceMappingDAO.java =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ICompetenceMappingDAO.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ICompetenceMappingDAO.java (revision fdbf7a3cfb10831b1ac581efa42807d3207a71ff) @@ -0,0 +1,16 @@ +package org.lamsfoundation.lams.learningdesign.dao; + +import java.util.Set; + +import org.lamsfoundation.lams.learningdesign.Competence; +import org.lamsfoundation.lams.learningdesign.CompetenceMapping; +import org.lamsfoundation.lams.learningdesign.ToolActivity; + +public interface ICompetenceMappingDAO +{ + public void saveOrUpdate(CompetenceMapping competenceMapping); + public CompetenceMapping getCompetenceMapping(ToolActivity toolActivity, Competence competence); + public void delete(CompetenceMapping competenceMapping); + public void deleteAll(Set competenceMappings); + +} Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceDAO.java =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceDAO.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceDAO.java (revision fdbf7a3cfb10831b1ac581efa42807d3207a71ff) @@ -0,0 +1,80 @@ +/**************************************************************** + * 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.learningdesign.dao.hibernate; + +import java.util.List; +import java.util.Set; + +import org.hibernate.Query; +import org.hibernate.HibernateException; +import org.hibernate.Session; +import org.lamsfoundation.lams.learningdesign.dao.ICompetenceDAO; +import org.lamsfoundation.lams.learningdesign.Competence; +import org.lamsfoundation.lams.learningdesign.CompetenceMapping; +import org.lamsfoundation.lams.learningdesign.LearningDesign; +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.springframework.orm.hibernate3.HibernateCallback; + +public class CompetenceDAO extends BaseDAO implements ICompetenceDAO +{ + private static final String LOAD_COMPETENCE_BY_LDID_AND_TITLE= "from lams_competence in class " + Competence.class.getName() + + " where title=? AND learning_design_id=?"; + + + /** + * @see org.lamsfoundation.lams.competence.dao.ICompetenceDAO#saveOrUpdate() + */ + + public void saveOrUpdate(Competence competence) + { + this.getHibernateTemplate().saveOrUpdate(competence); + } + + + + /** + * @see org.lamsfoundation.lams.competence.dao.ICompetencelDAO#getCompetence() + */ + public Competence getCompetence(LearningDesign design, String competenceTitle) + { + if ( design != null && competenceTitle != null ) { + Long designID = design.getLearningDesignId(); + Query query = this.getSession().createQuery(LOAD_COMPETENCE_BY_LDID_AND_TITLE); + query.setString(0,competenceTitle); + query.setLong(1,designID.longValue()); + return (Competence) query.uniqueResult(); + } + return null; + } + + public void delete(Competence competence) + { + this.getHibernateTemplate().delete(competence); + } + + public void deleteAll(Set competences) + { + this.getHibernateTemplate().deleteAll(competences); + } +} Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceMappingDAO.java =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceMappingDAO.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceMappingDAO.java (revision fdbf7a3cfb10831b1ac581efa42807d3207a71ff) @@ -0,0 +1,45 @@ +package org.lamsfoundation.lams.learningdesign.dao.hibernate; + +import java.util.Set; + +import org.hibernate.Query; +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.learningdesign.Competence; +import org.lamsfoundation.lams.learningdesign.CompetenceMapping; +import org.lamsfoundation.lams.learningdesign.ToolActivity; +import org.lamsfoundation.lams.learningdesign.dao.ICompetenceMappingDAO; + +public class CompetenceMappingDAO extends BaseDAO implements ICompetenceMappingDAO +{ + + private static final String LOAD_COMPETENCE_MAPPING_BY_ACTIVITY_AND_COMPETENCE= "from lams_competence_mapping in class " + CompetenceMapping.class.getName() + + " where competence_id=? AND activity_id=?"; + + public void saveOrUpdate(CompetenceMapping competenceMapping) + { + this.getHibernateTemplate().saveOrUpdate(competenceMapping); + } + + public CompetenceMapping getCompetenceMapping(ToolActivity toolActivity, Competence competence) + { + if ( toolActivity != null && competence != null ) { + Long activityId = toolActivity.getActivityId(); + Long competenceId = competence.getCompetenceId(); + Query query = this.getSession().createQuery(LOAD_COMPETENCE_MAPPING_BY_ACTIVITY_AND_COMPETENCE); + query.setLong(0,competenceId); + query.setLong(1,activityId.longValue()); + return (CompetenceMapping) query.uniqueResult(); + } + return null; + } + + public void delete(CompetenceMapping competenceMapping) + { + this.getHibernateTemplate().delete(competenceMapping); + } + + public void deleteAll(Set competenceMappings) + { + this.getHibernateTemplate().deleteAll(competenceMappings); + } +} Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java =================================================================== diff -u -r209087915bc219f430c282ad00e5d1e6462f9b5f -rfdbf7a3cfb10831b1ac581efa42807d3207a71ff --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (.../AuthoringActivityDTO.java) (revision 209087915bc219f430c282ad00e5d1e6462f9b5f) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (.../AuthoringActivityDTO.java) (revision fdbf7a3cfb10831b1ac581efa42807d3207a71ff) @@ -25,13 +25,15 @@ import java.util.ArrayList; import java.util.Date; +import java.util.Set; import java.util.Iterator; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.BranchActivityEntry; import org.lamsfoundation.lams.learningdesign.BranchingActivity; -import org.lamsfoundation.lams.learningdesign.ComplexActivity; +import org.lamsfoundation.lams.learningdesign.CompetenceMapping; import org.lamsfoundation.lams.learningdesign.ConditionGateActivity; +import org.lamsfoundation.lams.learningdesign.ComplexActivity; import org.lamsfoundation.lams.learningdesign.GateActivity; import org.lamsfoundation.lams.learningdesign.Grouping; import org.lamsfoundation.lams.learningdesign.GroupingActivity; @@ -45,16 +47,16 @@ import org.lamsfoundation.lams.learningdesign.ToolActivity; import org.lamsfoundation.lams.util.HelpUtil; import org.lamsfoundation.lams.util.wddx.WDDXTAGS; - /** * @author Manpreet Minhas */ -public class AuthoringActivityDTO extends BaseDTO { +public class AuthoringActivityDTO extends BaseDTO{ + /***************************************************************************** * Attributes *****************************************************************************/ - + /** identifier field */ private Long activityID; @@ -67,41 +69,41 @@ /** Title of the activity*/ private String activityTitle; - + /** Help text for the activity*/ private String helpText; /** Help URL for the activity */ private String helpURL; - + /** UI specific attribute indicating the * position of the activity*/ private Integer xCoord; /** UI specific attribute indicating the * position of the activity*/ private Integer yCoord; - + /** The activity that acts as a container/parent for * this activity. Normally would be one of the * complex activities which have child activities * defined inside them. */ private Long parentActivityID; - + /** the activity_ui_id of the parent activity */ private Integer parentUIID; - + /** The type of activity */ private Integer activityTypeID; - + /** The Grouping that applies to this activity*/ private Long groupingID; - + /** The grouping_ui_id of the Grouping that * applies that to this activity * */ private Integer groupingUIID; - + /** Indicates the order in which the activities * appear inside complex activities. Starts from * 0, 1 and so on.*/ @@ -110,46 +112,46 @@ /** Indicates whether the content of this activity * would be defined later in the monitoring environment or not.*/ private Boolean defineLater; - + /** The LearningDesign to which this activity belongs*/ private Long learningDesignID; - + /** The LearningLibrary of which this activity is a part*/ private Long learningLibraryID; - + /** Date this activity was created */ private Date createDateTime; - + /** Indicates whether this activity is available offline*/ private Boolean runOffline; /** Maximum number of activities to be attempted */ private Integer maxOptions; - + /** Minimum number of activities to be attempted */ private Integer minOptions; - + /** Instructions for OptionsActivity*/ private String optionsInstructions; - + /** The tool_signature of the activity */ private String toolSignature; - + /** The tool_id of the activity */ private Long toolID; - + /** The tool_content_id of the tool */ private Long toolContentID; - + /** The tool's display name */ private String toolDisplayName; - + /** The tool's version */ private String toolVersion; /** The url of the tool's authoring screen. */ private String authoringURL; - + /** The url of the tool's monitoring screen. */ private String monitoringURL; @@ -164,33 +166,33 @@ /** The category of activity */ private Integer activityCategoryID; - + private Integer gateActivityLevelID; - + private Boolean gateOpen; - + private Long gateStartTimeOffset; - + private Long gateEndTimeOffset; - + private Date gateStartDateTime; - + private Date gateEndDateTime; - + private Boolean applyGrouping; - + private Integer groupingSupportType; - + private Integer groupingType; - + /** The image that represents the icon of this * activity in the UI*/ private String libraryActivityUIImage; - + private Long createGroupingID; - + private Integer createGroupingUIID; - + private Boolean readOnly; /** An activity is initialised if it is ready to be used in lesson ie the tool content @@ -203,181 +205,198 @@ * final activity of a design does not necessarily have this set - the progress engine will just * stop when it runs out of transitions to follow. */ private Boolean stopAfterActivity; - + /* Server will send Grouping objects as an array (in the Groupings array) * rather than being part of the GroupingActivity. For the groupings array * see LearningDesignDTO. */ //private GroupingDTO groupingDTO; - + + /** Single Library can have one or more activities * defined inside it. This field indicates which * activity is this.*/ private Long libraryActivityID; - + /** Name of the file (including the package) that contains the text strings for * this activity. e.g. org.lamsfoundation.lams.tool.sbmt.SbmtResources.properties. */ private String languageFile; - + /** List of the UIIDs of the activities that are input activities for this activity. This array * will only contain integers. We can't type the get method as that breaks WDDX. */ private ArrayList inputActivities; + + /** + * List of all the competence mappings for this activity, only applies to tool activities + */ + private ArrayList competenceMappingTitles; /** List of the UIIDs of the activities that are input activities for this activity */ private Integer toolActivityUIID; /** Used by a sequence activity to determine the start of the transition based sequence and used by tool * based branching to determine the default branch. */ private Integer defaultActivityUIID; - + private Integer startXCoord; private Integer startYCoord; private Integer endXCoord; private Integer endYCoord; - + /** Used for I18N the URLS. Does not need to be sent to clients, so no getter exists. */ - private String languageCode; - + private String languageCode; + private Boolean supportsOutputs; - + /** * This string identifies the tool as a tool adapter tool, null otherwise */ private String extLmsId; - + /***************************************************************************** * Constructors *****************************************************************************/ - public AuthoringActivityDTO(Activity activity, ArrayList branchMappings, String languageCode) { - activityID = activity.getActivityId(); - activityUIID = activity.getActivityUIID(); - description = activity.getDescription(); - activityTitle = activity.getTitle(); - helpText = activity.getHelpText(); - xCoord = activity.getXcoord(); - yCoord = activity.getYcoord(); - parentActivityID = activity.getParentActivity() != null ? activity.getParentActivity().getActivityId() : null; - parentUIID = activity.getParentUIID(); - activityTypeID = activity.getActivityTypeId(); + public AuthoringActivityDTO(Activity activity, ArrayList branchMappings, String languageCode){ + this.activityID = activity.getActivityId(); + this.activityUIID = activity.getActivityUIID(); + this.description = activity.getDescription(); + this.activityTitle = activity.getTitle(); + this.helpText = activity.getHelpText(); + this.xCoord = activity.getXcoord(); + this.yCoord = activity.getYcoord(); + this.parentActivityID = activity.getParentActivity()!=null? + activity.getParentActivity().getActivityId(): + null; + this.parentUIID = activity.getParentUIID(); + this.activityTypeID = activity.getActivityTypeId(); + + this.groupingID = activity.getGrouping()!=null? + activity.getGrouping().getGroupingId(): + null; + + this.groupingUIID = activity.getGroupingUIID(); + this.orderID = activity.getOrderId(); + this.defineLater = activity.getDefineLater(); + this.learningDesignID = activity.getLearningDesign()!=null? + activity.getLearningDesign().getLearningDesignId(): + null; + this.learningLibraryID = activity.getLearningLibrary()!=null? + activity.getLearningLibrary().getLearningLibraryId(): + null; + this.createDateTime = activity.getCreateDateTime(); + this.runOffline = activity.getRunOffline(); + this.languageFile = activity.getLanguageFile(); + this.activityCategoryID = activity.getActivityCategoryID(); + this.libraryActivityUIImage = activity.getLibraryActivityUiImage(); + this.libraryActivityID = activity.getLibraryActivity()!=null? + activity.getLibraryActivity().getActivityId(): + null; + this.applyGrouping = activity.getApplyGrouping(); + this.groupingSupportType = activity.getGroupingSupportType(); + this.readOnly = activity.getReadOnly(); + this.initialised = activity.isInitialised(); + this.stopAfterActivity = activity.isStopAfterActivity(); + + this.inputActivities = activity.getInputActivityUIIDs(); + this.toolActivityUIID = activity.getToolInputActivityUIID(); - groupingID = activity.getGrouping() != null ? activity.getGrouping().getGroupingId() : null; - - groupingUIID = activity.getGroupingUIID(); - orderID = activity.getOrderId(); - defineLater = activity.getDefineLater(); - learningDesignID = activity.getLearningDesign() != null ? activity.getLearningDesign().getLearningDesignId() : null; - learningLibraryID = activity.getLearningLibrary() != null ? activity.getLearningLibrary().getLearningLibraryId() : null; - createDateTime = activity.getCreateDateTime(); - runOffline = activity.getRunOffline(); - languageFile = activity.getLanguageFile(); - activityCategoryID = activity.getActivityCategoryID(); - libraryActivityUIImage = activity.getLibraryActivityUiImage(); - libraryActivityID = activity.getLibraryActivity() != null ? activity.getLibraryActivity().getActivityId() : null; - applyGrouping = activity.getApplyGrouping(); - groupingSupportType = activity.getGroupingSupportType(); - readOnly = activity.getReadOnly(); - initialised = activity.isInitialised(); - stopAfterActivity = activity.isStopAfterActivity(); - - inputActivities = activity.getInputActivityUIIDs(); - toolActivityUIID = activity.getToolInputActivityUIID(); - this.languageCode = languageCode; - + processActivityType(activity, branchMappings); } + + - private void processActivityType(Activity activity, ArrayList branchMappings) { - if (activity.isGroupingActivity()) { - addGroupingActivityAttributes((GroupingActivity) activity); - } - else if (activity.isToolActivity()) { - addToolActivityAttributes((ToolActivity) activity); - } - else if (activity.isGateActivity()) { - addGateActivityAttributes(activity); - } - else { - addComplexActivityAttributes(activity, branchMappings); - } + private void processActivityType(Activity activity, ArrayList branchMappings){ + if(activity.isGroupingActivity()) + addGroupingActivityAttributes((GroupingActivity)activity); + else if(activity.isToolActivity()) + addToolActivityAttributes((ToolActivity)activity); + else if(activity.isGateActivity()) + addGateActivityAttributes(activity); + else + addComplexActivityAttributes(activity, branchMappings); } - - private void addComplexActivityAttributes(Activity activity, ArrayList branchMappings) { + private void addComplexActivityAttributes(Activity activity, ArrayList branchMappings){ ComplexActivity complex = (ComplexActivity) activity; - if (complex.getDefaultActivity() != null) { + if ( complex.getDefaultActivity() != null ) { defaultActivityUIID = complex.getDefaultActivity().getActivityUIID(); } - - if (activity.isOptionsActivity()) { - addOptionsActivityAttributes((OptionsActivity) activity); - } - else if (activity.isParallelActivity()) { - addParallelActivityAttributes((ParallelActivity) activity); - } - else if (activity.isBranchingActivity()) { - addBranchingActivityAttributes((BranchingActivity) activity); - } - else { - addSequenceActivityAttributes((SequenceActivity) activity, branchMappings); - } - + + if(activity.isOptionsActivity()) + addOptionsActivityAttributes((OptionsActivity)activity); + else if (activity.isParallelActivity()) + addParallelActivityAttributes((ParallelActivity)activity); + else if(activity.isBranchingActivity()) + addBranchingActivityAttributes((BranchingActivity)activity); + else + addSequenceActivityAttributes((SequenceActivity)activity, branchMappings); + } - - private void addGroupingActivityAttributes(GroupingActivity groupingActivity) { + private void addGroupingActivityAttributes(GroupingActivity groupingActivity){ Grouping grouping = groupingActivity.getCreateGrouping(); - + //this.groupingDTO = grouping.getGroupingDTO(); - createGroupingID = grouping.getGroupingId(); - createGroupingUIID = grouping.getGroupingUIID(); + this.createGroupingID = grouping.getGroupingId(); + this.createGroupingUIID = grouping.getGroupingUIID(); //this.groupingType = grouping.getGroupingTypeId(); - adminURL = groupingActivity.getSystemTool().getAdminUrl(); + this.adminURL = groupingActivity.getSystemTool().getAdminUrl(); } - - private void addOptionsActivityAttributes(OptionsActivity optionsActivity) { - maxOptions = optionsActivity.getMaxNumberOfOptions(); - minOptions = optionsActivity.getMinNumberOfOptions(); - optionsInstructions = optionsActivity.getOptionsInstructions(); + private void addOptionsActivityAttributes(OptionsActivity optionsActivity){ + this.maxOptions = optionsActivity.getMaxNumberOfOptions(); + this.minOptions = optionsActivity.getMinNumberOfOptions(); + this.optionsInstructions = optionsActivity.getOptionsInstructions(); } - - private void addParallelActivityAttributes(ParallelActivity activity) { + private void addParallelActivityAttributes(ParallelActivity activity){ } - - private void addBranchingActivityAttributes(BranchingActivity activity) { - startXCoord = activity.getStartXcoord(); - startYCoord = activity.getStartYcoord(); - endXCoord = activity.getEndXcoord(); - endYCoord = activity.getEndYcoord(); + private void addBranchingActivityAttributes(BranchingActivity activity){ + this.startXCoord = activity.getStartXcoord(); + this.startYCoord = activity.getStartYcoord(); + this.endXCoord = activity.getEndXcoord(); + this.endYCoord = activity.getEndYcoord(); } - - private void addSequenceActivityAttributes(SequenceActivity activity, ArrayList branchMappings) { - + private void addSequenceActivityAttributes(SequenceActivity activity, ArrayList branchMappings){ + Activity parentActivity = activity.getParentActivity(); Integer toolActivityUIID = parentActivity != null ? parentActivity.getToolInputActivityUIID() : null; Iterator iter = activity.getBranchEntries().iterator(); - while (iter.hasNext()) { + while ( iter.hasNext() ) { BranchActivityEntry ba = (BranchActivityEntry) iter.next(); branchMappings.add(ba.getBranchActivityEntryDTO(toolActivityUIID)); } } + + private void addToolActivityAttributes(ToolActivity toolActivity){ + this.toolContentID = toolActivity.getToolContentId(); + this.toolID = toolActivity.getTool().getToolId(); + this.toolSignature = toolActivity.getTool().getToolSignature(); + this.authoringURL = toolActivity.getTool().getAuthorUrl(); + this.monitoringURL = toolActivity.getTool().getMonitorUrl(); + this.contributeURL = toolActivity.getTool().getContributeUrl(); + this.moderationURL = toolActivity.getTool().getModerationUrl(); + this.adminURL = toolActivity.getTool().getAdminUrl(); + this.toolDisplayName = toolActivity.getTool().getToolDisplayName(); + this.toolVersion = toolActivity.getTool().getToolVersion(); + this.supportsOutputs = toolActivity.getTool().getSupportsOutputs(); + this.extLmsId = toolActivity.getTool().getExtLmsId(); + this.helpURL = HelpUtil.constructToolURL(toolActivity.getTool().getHelpUrl(), toolSignature, "", languageCode); + - private void addToolActivityAttributes(ToolActivity toolActivity) { - toolContentID = toolActivity.getToolContentId(); - toolID = toolActivity.getTool().getToolId(); - toolSignature = toolActivity.getTool().getToolSignature(); - authoringURL = toolActivity.getTool().getAuthorUrl(); - monitoringURL = toolActivity.getTool().getMonitorUrl(); - contributeURL = toolActivity.getTool().getContributeUrl(); - moderationURL = toolActivity.getTool().getModerationUrl(); - adminURL = toolActivity.getTool().getAdminUrl(); - toolDisplayName = toolActivity.getTool().getToolDisplayName(); - toolVersion = toolActivity.getTool().getToolVersion(); - supportsOutputs = toolActivity.getTool().getSupportsOutputs(); - extLmsId = toolActivity.getTool().getExtLmsId(); - helpURL = HelpUtil.constructToolURL(toolActivity.getTool().getHelpUrl(), toolSignature, "", languageCode); - + this.competenceMappingTitles = new ArrayList(); + if(toolActivity.getCompetenceMappings()!=null){ + + Set competenceMappings = toolActivity.getCompetenceMappings(); + for (CompetenceMapping competenceMapping : competenceMappings) + { + //CompetenceMappingDTO competenceMappingDTO = new CompetenceMappingDTO(competenceMapping); + String competenceMappingTitle = competenceMapping.getCompetence().getTitle(); + + this.competenceMappingTitles.add(competenceMappingTitle); + } + } } - + private void addGateActivityAttributes(Object activity) { if (activity instanceof SynchGateActivity) { addSynchGateActivityAttributes((SynchGateActivity) activity); @@ -403,752 +422,615 @@ private void addConditionGateActivityAttributes(ConditionGateActivity activity) { } - - private void addSynchGateActivityAttributes(SynchGateActivity activity) { + private void addSynchGateActivityAttributes(SynchGateActivity activity){ } - - private void addPermissionGateActivityAttributes(PermissionGateActivity activity) { + private void addPermissionGateActivityAttributes(PermissionGateActivity activity){ } - - private void addSystemGateActivityAttributes(SystemGateActivity activity) { + private void addSystemGateActivityAttributes(SystemGateActivity activity){ } - - private void addScheduleGateActivityAttributes(ScheduleGateActivity activity) { - gateStartDateTime = activity.getGateStartDateTime(); - gateStartTimeOffset = activity.getGateStartTimeOffset(); - gateEndDateTime = activity.getGateEndDateTime(); - gateEndTimeOffset = activity.getGateEndTimeOffset(); + private void addScheduleGateActivityAttributes(ScheduleGateActivity activity){ + this.gateStartDateTime = activity.getGateStartDateTime(); + this.gateStartTimeOffset = activity.getGateStartTimeOffset(); + this.gateEndDateTime = activity.getGateEndDateTime(); + this.gateEndTimeOffset = activity.getGateEndTimeOffset(); } - + /***************************************************************************** * Getters *****************************************************************************/ - + /** * @return Returns the activityCategoryID. */ public Integer getActivityCategoryID() { return activityCategoryID; } - /** * @return Returns the activityID. */ public Long getActivityID() { return activityID; } - /** * @return Returns the activityTypeID. */ public Integer getActivityTypeID() { return activityTypeID; } - /** * @return Returns the activityUIID. */ public Integer getActivityUIID() { return activityUIID; } - /** * @return Returns the createDateTime. */ public Date getCreateDateTime() { return createDateTime; } - /** * @return Returns the createGroupingID. */ public Long getCreateGroupingID() { return createGroupingID; } - /** * @return Returns the createGroupingUIID. */ public Integer getCreateGroupingUIID() { return createGroupingUIID; } - /** * @return Returns the defineLater. */ public Boolean getDefineLater() { return defineLater; } - /** * @return Returns the description. */ public String getDescription() { return description; } - /** * @return Returns the gateActivityLevelID. */ public Integer getGateActivityLevelID() { return gateActivityLevelID; } - /** * @return Returns the gateEndDateTime. */ public Date getGateEndDateTime() { return gateEndDateTime; } - /** * @return Returns the gateEndTimeOffset. */ public Long getGateEndTimeOffset() { return gateEndTimeOffset; } - /** * @return Returns the gateOpen. */ public Boolean getGateOpen() { return gateOpen; } - /** * @return Returns the gateStartDateTime. */ public Date getGateStartDateTime() { return gateStartDateTime; } - /** * @return Returns the gateStartTimeOffset. */ public Long getGateStartTimeOffset() { return gateStartTimeOffset; } - /** * @return Returns the groupingID. */ public Long getGroupingID() { return groupingID; } - /** * @return Returns the groupingUIID. */ public Integer getGroupingUIID() { return groupingUIID; } - /** * @return Returns the helpText. */ public String getHelpText() { return helpText; } - /** * @return Returns the learningDesignID. */ public Long getLearningDesignID() { return learningDesignID; } - /** * @return Returns the learningLibraryID. */ public Long getLearningLibraryID() { return learningLibraryID; } - /** * @return Returns the libraryActivityID. */ public Long getLibraryActivityID() { return libraryActivityID; } - /** * @return Returns the libraryActivityUiImage. */ public String getLibraryActivityUIImage() { return libraryActivityUIImage; } - /** * @return Returns the maxOptions. */ public Integer getMaxOptions() { return maxOptions; } - /** * @return Returns the minOptions. */ public Integer getMinOptions() { return minOptions; } - /** * @return Returns the optionsInstructions. */ public String getOptionsInstructions() { return optionsInstructions; } - /** * @return Returns the orderID. */ public Integer getOrderID() { return orderID; } - /** * @return Returns the parentActivityID. */ public Long getParentActivityID() { return parentActivityID; } - /** * @return Returns the parentUIID. */ public Integer getParentUIID() { return parentUIID; } - /** * @return Returns the runOffline. */ public Boolean getRunOffline() { return runOffline; } - /** * @return Returns the title. */ public String getActivityTitle() { return activityTitle; } - /** * @return Returns the toolContentID. */ public Long getToolContentID() { return toolContentID; } - /** * @return Returns the toolID. */ public Long getToolID() { return toolID; } - /** * @return Returns the xcoord. */ public Integer getxCoord() { return xCoord; } - /** * @return Returns the ycoord. */ public Integer getyCoord() { return yCoord; - } - + } /** Get the authoring url related to this tool */ public String getAuthoringURL() { return authoringURL; } - /** * @return Returns the readOnly. */ public Boolean getReadOnly() { return readOnly; } - /** * Name of the file (including the package) that contains the text strings for * this activity. e.g. org.lamsfoundation.lams.tool.sbmt.SbmtResources.properties. */ public String getLanguageFile() { return languageFile; } - /** Get the tool's display name */ public String getToolDisplayName() { return toolDisplayName; } - /** Get the contribution url related to this tool */ public String getContributeURL() { return contributeURL; } - /** Get the monitoring url related to this tool */ public String getMonitoringURL() { return monitoringURL; } - public String getModerationURL() { return moderationURL; } - - public String getHelpURL() { + public String getHelpURL(){ return helpURL; } - public String getToolSignature() { return toolSignature; } - public String getToolVersion() { return toolVersion; } - public Boolean getInitialised() { return initialised; } - public Boolean getStopAfterActivity() { return stopAfterActivity; } - /** * @return Returns the applyGrouping. */ public Boolean getApplyGrouping() { return applyGrouping; } - /** * @return Returns the groupingSupportType. */ public Integer getGroupingSupportType() { return groupingSupportType; } - /** * @return Returns the groupingType. */ public Integer getGroupingType() { return groupingType; } - /** Get the UI ID of the first activity within a sequence activity or default branch in tool based branching */ public Integer getDefaultActivityUIID() { return defaultActivityUIID; } - /** * @return Returns the xcoord of the end hub for a branching activity */ public Integer getEndXCoord() { return endXCoord; } - /** * @return Returns the tcoord of the end hub for a branching activity */ public Integer getEndYCoord() { return endYCoord; } - /** * @return Returns the xcoord of the start hub for a branching activity */ public Integer getStartXCoord() { return startXCoord; } - /** * @return Returns the ycoord of the start hub for a branching activity */ public Integer getStartYCoord() { return startYCoord; } - /************************************************* * Setters ************************************************/ /** * @param activityCategoryID The activityCategoryID to set. */ public void setActivityCategoryID(Integer activityCategoryID) { - if (!activityCategoryID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) { + if(!activityCategoryID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) this.activityCategoryID = activityCategoryID; - } } - /** * @param activityID The activityID to set. */ public void setActivityID(Long activityId) { - if (!activityId.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG)) { - activityID = activityId; - } + if(!activityId.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG)) + this.activityID = activityId; } - /** * @param activityTypeID The activityTypeID to set. */ public void setActivityTypeID(Integer activityTypeId) { - if (!activityTypeId.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) { - activityTypeID = activityTypeId; - } + if(!activityTypeId.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) + this.activityTypeID = activityTypeId; } /** * @param activityUIID The activityUIID to set. */ public void setActivityUIID(Integer activityUIID) { - if (!activityUIID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) { + if(!activityUIID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) this.activityUIID = activityUIID; - } } - /** * @param createDateTime The createDateTime to set. */ public void setCreateDateTime(Date createDateTime) { - if (!createDateTime.equals(WDDXTAGS.DATE_NULL_VALUE)) { + if(!createDateTime.equals(WDDXTAGS.DATE_NULL_VALUE)) this.createDateTime = createDateTime; - } } - /** * @param createGroupingID The createGroupingID to set. */ public void setCreateGroupingID(Long createGroupingID) { - if (!createGroupingID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG)) { + if(!createGroupingID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG)) this.createGroupingID = createGroupingID; - } } - /** * @param createGroupingUIID The createGroupingUIID to set. */ public void setCreateGroupingUIID(Integer createGroupingUIID) { - if (!createGroupingUIID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) { + if(!createGroupingUIID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) this.createGroupingUIID = createGroupingUIID; - } } - /** * @param defineLater The defineLater to set. */ - public void setDefineLater(Boolean defineLater) { + public void setDefineLater(Boolean defineLater) { this.defineLater = defineLater; } - /** * @param description The description to set. */ public void setDescription(String description) { - if (!description.equals(WDDXTAGS.STRING_NULL_VALUE)) { + if(!description.equals(WDDXTAGS.STRING_NULL_VALUE)) this.description = description; - } } - /** * @param gateActivityLevelID The gateActivityLevelID to set. */ public void setGateActivityLevelID(Integer gateActivityLevelID) { - if (!gateActivityLevelID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) { + if(!gateActivityLevelID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) this.gateActivityLevelID = gateActivityLevelID; - } } - /** * @param gateEndDateTime The gateEndDateTime to set. */ public void setGateEndDateTime(Date gateEndDateTime) { - if (!gateEndDateTime.equals(WDDXTAGS.DATE_NULL_VALUE)) { + if(!gateEndDateTime.equals(WDDXTAGS.DATE_NULL_VALUE)) this.gateEndDateTime = gateEndDateTime; - } } - /** * @param gateEndTimeOffset The gateEndTimeOffset to set. */ public void setGateEndTimeOffset(Long gateEndTimeOffset) { - if (!gateEndTimeOffset.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG)) { + if(!gateEndTimeOffset.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG)) this.gateEndTimeOffset = gateEndTimeOffset; - } } - /** * @param gateOpen The gateOpen to set. */ public void setGateOpen(Boolean gateOpen) { this.gateOpen = gateOpen; } - /** * @param gateStartDateTime The gateStartDateTime to set. */ public void setGateStartDateTime(Date gateStartDateTime) { - if (!gateStartDateTime.equals(WDDXTAGS.DATE_NULL_VALUE)) { + if(!gateStartDateTime.equals(WDDXTAGS.DATE_NULL_VALUE)) this.gateStartDateTime = gateStartDateTime; - } } - /** * @param gateStartTimeOffset The gateStartTimeOffset to set. */ public void setGateStartTimeOffset(Long gateStartTimeOffset) { - if (!gateStartTimeOffset.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG)) { + if(!gateStartTimeOffset.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG)) this.gateStartTimeOffset = gateStartTimeOffset; - } } - /** * @param groupingID The groupingID to set. */ public void setGroupingID(Long groupingID) { - if (!groupingID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG)) { + if(!groupingID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG)) this.groupingID = groupingID; - } } - /** * @param groupingUIID The groupingUIID to set. */ public void setGroupingUIID(Integer groupingUIID) { - if (!groupingUIID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) { + if(!groupingUIID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) this.groupingUIID = groupingUIID; - } } - /** * @param helpText The helpText to set. */ public void setHelpText(String helpText) { - if (!helpText.equals(WDDXTAGS.STRING_NULL_VALUE)) { + if(!helpText.equals(WDDXTAGS.STRING_NULL_VALUE)) this.helpText = helpText; - } } - /** * @param learningDesignID The learningDesignID to set. */ public void setLearningDesignID(Long learningDesignID) { - if (!learningDesignID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG)) { + if(!learningDesignID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG)) this.learningDesignID = learningDesignID; - } } - /** * @param learningLibraryID The learningLibraryID to set. */ public void setLearningLibraryID(Long learningLibraryID) { - if (!learningLibraryID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG)) { + if(!learningLibraryID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG)) this.learningLibraryID = learningLibraryID; - } } - /** * @param libraryActivityID The libraryActivityID to set. */ public void setLibraryActivityID(Long libraryActivityID) { - if (!libraryActivityID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG)) { + if(!libraryActivityID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG)) this.libraryActivityID = libraryActivityID; - } } - /** * @param libraryActivityUiImage The libraryActivityUiImage to set. */ public void setLibraryActivityUIImage(String libraryActivityUiImage) { - if (!libraryActivityUiImage.equals(WDDXTAGS.STRING_NULL_VALUE)) { - libraryActivityUIImage = libraryActivityUiImage; - } + if(!libraryActivityUiImage.equals(WDDXTAGS.STRING_NULL_VALUE)) + this.libraryActivityUIImage = libraryActivityUiImage; } - /** * @param maxOptions The maxOptions to set. */ public void setMaxOptions(Integer maxOptions) { - if (!maxOptions.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) { + if(!maxOptions.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) this.maxOptions = maxOptions; - } } - /** * @param minOptions The minOptions to set. */ public void setMinOptions(Integer minOptions) { - if (!minOptions.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) { + if(!minOptions.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) this.minOptions = minOptions; - } } - /** * @param optionsInstructions The optionsInstructions to set. */ public void setOptionsInstructions(String optionsInstructions) { - if (!optionsInstructions.equals(WDDXTAGS.STRING_NULL_VALUE)) { + if(!optionsInstructions.equals(WDDXTAGS.STRING_NULL_VALUE)) this.optionsInstructions = optionsInstructions; - } } - /** * @param orderID The orderID to set. */ public void setOrderID(Integer orderID) { - if (!orderID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) { + if(!orderID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) this.orderID = orderID; - } } - /** * @param parentActivityID The parentActivityID to set. */ public void setParentActivityID(Long parentActivityID) { - if (!parentActivityID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG)) { + if(!parentActivityID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG)) this.parentActivityID = parentActivityID; - } } - /** * @param parentUIID The parentUIID to set. */ public void setParentUIID(Integer parentUIID) { - if (!parentUIID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) { + if(!parentUIID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) this.parentUIID = parentUIID; - } } - /** * @param runOffline The runOffline to set. */ public void setRunOffline(Boolean runOffline) { this.runOffline = runOffline; } - /** * @param title The title to set. */ public void setActivityTitle(String title) { - if (!title.equals(WDDXTAGS.STRING_NULL_VALUE)) { - activityTitle = title; - } + if(!title.equals(WDDXTAGS.STRING_NULL_VALUE)) + this.activityTitle = title; } - /** * @param toolContentID The toolContentID to set. */ public void setToolContentID(Long toolContentID) { - if (!toolContentID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG)) { + if(!toolContentID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG)) this.toolContentID = toolContentID; - } } - /** * @param toolID The toolID to set. */ public void setToolID(Long toolID) { - if (!toolID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG)) { + if(!toolID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG)) this.toolID = toolID; - } } - /** * @param xcoord The xcoord to set. */ public void setxCoord(Integer xcoord) { - if (!xcoord.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) { - xCoord = xcoord; - } + if(!xcoord.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) + this.xCoord = xcoord; } - /** * @param ycoord The ycoord to set. */ public void setyCoord(Integer ycoord) { - if (!xCoord.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) { - yCoord = ycoord; - } - } - + if(!xCoord.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) + this.yCoord = ycoord; + } /** * @param applyGrouping The applyGrouping to set. */ public void setApplyGrouping(Boolean applyGrouping) { this.applyGrouping = applyGrouping; } - /** * @param groupingSupportType The groupingSupportType to set. */ public void setGroupingSupportType(Integer groupingSupportType) { - if (!groupingSupportType.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) { + if(!groupingSupportType.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) this.groupingSupportType = groupingSupportType; - } } - /** * @param groupingType The groupingType to set. */ public void setGroupingType(Integer groupingType) { - if (!groupingType.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) { + if(!groupingType.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) this.groupingType = groupingType; - } } - /** * * @param readOnly The readOnly to set. */ public void setReadOnly(Boolean readOnly) { - if (!readOnly.equals(WDDXTAGS.BOOLEAN_NULL_VALUE)) { + if(!readOnly.equals(WDDXTAGS.BOOLEAN_NULL_VALUE)) this.readOnly = readOnly; - } } - + public void setAuthoringURL(String toolAuthoringURL) { - authoringURL = toolAuthoringURL; + this.authoringURL = toolAuthoringURL; } - public void setToolDisplayName(String toolDisplayName) { this.toolDisplayName = toolDisplayName; } - public void setLanguageFile(String languageFile) { this.languageFile = languageFile; } - public void setContributeURL(String contributeURL) { this.contributeURL = contributeURL; } - public void setMonitoringURL(String monitoringURL) { this.monitoringURL = monitoringURL; } - public void setModerationURL(String moderationURL) { this.moderationURL = moderationURL; } - public void setHelpURL(String helpURL) { this.helpURL = helpURL; } - public void setToolSignature(String toolSignature) { this.toolSignature = toolSignature; } - public void setToolVersion(String toolVersion) { this.toolVersion = toolVersion; } - public void setInitialised(Boolean initialised) { this.initialised = initialised; } @@ -1226,4 +1108,10 @@ public void setExtLmsId(String extLmsId) { this.extLmsId = extLmsId; } -} + public ArrayList getCompetenceMappingTitles() { + return competenceMappingTitles; + } + public void setCompetenceMappingTitles(ArrayList competenceMappingTitles) { + this.competenceMappingTitles = competenceMappingTitles; + } +} \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/CompetenceDTO.java =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/CompetenceDTO.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/CompetenceDTO.java (revision fdbf7a3cfb10831b1ac581efa42807d3207a71ff) @@ -0,0 +1,53 @@ +package org.lamsfoundation.lams.learningdesign.dto; + +import org.lamsfoundation.lams.learningdesign.Competence; +import org.lamsfoundation.lams.learningdesign.LearningDesign; + +public class CompetenceDTO +{ + private Long competenceId; + private Long learningDesignID; + private String title; + private String description; + public CompetenceDTO() {} + + public CompetenceDTO(Competence competence) + { + this.competenceId = competence.getCompetenceId(); + this.learningDesignID = competence.getLearningDesign().getLearningDesignId(); + this.description = competence.getDescription(); + this.title = competence.getTitle(); + } + + public Long getCompetenceId() { + return competenceId; + } + + public void setCompetenceId(Long competenceId) { + this.competenceId = competenceId; + } + + public Long getLearningDesignID() { + return learningDesignID; + } + + public void setLearningDesignID(Long learningDesignID) { + this.learningDesignID = learningDesignID; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } +} Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/CompetenceMappingDTO.java =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/CompetenceMappingDTO.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/CompetenceMappingDTO.java (revision fdbf7a3cfb10831b1ac581efa42807d3207a71ff) @@ -0,0 +1,45 @@ +package org.lamsfoundation.lams.learningdesign.dto; + +import org.lamsfoundation.lams.learningdesign.CompetenceMapping; +import org.lamsfoundation.lams.learningdesign.ToolActivity; + +public class CompetenceMappingDTO +{ + private Long competenceMappingId; + private String competenceTitle; + private Integer toolActivityUIID; + + public CompetenceMappingDTO() {} + + public CompetenceMappingDTO(CompetenceMapping competenceMapping) + { + this.competenceMappingId = competenceMapping.getCompetenceMappingId(); + this.competenceTitle = competenceMapping.getCompetence().getTitle(); + this.toolActivityUIID = competenceMapping.getToolActivity().getActivityUIID(); + + } + + public Long getCompetenceMappingId() { + return competenceMappingId; + } + + public void setCompetenceMappingId(Long competenceMappingId) { + this.competenceMappingId = competenceMappingId; + } + + public String getCompetenceTitle() { + return competenceTitle; + } + + public void setCompetenceTitle(String competenceTitle) { + this.competenceTitle = competenceTitle; + } + + public Integer getToolActivityUIID() { + return toolActivityUIID; + } + + public void setToolActivityUIID(Integer toolActivityUIID) { + this.toolActivityUIID = toolActivityUIID; + } +} Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java =================================================================== diff -u -r870373d635bc769aee2dc271e6ff12818fcfcea6 -rfdbf7a3cfb10831b1ac581efa42807d3207a71ff --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java (.../LearningDesignDTO.java) (revision 870373d635bc769aee2dc271e6ff12818fcfcea6) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java (.../LearningDesignDTO.java) (revision fdbf7a3cfb10831b1ac581efa42807d3207a71ff) @@ -34,6 +34,7 @@ import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.ActivityDTOOrderComparator; import org.lamsfoundation.lams.learningdesign.BranchActivityEntry; +import org.lamsfoundation.lams.learningdesign.Competence; import org.lamsfoundation.lams.learningdesign.Group; import org.lamsfoundation.lams.learningdesign.Grouping; import org.lamsfoundation.lams.learningdesign.GroupingActivity; @@ -85,6 +86,7 @@ private ArrayList activities; private ArrayList transitions; private ArrayList branchMappings; + private ArrayList competences; public LearningDesignDTO(){ } @@ -147,6 +149,7 @@ this.activities = new ArrayList(); this.transitions = new ArrayList(); this.branchMappings = new ArrayList(); + this.competences = new ArrayList(); } public LearningDesignDTO(LearningDesign learningDesign, ActivityDAO activityDAO, GroupingDAO groupingDAO, String languageCode){ this.learningDesignID = learningDesign.getLearningDesignId(); @@ -206,6 +209,7 @@ this.groupings = populateGroupings(learningDesign,groupingDAO); this.activities = populateActivities(learningDesign, languageCode); this.transitions = populateTransitions(learningDesign); + this.competences = populateCompetences(learningDesign); } @@ -431,7 +435,7 @@ return new ArrayList(dtoSet); } -public ArrayList populateTransitions(LearningDesign design){ + public ArrayList populateTransitions(LearningDesign design){ ArrayList transitions = new ArrayList(); if(design.getTransitions()!=null){ Iterator iterator = design.getTransitions().iterator(); @@ -442,6 +446,22 @@ } return transitions; } + + public ArrayList populateCompetences(LearningDesign design){ + ArrayList competenceDTOs = new ArrayList(); + if(design.getCompetences()!=null){ + Iterator iterator = design.getCompetences().iterator(); + while(iterator.hasNext()){ + Competence competence = (Competence) iterator.next(); + CompetenceDTO competenceDTO = new CompetenceDTO(competence); + competenceDTOs.add(competenceDTO); + } + } + return competenceDTOs; + } + + + public ArrayList getTransitions(){ return this.transitions; } @@ -683,4 +703,13 @@ public void setBranchMappings(ArrayList branchMappings) { this.branchMappings = branchMappings; } + + public ArrayList getCompetences() { + return competences; + } + + public void setCompetences(ArrayList competences) { + this.competences = competences; + } + } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java =================================================================== diff -u -r870373d635bc769aee2dc271e6ff12818fcfcea6 -rfdbf7a3cfb10831b1ac581efa42807d3207a71ff --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java (.../LearningDesignService.java) (revision 870373d635bc769aee2dc271e6ff12818fcfcea6) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java (.../LearningDesignService.java) (revision fdbf7a3cfb10831b1ac581efa42807d3207a71ff) @@ -182,6 +182,7 @@ log.error("Learning Library with ID " + learningLibrary.getLearningLibraryId() + " does not have a template activity"); } // convert library to DTO format + LearningLibraryDTO libraryDTO = learningLibrary.getLearningLibraryDTO(templateActivities, languageCode); internationaliseActivities(libraryDTO.getTemplateActivities()); libraries.add(libraryDTO); Index: lams_common/src/java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java =================================================================== diff -u -rc209be8131f22f6fe37bd8d6c14b56425a78b766 -rfdbf7a3cfb10831b1ac581efa42807d3207a71ff --- lams_common/src/java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java (.../WDDXTAGS.java) (revision c209be8131f22f6fe37bd8d6c14b56425a78b766) +++ lams_common/src/java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java (.../WDDXTAGS.java) (revision fdbf7a3cfb10831b1ac581efa42807d3207a71ff) @@ -25,12 +25,14 @@ import java.util.Date; + + /** * @author Manpreet Minhas * The tags used in WDDX Packet */ public interface WDDXTAGS { - + /** The string value in a WDDX packet that indicates that this value is really null */ public static final String STRING_NULL_VALUE = "string_null_value"; /** The Boolean value in a WDDX packet that indicates that this value is really null. @@ -50,149 +52,154 @@ public static final Double NUMERIC_NULL_VALUE_DOUBLE = new Double(-111111); /** The Date value in a WDDX packet that indicates that this value is really null.*/ public static final Date DATE_NULL_VALUE = new Date(0); - + /* General Tags */ public static final String OBJECT_TYPE = "objectType"; //not used in 1.1 - + public static final String DESCRIPTION = "description"; public static final String TITLE = "title"; - public static final String HELP_TEXT = "helpText"; - public static final String XCOORD = "xCoord"; - public static final String YCOORD = "yCoord"; - public static final String GROUPINGS = "groupings"; - public static final String TRANSITIONS = "transitions"; - public static final String ACTIVITIES = "activities"; + public static final String HELP_TEXT ="helpText"; + public static final String XCOORD="xCoord"; + public static final String YCOORD="yCoord"; + public static final String GROUPINGS ="groupings"; + public static final String TRANSITIONS ="transitions"; + public static final String ACTIVITIES ="activities"; + public static final String COMPETENCES ="competences"; + public static final String COMPETENCE_MAPPINGS ="competenceMappings"; + public static final String COMPETENCE_MAPPING = "competenceMapping"; public static final String BRANCH_MAPPINGS = "branchMappings"; - + /*Learning Library specific tags */ - public static final String LEARNING_LIBRARY_ID = "learningLibraryID"; - public static final String LIB_ACTIVITIES = "templateActivities"; + public static final String LEARNING_LIBRARY_ID ="learningLibraryID"; + public static final String LIB_ACTIVITIES="templateActivities"; public static final String LIB_PACKAGE = "libraries"; - public static final String DESIGN_PACKAGE = "designs"; - + public static final String DESIGN_PACKAGE ="designs"; + /*Activity specific tags*/ - public static final String ACTIVITY_ID = "activityID"; - public static final String ACTIVITY_UIID = "activityUIID"; + public static final String ACTIVITY_ID ="activityID"; + public static final String ACTIVITY_UIID ="activityUIID"; public static final String ACTIVITY_TITLE = "activityTitle"; - - public static final String PARENT_ACTIVITY_ID = "parentActivityID"; - public static final String PARENT_UIID = "parentUIID"; - - public static final String ACTIVITY_TYPE_ID = "activityTypeID"; - public static final String ORDER_ID = "orderID"; - + + public static final String PARENT_ACTIVITY_ID ="parentActivityID"; + public static final String PARENT_UIID ="parentUIID"; + + public static final String ACTIVITY_TYPE_ID ="activityTypeID"; + public static final String ORDER_ID ="orderID"; + public static final String ACTIVITY_CATEGORY_ID = "activityCategoryID"; - - public static final String DEFINE_LATER = "defineLater"; - public static final String RUN_OFFLINE = "runOffline"; - public static final String OFFLINE_INSTRUCTIONS = "offlineInstructions"; + + public static final String DEFINE_LATER ="defineLater"; + public static final String RUN_OFFLINE ="runOffline"; + public static final String OFFLINE_INSTRUCTIONS ="offlineInstructions"; public static final String ONLINE_INSTRUCTIONS = "onlineInstructions"; - public static final String LIBRARY_IMAGE = "libraryActivityUIImage"; - public static final String LIBRARY_ACTIVITY = "libraryActivityID"; - + public static final String LIBRARY_IMAGE ="libraryActivityUIImage"; + public static final String LIBRARY_ACTIVITY ="libraryActivityID"; + public static final String APPLY_GROUPING = "applyGrouping"; public static final String GROUPING_SUPPORT_TYPE = "groupingSupportType"; public static final String STOP_AFTER_ACTIVITY = "stopAfterActivity"; public static final String INPUT_ACTIVITIES = "inputActivities"; // not used yet public static final String INPUT_TOOL_ACTIVITY_UIID = "toolActivityUIID"; - + /** OptionsActivity specific tags*/ - public static final String MAX_OPTIONS = "maxOptions"; - public static final String MIN_OPTIONS = "minOptions"; - public static final String OPTIONS_INSTRUCTIONS = "optionsInstructions"; - + public static final String MAX_OPTIONS="maxOptions"; + public static final String MIN_OPTIONS="minOptions"; + public static final String OPTIONS_INSTRUCTIONS ="optionsInstructions"; + /** ToolActivity specific tags*/ - public static final String TOOL_ID = "toolID"; - public static final String TOOL_CONTENT_ID = "toolContentID"; - public static final String TOOL_CONTENT_IDS = "toolContentIDs"; - - /** GateActivity specific tags*/ - public static final String GATE_ACTIVITY_LEVEL_ID = "gateActivityLevelID"; - public static final String GATE_START_DATE = "gateStartDateTime"; - public static final String GATE_END_DATE = "gateEndDateTime"; - public static final String GATE_START_OFFSET = "gateStartTimeOffset"; - public static final String GATE_END_OFFSET = "gateEndTimeOffset"; - public static final String GATE_OPEN = "gateOpen"; - + public static final String TOOL_ID="toolID"; + public static final String TOOL_CONTENT_ID="toolContentID"; + public static final String TOOL_CONTENT_IDS="toolContentIDs"; + + /** GateActivity specific tags*/ + public static final String GATE_ACTIVITY_LEVEL_ID ="gateActivityLevelID"; + public static final String GATE_START_DATE ="gateStartDateTime"; + public static final String GATE_END_DATE ="gateEndDateTime"; + public static final String GATE_START_OFFSET="gateStartTimeOffset"; + public static final String GATE_END_OFFSET="gateEndTimeOffset"; + public static final String GATE_OPEN ="gateOpen"; + /** Grouping Activity specific tags */ - public static final String CREATE_GROUPING_ID = "createGroupingID"; - public static final String CREATE_GROUPING_UIID = "createGroupingUIID"; - + public static final String CREATE_GROUPING_ID ="createGroupingID"; + public static final String CREATE_GROUPING_UIID ="createGroupingUIID"; + /** Grouping specific tags */ - public static final String GROUPING_ID = "groupingID"; - public static final String GROUPING_UIID = "groupingUIID"; - public static final String GROUPING_TYPE_ID = "groupingTypeID"; - public static final String LEARNERS_PER_GROUP = "learnersPerGroup"; - public static final String EQUAL_NUMBER_OF_LEARNERS_PER_GROUP = "equalNumberOfLearnersPerGroup"; - public static final String MAX_NUMBER_OF_GROUPS = "maxNumberOfGroups"; - public static final String NUMBER_OF_GROUPS = "numberOfGroups"; + public static final String GROUPING_ID ="groupingID"; + public static final String GROUPING_UIID ="groupingUIID"; + public static final String GROUPING_TYPE_ID ="groupingTypeID"; + public static final String LEARNERS_PER_GROUP ="learnersPerGroup"; + public static final String MAX_NUMBER_OF_GROUPS ="maxNumberOfGroups"; + public static final String NUMBER_OF_GROUPS ="numberOfGroups"; public static final String STAFF_GROUP_ID = "staffGroupID"; public static final String GROUPING_DTO = "groupingDTO"; public static final String GROUPS = "groups"; - + public static final String GROUP_ID = "groupID"; public static final String GROUP_NAME = "groupName"; public static final String GROUP_USER_LIST = "userList"; public static final String GROUP_UIID = "groupUIID"; /** Transition specific tags */ - public static final String TRANSITION_ID = "transitionID"; - public static final String TRANSITION_UIID = "transitionUIID"; - public static final String TRANSITION_TO = "to_activity_id"; - public static final String TRANSITION_FROM = "from_activity_id"; - public static final String TO_ACTIVITY_UIID = "toUIID"; - public static final String FROM_ACTIVITY_UIID = "fromUIID"; - + public static final String TRANSITION_ID ="transitionID"; + public static final String TRANSITION_UIID ="transitionUIID"; + public static final String TRANSITION_TO="to_activity_id"; + public static final String TRANSITION_FROM="from_activity_id"; + public static final String TO_ACTIVITY_UIID ="toUIID"; + public static final String FROM_ACTIVITY_UIID ="fromUIID"; + + /** Tool Specific tags */ - public static final String TOOL_DISPLAY_NAME = "displayName"; - public static final String TOOl_AUTH_URL = "toolAuthoringURL"; - public static final String AUTH_URL = "authoringURLS"; - + public static final String TOOL_DISPLAY_NAME ="displayName"; + public static final String TOOl_AUTH_URL ="toolAuthoringURL"; + public static final String AUTH_URL ="authoringURLS"; + + + /** LearningDesign specific tags*/ - public static final String LEARNING_DESIGN_ID = "learningDesignID"; - public static final String LEARNING_DESIGN_UIID = "learningDesignUIID"; - public static final String FIRST_ACTIVITY_ID = "firstActivityID"; - public static final String FIRST_ACTIVITY_UIID = "firstActivityUIID"; - - public static final String MAX_ID = "maxID"; - public static final String VALID_DESIGN = "validDesign"; - public static final String READ_ONLY = "readOnly"; - public static final String EDIT_OVERRIDE_LOCK = "editOverrideLock"; - public static final String DATE_READ_ONLY = "dateReadOnly"; - public static final String USER_ID = "userID"; - public static final String EDIT_OVERRIDE_USER_ID = "editOverrideUserID"; - - public static final String COPY_TYPE = "copyTypeID"; - public static final String CREATION_DATE = "createDateTime"; + public static final String LEARNING_DESIGN_ID="learningDesignID"; + public static final String LEARNING_DESIGN_UIID="learningDesignUIID"; + public static final String FIRST_ACTIVITY_ID ="firstActivityID"; + public static final String FIRST_ACTIVITY_UIID ="firstActivityUIID"; + + public static final String MAX_ID ="maxID"; + public static final String VALID_DESIGN ="validDesign"; + public static final String READ_ONLY ="readOnly"; + public static final String EDIT_OVERRIDE_LOCK ="editOverrideLock"; + public static final String DATE_READ_ONLY ="dateReadOnly"; + public static final String USER_ID="userID"; + public static final String EDIT_OVERRIDE_USER_ID="editOverrideUserID"; + + public static final String COPY_TYPE="copyTypeID"; + public static final String CREATION_DATE ="createDateTime"; public static final String LAST_MODIFIED_DATE = "lastModifiedDateTime"; - public static final String VERSION = "version"; - public static final String ORIGINAL_DESIGN_ID = "originalLearningDesignID"; - public static final String WORKSPACE_FOLDER_ID = "workspaceFolderID"; - public static final String DURATION = "duration"; - public static final String LICENCE_ID = "licenseID"; - public static final String LICENSE_TEXT = "licenseText"; + public static final String VERSION="version"; + public static final String ORIGINAL_DESIGN_ID ="originalLearningDesignID"; + public static final String WORKSPACE_FOLDER_ID= "workspaceFolderID"; + public static final String DURATION ="duration"; + public static final String LICENCE_ID ="licenseID"; + public static final String LICENSE_TEXT ="licenseText"; public static final String CONTENT_FOLDER_ID = "contentFolderID"; public static final String SAVE_MODE = "saveMode"; - + /**ComplexActivity specific tags */ - public static final String CHILD_ACTIVITIES = "childActivities"; - public static final String DEFAULT_ACTIVITY_UIID = "defaultActivityUIID"; - + public static final String CHILD_ACTIVITIES ="childActivities"; + public static final String DEFAULT_ACTIVITY_UIID ="defaultActivityUIID"; + /** Crash Dump Specific Tags */ - public static final String CRASH_DUMP_BATCH = "crashDataBatch"; - + public static final String CRASH_DUMP_BATCH="crashDataBatch"; + /** Notebook Specific Tags */ public static final String EXTERNAL_ID = "externalID"; public static final String EXTERNAL_ID_TYPE = "externalIDType"; public static final String EXTERNAL_SIG = "externalSignature"; public static final String ENTRY = "entry"; - + /** Branching Activity Specific Tags */ - public static final String START_XCOORD = "startXCoord"; - public static final String START_YCOORD = "startYCoord"; - public static final String END_XCOORD = "endXCoord"; - public static final String END_YCOORD = "endYCoord"; - + public static final String START_XCOORD="startXCoord"; + public static final String START_YCOORD="startYCoord"; + public static final String END_XCOORD="endXCoord"; + public static final String END_YCOORD="endYCoord"; + /** Branch Mapping and Tool Condition Tags */ public static final String BRANCH_ACTIVITY_ENTRY_ID = "entryID"; public static final String BRANCH_ACTIVITY_ENTRY_UIID = "entryUIID"; @@ -201,7 +208,7 @@ public static final String BRANCH_CONDITION = "condition"; // reuse GROUP_UIID for the Group field public static final String CONDITION_ID = "conditionID"; - public static final String CONDITION_UIID = "conditionUIID"; + public static final String CONDITION_UIID = "conditionUIID"; // reuse ORDER_ID for the OrderId field public static final String CONDITION_NAME = "name"; public static final String CONDITION_DISPLAY_NAME = "displayName"; @@ -211,10 +218,10 @@ public static final String CONDITION_EXACT_MATCH_VALUE = "exactMatchValue"; /** LD Import specific tags */ - public static final String LEARNING_DESIGN_TO_IMPORT_ID = "learningDesignIDToImport"; - public static final String CREATE_NEW_LEARNING_DESIGN = "createNewLearningDesign"; - + public static final String LEARNING_DESIGN_TO_IMPORT_ID="learningDesignIDToImport"; + public static final String CREATE_NEW_LEARNING_DESIGN="createNewLearningDesign"; + /** Tool adapters specific tags*/ - public static final String CUSTOM_CSV = "customCSV"; - + public static final String CUSTOM_CSV="customCSV"; + }