Index: lams_build/lib/lams/lams.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v diff -u -r1.420.2.104 -r1.420.2.105 Binary files differ Index: lams_central/web/includes/javascript/authoring/authoringProperty.js =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/authoring/authoringProperty.js,v diff -u -r1.25.2.13 -r1.25.2.14 --- lams_central/web/includes/javascript/authoring/authoringProperty.js 17 Nov 2016 04:15:37 -0000 1.25.2.13 +++ lams_central/web/includes/javascript/authoring/authoringProperty.js 13 Dec 2016 14:34:00 -0000 1.25.2.14 @@ -954,8 +954,8 @@ $('#outputConditionsRefreshButton', outputConditionsDialogContents).click(function(){ // get output definitions again - $(this).data('refreshDefinitions')(); - $(this).data('buildContent')(true); + $(layout.outputConditionsDialog).data('refreshDefinitions')(); + $(layout.outputConditionsDialog).data('buildContent')(true); }); $('#outputConditionsCancelButton', outputConditionsDialogContents).click(function(){ @@ -1112,9 +1112,9 @@ activity.conditionsToBranches = []; } - if (output.defaultConditions) { + if (output.conditions) { // build list using conditions from Tool activity output definitions - $.each(output.defaultConditions, function(){ + $.each(output.conditions, function(){ entries.push({ 'condition' : { 'name' : this.name, Index: lams_common/src/java/org/lamsfoundation/lams/tool/OutputFactory.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/OutputFactory.java,v diff -u -r1.10.4.4 -r1.10.4.5 --- lams_common/src/java/org/lamsfoundation/lams/tool/OutputFactory.java 19 Sep 2016 09:38:20 -0000 1.10.4.4 +++ lams_common/src/java/org/lamsfoundation/lams/tool/OutputFactory.java 13 Dec 2016 14:33:57 -0000 1.10.4.5 @@ -286,16 +286,16 @@ ToolOutputDefinition definition = buildDefinition(definitionName, OutputType.OUTPUT_BOOLEAN, null, null, null, Boolean.FALSE, Boolean.class); - List defaultConditions = new ArrayList(); - defaultConditions.add(new BranchCondition(null, null, new Integer(1), definitionName, + List conditions = new ArrayList(); + conditions.add(new BranchCondition(null, null, new Integer(1), definitionName, getI18NText(definitionName + ".true", true), OutputType.OUTPUT_BOOLEAN.toString(), null, null, Boolean.TRUE.toString())); - defaultConditions.add(new BranchCondition(null, null, new Integer(2), definitionName, + conditions.add(new BranchCondition(null, null, new Integer(2), definitionName, getI18NText(definitionName + ".false", true), OutputType.OUTPUT_BOOLEAN.toString(), null, null, Boolean.FALSE.toString())); - definition.setDefaultConditions(defaultConditions); + definition.setConditions(conditions); return definition; } @@ -310,7 +310,7 @@ ToolOutputDefinition definition = buildDefinition(definitionName, OutputType.OUTPUT_SET_BOOLEAN, null, null, null, Boolean.TRUE, (new HashSet()).getClass()); List defaultConditions = new ArrayList(); - definition.setDefaultConditions(defaultConditions); + definition.setConditions(defaultConditions); return definition; } Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolOutputDefinition.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/ToolOutputDefinition.java,v diff -u -r1.7.4.3 -r1.7.4.4 --- lams_common/src/java/org/lamsfoundation/lams/tool/ToolOutputDefinition.java 11 May 2016 07:07:20 -0000 1.7.4.3 +++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolOutputDefinition.java 13 Dec 2016 14:33:57 -0000 1.7.4.4 @@ -20,7 +20,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool; import java.util.List; @@ -45,7 +44,7 @@ * Sample ToolOutputDefinition: ToolOutputDefinition { name = "LEARNERS_MARK", description = "Mark for an individual * learner"; type = "NUMERIC"; startValue = "0.0"; endValue = "10.0"; complexDefinition = null; } */ -public class ToolOutputDefinition implements Comparable { +public class ToolOutputDefinition implements Comparable { /* * Definition Type indicates what kind of definitions should be provided. Some outputs are not valid for conditions, * some are not valid for data flow between tools. @@ -62,7 +61,7 @@ private Object complexDefinition; private Boolean showConditionNameOnly; private Boolean isDefaultGradebookMark; - private List defaultConditions; + private List conditions; // we need it to filter definitions which other tools can not process; it must be set in the definition, otherwise // unsupported values can be passed to the receiving end of the data flow; most methods for creating Output // Definitions set the class already, but it must be set manually for complex definitions @@ -161,24 +160,16 @@ } @Override - public int compareTo(Object o) { - - ToolOutputDefinition myClass = (ToolOutputDefinition) o; - return new CompareToBuilder().append(name, myClass.name).append(type, myClass.type).toComparison(); + public int compareTo(ToolOutputDefinition o) { + return new CompareToBuilder().append(name, o.name).append(type, o.type).toComparison(); } - /** - * Default Conditions are sample conditions that should be presented to the user as a starting point for using this - * OutputDefinition - * - * @return - */ - public List getDefaultConditions() { - return defaultConditions; + public List getConditions() { + return conditions; } - public void setDefaultConditions(List defaultConditions) { - this.defaultConditions = defaultConditions; + public void setConditions(List conditions) { + this.conditions = conditions; } /** Index: lams_common/src/java/org/lamsfoundation/lams/tool/dto/ToolOutputDefinitionDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/dto/ToolOutputDefinitionDTO.java,v diff -u -r1.7.4.3 -r1.7.4.4 --- lams_common/src/java/org/lamsfoundation/lams/tool/dto/ToolOutputDefinitionDTO.java 11 May 2016 07:07:29 -0000 1.7.4.3 +++ lams_common/src/java/org/lamsfoundation/lams/tool/dto/ToolOutputDefinitionDTO.java 13 Dec 2016 14:33:57 -0000 1.7.4.4 @@ -48,7 +48,7 @@ private String complexDefinition; private Boolean showConditionNameOnly; private Boolean isDefaultGradebookMark; - private ArrayList defaultConditions; + private ArrayList conditions; public ToolOutputDefinitionDTO(String name, String description, String type, String startValue, String endValue, String complexDefinition, Boolean showConditionNameOnly) { @@ -78,10 +78,10 @@ ? definition.getComplexDefinition().toString() : null; this.showConditionNameOnly = definition.isShowConditionNameOnly(); - if (definition.getDefaultConditions() != null && definition.getDefaultConditions().size() > 0) { - defaultConditions = new ArrayList(); - for (BranchCondition condition : definition.getDefaultConditions()) { - defaultConditions.add(condition.getBranchConditionDTO(null)); + if (definition.getConditions() != null && definition.getConditions().size() > 0) { + conditions = new ArrayList(); + for (BranchCondition condition : definition.getConditions()) { + conditions.add(condition.getBranchConditionDTO(null)); } } @@ -143,12 +143,12 @@ return complexDefinition; } - public ArrayList getDefaultConditions() { - return defaultConditions; + public ArrayList getConditions() { + return conditions; } - public void setDefaultConditions(ArrayList defaultConditions) { - this.defaultConditions = defaultConditions; + public void setConditions(ArrayList conditions) { + this.conditions = conditions; } public Boolean getShowConditionNameOnly() { Index: lams_tool_chat/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/conf/language/lams/ApplicationResources.properties,v diff -u -r1.30.2.7 -r1.30.2.8 --- lams_tool_chat/conf/language/lams/ApplicationResources.properties 3 Dec 2016 23:20:52 -0000 1.30.2.7 +++ lams_tool_chat/conf/language/lams/ApplicationResources.properties 13 Dec 2016 14:33:59 -0000 1.30.2.8 @@ -96,8 +96,7 @@ error.condition.name.blank =Condition name can not be blank. error.condition.duplicated.name =Duplicated name. Please choose unique one. error.condition =Error creating condition. -output.desc.text.search.output.definition.chat =Messages contain certain words -text.search.output.definition.chat.default.condition =Messages contain word "LAMS" +output.desc.user.messages.output.definition.chat =Messages contain certain words textsearch.heading =Messages that... textsearch.all.words =have all these words: textsearch.phrase =have this exact wording or phrase: Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatOutputFactory.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatOutputFactory.java,v diff -u -r1.6.2.5 -r1.6.2.6 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatOutputFactory.java 30 Sep 2016 05:13:56 -0000 1.6.2.5 +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatOutputFactory.java 13 Dec 2016 14:33:59 -0000 1.6.2.6 @@ -61,7 +61,7 @@ ChatConstants.USER_MESSAGES_DEFINITION_NAME, stringArrayClass); Chat chat = (Chat) toolContentObject; // adding all existing conditions - chatMessagesDefinition.setDefaultConditions(new ArrayList(chat.getConditions())); + chatMessagesDefinition.setConditions(new ArrayList(chat.getConditions())); definitionMap.put(ChatConstants.USER_MESSAGES_DEFINITION_NAME, chatMessagesDefinition); } ToolOutputDefinition numberOfPostsDefinition = buildRangeDefinition( @@ -186,20 +186,4 @@ protected String buildUserMessagesConditionName(String uniquePart) { return super.buildConditionName(ChatConstants.USER_MESSAGES_DEFINITION_NAME, uniquePart); } - - /** - * Creates a default condition so teachers know how to use complex conditions for this tool. - * - * @param chat - * content of the tool - * @return default chat condition - */ - protected ChatCondition createDefaultUserMessagesCondition(Chat chat) { - String name = buildConditionName(ChatConstants.USER_MESSAGES_DEFINITION_NAME, - chat.getToolContentId().toString()); - // Default condition checks if messages contain word "LAMS" - return new ChatCondition(null, null, 1, name, - getI18NText(ChatConstants.USER_MESSAGES_DEFAULT_CONDITION_DISPLAY_NAME_KEY, false), "LAMS", null, null, - null); - } } \ No newline at end of file Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java,v diff -u -r1.63.2.11 -r1.63.2.12 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java 30 Sep 2016 05:12:49 -0000 1.63.2.11 +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java 13 Dec 2016 14:33:59 -0000 1.63.2.12 @@ -431,10 +431,6 @@ ChatService.logger.error(error); throw new ChatException(error); } - if (defaultContent.getConditions().isEmpty()) { - defaultContent.getConditions() - .add(getChatOutputFactory().createDefaultUserMessagesCondition(defaultContent)); - } return defaultContent; } Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/util/ChatConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/util/ChatConstants.java,v diff -u -r1.18.2.4 -r1.18.2.5 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/util/ChatConstants.java 30 Sep 2016 05:14:32 -0000 1.18.2.4 +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/util/ChatConstants.java 13 Dec 2016 14:33:59 -0000 1.18.2.5 @@ -54,7 +54,6 @@ public static final String PARAM_ORDER_ID = "orderId"; public static final String ATTR_DELETED_CONDITION_LIST = "deletedConditionList"; public static final String USER_MESSAGES_DEFINITION_NAME = "user.messages.output.definition.chat"; - public static final String USER_MESSAGES_DEFAULT_CONDITION_DISPLAY_NAME_KEY = "user.messages.output.definition.chat.default.condition"; public static final String ALL_USERS_MESSAGES_DEFINITION_NAME = "all.users.messages.output.definition.chat"; public final static String LEARNER_NUM_POSTS_DEFINITION_NAME = "learner.number.of.posts"; public static final String TEXT_SEARCH_DEFINITION_NAME = "text.search.output.definition.chat"; Index: lams_tool_forum/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/conf/language/lams/ApplicationResources.properties,v diff -u -r1.55.2.17 -r1.55.2.18 --- lams_tool_forum/conf/language/lams/ApplicationResources.properties 27 Nov 2016 12:04:56 -0000 1.55.2.17 +++ lams_tool_forum/conf/language/lams/ApplicationResources.properties 13 Dec 2016 14:33:25 -0000 1.55.2.18 @@ -178,7 +178,6 @@ error.condition.no.questions.selected =There are no questions selected. Please select at least one. error.condition =Error creating condition. output.desc.topic.name.to.answers.output.definition.forum =Posts contain certain words -topic.name.to.answers.output.definition.forum.default.condition =Posts to the first topic contain word "LAMS" textsearch.heading =Posts that... textsearch.all.words =have all these words: textsearch.phrase =have this exact wording or phrase: Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java,v diff -u -r1.11.2.5 -r1.11.2.6 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java 19 Sep 2016 09:38:18 -0000 1.11.2.5 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java 13 Dec 2016 14:33:25 -0000 1.11.2.6 @@ -22,18 +22,15 @@ package org.lamsfoundation.lams.tool.forum.service; -import java.util.ArrayList; import java.util.Date; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; import java.util.TreeSet; -import org.lamsfoundation.lams.learningdesign.BranchCondition; import org.lamsfoundation.lams.tool.OutputFactory; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; @@ -213,33 +210,4 @@ protected String buildTopicDatesToAnswersConditionName(String uniquePart) { return super.buildConditionName(ForumConstants.TOPIC_DATE_TO_ANSWERS_DEFINITION_NAME, uniquePart); } - - /** - * Creates a default condition so teachers know how to use complex conditions for this tool. - * - * @param forum - * content of the tool - * @return default Forum condition - */ - protected ForumCondition createDefaultTopicDateToAnswersCondition(Forum forum) { - - Set messages = new HashSet(); - for (Message message : forum.getMessages()) { - if (message.getIsAuthored() && message.getToolSession() == null) { - messages.add(message); - break; - } - } - - if (messages.isEmpty()) { - return null; - } - - String name = buildConditionName(ForumConstants.TOPIC_DATE_TO_ANSWERS_DEFINITION_NAME, - forum.getContentId().toString()); - // Default condition checks if the answers for the first topic contain word "LAMS" - return new ForumCondition(null, null, 1, name, - getI18NText(ForumConstants.TOPIC_DATE_TO_ANSWERS_DEFAULT_CONDITION_DISPLAY_NAME_KEY, false), "LAMS", - null, null, null, messages); - } -} +} \ No newline at end of file Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java,v diff -u -r1.126.2.21 -r1.126.2.22 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 15 Jun 2016 08:07:20 -0000 1.126.2.21 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 13 Dec 2016 14:33:25 -0000 1.126.2.22 @@ -1185,13 +1185,6 @@ } Forum defaultContent = getDefaultForum(); - if (defaultContent.getConditions().isEmpty()) { - ForumCondition defaultCondition = getForumOutputFactory() - .createDefaultTopicDateToAnswersCondition(defaultContent); - if (defaultCondition != null) { - defaultContent.getConditions().add(defaultCondition); - } - } // get default content by given ID. Forum content = Forum.newInstance(defaultContent, contentID); Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java,v diff -u -r1.61.2.7 -r1.61.2.8 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java 11 May 2016 07:14:58 -0000 1.61.2.7 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java 13 Dec 2016 14:33:25 -0000 1.61.2.8 @@ -192,7 +192,6 @@ public static final String ALL_USERS_ANSWERS_DEFINITION_NAME = "all.users.answers.definition.forum"; public final static String LEARNER_NUM_POSTS_DEFINITION_NAME = "learner.number.of.posts"; - public static final String TOPIC_DATE_TO_ANSWERS_DEFAULT_CONDITION_DISPLAY_NAME_KEY = "topic.name.to.answers.output.definition.forum.default.condition"; public static final String ANSWERS_SEPARATOR = "

"; // a forward key public static final String SUCCESS = "success"; Index: lams_tool_laqa/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/language/lams/ApplicationResources.properties,v diff -u -r1.42.2.11 -r1.42.2.12 --- lams_tool_laqa/conf/language/lams/ApplicationResources.properties 4 Dec 2016 11:05:45 -0000 1.42.2.11 +++ lams_tool_laqa/conf/language/lams/ApplicationResources.properties 13 Dec 2016 14:33:23 -0000 1.42.2.12 @@ -147,7 +147,6 @@ error.condition.no.questions.selected =There are no questions selected. Please select at least one. error.condition =Error creating condition. output.desc.user.answers.output.definition.qa =Answers contain certain words -user.answers.output.definition.qa.default.condition =First answer contains word "LAMS" textsearch.heading =Answers that... textsearch.all.words =have all these words: textsearch.phrase =have this exact wording or phrase: Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java,v diff -u -r1.95.2.10 -r1.95.2.11 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java 13 Dec 2016 05:55:03 -0000 1.95.2.10 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java 13 Dec 2016 14:33:23 -0000 1.95.2.11 @@ -233,7 +233,6 @@ public static final String ATTR_DELETED_CONDITION_LIST = "deletedConditionList"; public static final int QUESTION_CUTOFF_INDEX = 40; public static final String USER_ANSWERS_DEFINITION_NAME = "user.answers.output.definition.qa"; - public static final String USER_ANSWERS_DEFAULT_CONDITION_DISPLAY_NAME_KEY = "user.answers.output.definition.qa.default.condition"; public static final String GROUP_ANSWERS_DEFINITION_NAME = "group.answers.output.definition.qa"; public static final String QUESTIONS_DEFINITION_NAME = "questions.output.definition.qa"; public static final String ATTR_WIZARD_CATEGORIES = "wizardCategories"; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java,v diff -u -r1.66.2.12 -r1.66.2.13 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java 11 Oct 2016 05:20:42 -0000 1.66.2.12 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java 13 Dec 2016 14:33:23 -0000 1.66.2.13 @@ -162,7 +162,7 @@ void createQaContent(QaContent qa); void updateResponseVisibility(Long responseUid, boolean visible); - + boolean isRatingsEnabled(QaContent qaContent); QaQueUsr getUserByIdAndSession(final Long queUsrId, final Long qaSessionId); @@ -243,8 +243,6 @@ void deleteCondition(QaCondition condition); - QaCondition createDefaultComplexCondition(QaContent qaContent); - /** * Gets the qa config item with the given key * Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java,v diff -u -r1.16.2.4 -r1.16.2.5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java 19 Sep 2016 09:38:21 -0000 1.16.2.4 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java 13 Dec 2016 14:33:23 -0000 1.16.2.5 @@ -246,25 +246,4 @@ protected String buildUserAnswersConditionName(String uniquePart) { return super.buildConditionName(QaAppConstants.USER_ANSWERS_DEFINITION_NAME, uniquePart); } - - /** - * Creates a default condition so teachers know how to use complex conditions for this tool. - * - * @param qaContent - * content of the tool - * @return default Q&A condition - */ - protected QaCondition createDefaultComplexUserAnswersCondition(QaContent qaContent) { - if (qaContent.getQaQueContents().isEmpty()) { - return null; - } - Set questions = new HashSet(); - questions.add(qaContent.getQaQueContents().iterator().next()); - String name = buildConditionName(QaAppConstants.USER_ANSWERS_DEFINITION_NAME, - qaContent.getQaContentId().toString()); - // Default condition checks if the first answer contains word "LAMS" - return new QaCondition(null, null, 1, name, - getI18NText(QaAppConstants.USER_ANSWERS_DEFAULT_CONDITION_DISPLAY_NAME_KEY, false), "LAMS", null, null, - null, questions); - } } \ No newline at end of file Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java,v diff -u -r1.111.2.28 -r1.111.2.29 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 11 Oct 2016 05:20:42 -0000 1.111.2.28 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 13 Dec 2016 14:33:23 -0000 1.111.2.29 @@ -529,9 +529,6 @@ fromContent = qaDAO.getQaByContentId(fromContentId.longValue()); } - if (fromContentId.equals(defaultContentId) && (fromContent != null) && fromContent.getConditions().isEmpty()) { - fromContent.getConditions().add(getQaOutputFactory().createDefaultComplexUserAnswersCondition(fromContent)); - } QaContent toContent = QaContent.newInstance(fromContent, toContentId); if (toContent == null) { QaServicePOJO.logger.error("throwing ToolException: WARNING!, retrieved toContent is null."); @@ -647,10 +644,6 @@ if (toolContentObj == null) { long defaultToolContentId = toolService.getToolDefaultContentIdBySignature(QaAppConstants.MY_SIGNATURE); toolContentObj = getQaContent(defaultToolContentId); - if ((toolContentObj != null) && toolContentObj.getConditions().isEmpty()) { - toolContentObj.getConditions() - .add(getQaOutputFactory().createDefaultComplexUserAnswersCondition(toolContentObj)); - } } if (toolContentObj == null) { throw new DataMissingException("Unable to find default content for the question and answer tool"); @@ -720,9 +713,6 @@ if (qaContent == null) { long defaultToolContentId = toolService.getToolDefaultContentIdBySignature(QaAppConstants.MY_SIGNATURE); qaContent = getQaContent(defaultToolContentId); - if ((qaContent != null) && qaContent.getConditions().isEmpty()) { - qaContent.getConditions().add(getQaOutputFactory().createDefaultComplexUserAnswersCondition(qaContent)); - } } return getQaOutputFactory().getToolOutputDefinitions(qaContent, definitionType); } @@ -1141,11 +1131,6 @@ } @Override - public QaCondition createDefaultComplexCondition(QaContent qaContent) { - return getQaOutputFactory().createDefaultComplexUserAnswersCondition(qaContent); - } - - @Override public QaConfigItem getConfigItem(String configKey) { return qaConfigItemDAO.getConfigItemByKey(configKey); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java,v diff -u -r1.83.2.6 -r1.83.2.7 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java 13 Oct 2016 14:00:23 -0000 1.83.2.6 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java 13 Dec 2016 14:33:23 -0000 1.83.2.7 @@ -114,10 +114,6 @@ long defaultContentID = qaService.getToolDefaultContentIdBySignature(QaAppConstants.MY_SIGNATURE); qaContent = qaService.getQaContent(defaultContentID); qaContent = QaContent.newInstance(qaContent, new Long(strToolContentID)); - - if (qaContent.getConditions().isEmpty()) { - qaContent.getConditions().add(qaService.createDefaultComplexCondition(qaContent)); - } } prepareDTOandForm(request, qaAuthoringForm, qaContent, qaService, sessionMap); Index: lams_tool_notebook/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/conf/language/lams/ApplicationResources.properties,v diff -u -r1.29.2.11 -r1.29.2.12 --- lams_tool_notebook/conf/language/lams/ApplicationResources.properties 3 Dec 2016 23:34:49 -0000 1.29.2.11 +++ lams_tool_notebook/conf/language/lams/ApplicationResources.properties 13 Dec 2016 14:33:30 -0000 1.29.2.12 @@ -89,7 +89,6 @@ error.condition.duplicated.name =Duplicated name. Please choose unique one. error.condition =Error creating condition. output.desc.text.search.output.definition.notebook =Entry contains certain words -text.search.output.definition.notebook.default.condition =Entry contains word "LAMS" textsearch.heading =Entry that... textsearch.all.words =has all these words: textsearch.phrase =has this exact wording or phrase: Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookOutputFactory.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookOutputFactory.java,v diff -u -r1.6.2.4 -r1.6.2.5 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookOutputFactory.java 30 May 2016 07:32:28 -0000 1.6.2.4 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookOutputFactory.java 13 Dec 2016 14:33:30 -0000 1.6.2.5 @@ -63,7 +63,7 @@ Notebook notebook = (Notebook) toolContentObject; // adding all existing conditions notebookEntryDefinition - .setDefaultConditions(new ArrayList(notebook.getConditions())); + .setConditions(new ArrayList(notebook.getConditions())); notebookEntryDefinition.setShowConditionNameOnly(true); definitionMap.put(NotebookConstants.USER_ENTRY_DEFINITION_NAME, notebookEntryDefinition); } @@ -164,20 +164,4 @@ protected String buildUserEntryConditionName(String uniquePart) { return super.buildConditionName(NotebookConstants.USER_ENTRY_DEFINITION_NAME, uniquePart); } - - /** - * Creates a default condition so teachers know how to use complex conditions for this tool. - * - * @param notebook - * content of the tool - * @return default notebook condition - */ - protected NotebookCondition createDefaultUserEntryCondition(Notebook notebook) { - String name = buildConditionName(NotebookConstants.USER_ENTRY_DEFINITION_NAME, - notebook.getToolContentId().toString()); - // Default condition checks if the text contains word "LAMS" - return new NotebookCondition(null, null, 1, name, - getI18NText(NotebookConstants.USER_ENTRY_DEFAULT_CONDITION_DISPLAY_NAME_KEY, false), "LAMS", null, null, - null); - } } \ No newline at end of file Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java,v diff -u -r1.31.2.12 -r1.31.2.13 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java 15 Jun 2016 08:06:36 -0000 1.31.2.12 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java 13 Dec 2016 14:33:30 -0000 1.31.2.13 @@ -393,10 +393,6 @@ NotebookService.logger.error(error); throw new NotebookException(error); } - if (defaultContent.getConditions().isEmpty()) { - defaultContent.getConditions() - .add(getNotebookOutputFactory().createDefaultUserEntryCondition(defaultContent)); - } return defaultContent; } Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConstants.java,v diff -u -r1.9.2.4 -r1.9.2.5 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConstants.java 26 Jul 2016 01:29:59 -0000 1.9.2.4 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConstants.java 13 Dec 2016 14:33:30 -0000 1.9.2.5 @@ -54,7 +54,6 @@ public static final String PARAM_USER_UID = "userUid"; public static final String ATTR_DELETED_CONDITION_LIST = "deletedConditionList"; public static final String USER_ENTRY_DEFINITION_NAME = "user.entry.output.definition.notebook"; - public static final String USER_ENTRY_DEFAULT_CONDITION_DISPLAY_NAME_KEY = "user.entry.output.definition.notebook.default.condition"; public static final String ALL_USERS_ENTRIES_DEFINITION_NAME = "all.users.entries.definition.notebook"; public static final String SUCCESS = "success"; public static final String ERROR_MSG_CONDITION = "error.condition"; Index: lams_tool_survey/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/conf/language/lams/ApplicationResources.properties,v diff -u -r1.30.2.8 -r1.30.2.9 --- lams_tool_survey/conf/language/lams/ApplicationResources.properties 3 Dec 2016 23:43:29 -0000 1.30.2.8 +++ lams_tool_survey/conf/language/lams/ApplicationResources.properties 13 Dec 2016 14:33:32 -0000 1.30.2.9 @@ -153,7 +153,6 @@ error.condition.no.questions.selected =There are no questions selected. Please select at least one. error.condition =Error creating condition. output.desc.text.search.output.definition.survey =Answers contain certain words -text.search.output.definition.survey.default.condition =First answer contains word "LAMS" textsearch.heading =Answers that... textsearch.all.words =have all these words: textsearch.phrase =have this exact wording or phrase: Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java,v diff -u -r1.20.2.4 -r1.20.2.5 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java 11 May 2016 07:37:32 -0000 1.20.2.4 +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java 13 Dec 2016 14:33:32 -0000 1.20.2.5 @@ -198,5 +198,4 @@ public static final String ATTR_DELETED_CONDITION_LIST = "deletedConditionList"; public static final String TEXT_SEARCH_DEFINITION_NAME = "text.search.output.definition.survey"; - public static final String TEXT_SEARCH_DEFAULT_CONDITION_DISPLAY_NAME_KEY = "text.search.output.definition.survey.default.condition"; } \ No newline at end of file Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyOutputFactory.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyOutputFactory.java,v diff -u -r1.10.2.5 -r1.10.2.6 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyOutputFactory.java 19 Sep 2016 09:38:19 -0000 1.10.2.5 +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyOutputFactory.java 13 Dec 2016 14:33:32 -0000 1.10.2.6 @@ -68,7 +68,7 @@ Survey survey = (Survey) toolContentObject; // adding all existing conditions - allAnswersDefinition.setDefaultConditions(new ArrayList(survey.getConditions())); + allAnswersDefinition.setConditions(new ArrayList(survey.getConditions())); definitionMap.put(SurveyConstants.TEXT_SEARCH_DEFINITION_NAME, allAnswersDefinition); } @@ -167,29 +167,4 @@ private boolean isTextSearchConditionName(String name) { return name != null && name.startsWith(SurveyConstants.TEXT_SEARCH_DEFINITION_NAME); } - - /** - * Creates a default condition so teachers know how to use complex conditions for this tool. - * - * @param survey - * content of the tool - * @return default survey condition - */ - protected SurveyCondition createDefaultComplexCondition(Survey survey) { - Set questions = new HashSet(); - for (SurveyQuestion question : survey.getQuestions()) { - if (question.getType() == SurveyConstants.SURVEY_TYPE_TEXT_ENTRY) { - questions.add(question); - break; - } - } - if (questions.isEmpty()) { - return null; - } - String name = buildConditionName(SurveyConstants.TEXT_SEARCH_DEFINITION_NAME, survey.getContentId().toString()); - // Default condition checks if the first answer contains word "LAMS" - return new SurveyCondition(null, null, 1, name, - getI18NText(SurveyConstants.TEXT_SEARCH_DEFAULT_CONDITION_DISPLAY_NAME_KEY, false), "LAMS", null, null, - null, questions); - } } \ No newline at end of file Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java,v diff -u -r1.37.2.13 -r1.37.2.14 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java 15 Jun 2016 08:06:20 -0000 1.37.2.13 +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java 13 Dec 2016 14:33:32 -0000 1.37.2.14 @@ -144,9 +144,6 @@ } Survey defaultContent = getDefaultSurvey(); - if (defaultContent.getConditions().isEmpty()) { - defaultContent.getConditions().add(getSurveyOutputFactory().createDefaultComplexCondition(defaultContent)); - } // save default content by given ID. Survey content = new Survey(); content = Survey.newInstance(defaultContent, contentId); Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListOutputFactory.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListOutputFactory.java,v diff -u -r1.4.2.3 -r1.4.2.4 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListOutputFactory.java 19 Sep 2016 09:38:16 -0000 1.4.2.3 +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListOutputFactory.java 13 Dec 2016 14:33:29 -0000 1.4.2.4 @@ -70,18 +70,18 @@ TaskList taskList = (TaskList) toolContentObject; ToolOutputDefinition definition = buildBooleanSetOutputDefinition(OUTPUT_NAME_TOOL_CONDITION); - if (definition.getDefaultConditions() == null) { - definition.setDefaultConditions(new ArrayList()); + if (definition.getConditions() == null) { + definition.setConditions(new ArrayList()); } - List defaultConditions = definition.getDefaultConditions(); + List conditions = definition.getConditions(); String trueString = Boolean.TRUE.toString(); Iterator iter2 = taskList.getConditions().iterator(); while (iter2.hasNext()) { TaskListCondition condition = iter2.next(); String name = buildConditionName(OUTPUT_NAME_TOOL_CONDITION, condition.getName()); - defaultConditions.add(new BranchCondition(null, null, condition.getSequenceId(), name, + conditions.add(new BranchCondition(null, null, condition.getSequenceId(), name, condition.getName(), OutputType.OUTPUT_BOOLEAN.toString(), null, null, trueString)); } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteOutputFactory.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteOutputFactory.java,v diff -u -r1.12.2.4 -r1.12.2.5 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteOutputFactory.java 5 Oct 2016 07:28:29 -0000 1.12.2.4 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteOutputFactory.java 13 Dec 2016 14:33:26 -0000 1.12.2.5 @@ -73,16 +73,16 @@ ToolOutputDefinition definition = buildBooleanSetOutputDefinition( VoteOutputFactory.OUTPUT_NAME_NOMINATION_SELECTION); - if (definition.getDefaultConditions() == null) { - definition.setDefaultConditions(new ArrayList()); + if (definition.getConditions() == null) { + definition.setConditions(new ArrayList()); } - List defaultConditions = definition.getDefaultConditions(); + List conditions = definition.getConditions(); String trueString = Boolean.TRUE.toString(); int conditionOrderId = 1; if (content.isAllowText()) { - defaultConditions.add(new BranchCondition(null, null, new Integer(conditionOrderId++), + conditions.add(new BranchCondition(null, null, new Integer(conditionOrderId++), buildConditionName(VoteOutputFactory.OUTPUT_NAME_NOMINATION_SELECTION, VoteOutputFactory.FREE_TEXT_NOM_SELECTION_STR), getI18NText("label.open.vote", false), OutputType.OUTPUT_BOOLEAN.toString(), null, null, @@ -95,7 +95,7 @@ int displayOrder = nomination.getDisplayOrder(); String name = buildConditionName(VoteOutputFactory.OUTPUT_NAME_NOMINATION_SELECTION, new Integer(displayOrder).toString()); - defaultConditions.add(new BranchCondition(null, null, new Integer(conditionOrderId++), name, + conditions.add(new BranchCondition(null, null, new Integer(conditionOrderId++), name, VoteUtils.stripHTML(nomination.getQuestion()), OutputType.OUTPUT_BOOLEAN.toString(), null, null, trueString)); }