Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -r2f02ea654f2380229d55ffd2483ba21ac48856d8 -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e Binary files differ Index: lams_central/web/includes/javascript/authoring/authoringProperty.js =================================================================== diff -u -r630da8c73ca578964a31b9966307a522a0564be7 -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e --- lams_central/web/includes/javascript/authoring/authoringProperty.js (.../authoringProperty.js) (revision 630da8c73ca578964a31b9966307a522a0564be7) +++ lams_central/web/includes/javascript/authoring/authoringProperty.js (.../authoringProperty.js) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) @@ -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 =================================================================== diff -u -rbcd7980b62ca16ad230dee6712f7112bf9021c70 -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e --- lams_common/src/java/org/lamsfoundation/lams/tool/OutputFactory.java (.../OutputFactory.java) (revision bcd7980b62ca16ad230dee6712f7112bf9021c70) +++ lams_common/src/java/org/lamsfoundation/lams/tool/OutputFactory.java (.../OutputFactory.java) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) @@ -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 =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e --- lams_common/src/java/org/lamsfoundation/lams/tool/ToolOutputDefinition.java (.../ToolOutputDefinition.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolOutputDefinition.java (.../ToolOutputDefinition.java) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) @@ -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 =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e --- lams_common/src/java/org/lamsfoundation/lams/tool/dto/ToolOutputDefinitionDTO.java (.../ToolOutputDefinitionDTO.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_common/src/java/org/lamsfoundation/lams/tool/dto/ToolOutputDefinitionDTO.java (.../ToolOutputDefinitionDTO.java) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) @@ -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 =================================================================== diff -u -r271bad5642663205064756111791fba10301e012 -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e --- lams_tool_chat/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 271bad5642663205064756111791fba10301e012) +++ lams_tool_chat/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) @@ -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 =================================================================== diff -u -r8acb96a0f7380dea2f7a68347379cc6f8e8549e5 -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatOutputFactory.java (.../ChatOutputFactory.java) (revision 8acb96a0f7380dea2f7a68347379cc6f8e8549e5) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatOutputFactory.java (.../ChatOutputFactory.java) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) @@ -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 =================================================================== diff -u -r8acb96a0f7380dea2f7a68347379cc6f8e8549e5 -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java (.../ChatService.java) (revision 8acb96a0f7380dea2f7a68347379cc6f8e8549e5) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java (.../ChatService.java) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) @@ -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 =================================================================== diff -u -r8acb96a0f7380dea2f7a68347379cc6f8e8549e5 -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/util/ChatConstants.java (.../ChatConstants.java) (revision 8acb96a0f7380dea2f7a68347379cc6f8e8549e5) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/util/ChatConstants.java (.../ChatConstants.java) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) @@ -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 =================================================================== diff -u -rc93731a084bb6ab61f0323998b3432f375be278d -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e --- lams_tool_forum/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision c93731a084bb6ab61f0323998b3432f375be278d) +++ lams_tool_forum/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) @@ -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 =================================================================== diff -u -rbcd7980b62ca16ad230dee6712f7112bf9021c70 -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java (.../ForumOutputFactory.java) (revision bcd7980b62ca16ad230dee6712f7112bf9021c70) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java (.../ForumOutputFactory.java) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) @@ -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 =================================================================== diff -u -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) @@ -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 =================================================================== diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java (.../ForumConstants.java) (revision 3399163940c61c9132223c758d274486e57ff9b7) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java (.../ForumConstants.java) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) @@ -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 =================================================================== diff -u -r8cd9456d8e23d05eaa28f82cb4ebf664d8ef2c1e -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e --- lams_tool_laqa/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 8cd9456d8e23d05eaa28f82cb4ebf664d8ef2c1e) +++ lams_tool_laqa/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) @@ -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 =================================================================== diff -u -r31e6bbeab2ea68cd74d596bfc0ba41b58d6e49de -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java (.../QaAppConstants.java) (revision 31e6bbeab2ea68cd74d596bfc0ba41b58d6e49de) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java (.../QaAppConstants.java) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) @@ -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 =================================================================== diff -u -r70e7323be9b50d1e8c3902cde43cbe5039181541 -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java (.../IQaService.java) (revision 70e7323be9b50d1e8c3902cde43cbe5039181541) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java (.../IQaService.java) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) @@ -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 =================================================================== diff -u -rbcd7980b62ca16ad230dee6712f7112bf9021c70 -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java (.../QaOutputFactory.java) (revision bcd7980b62ca16ad230dee6712f7112bf9021c70) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java (.../QaOutputFactory.java) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) @@ -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 =================================================================== diff -u -r70e7323be9b50d1e8c3902cde43cbe5039181541 -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision 70e7323be9b50d1e8c3902cde43cbe5039181541) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) @@ -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 =================================================================== diff -u -r0550d38d2c0eb5b51a510aa4234526ce08fb5c70 -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java (.../QaStarterAction.java) (revision 0550d38d2c0eb5b51a510aa4234526ce08fb5c70) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java (.../QaStarterAction.java) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) @@ -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 =================================================================== diff -u -r33afdd354ff6b38656430c7d6e5307cd77a19612 -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e --- lams_tool_notebook/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 33afdd354ff6b38656430c7d6e5307cd77a19612) +++ lams_tool_notebook/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) @@ -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 =================================================================== diff -u -rc3b489cd68b32f3a9759840cf83d2543aaae90b5 -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookOutputFactory.java (.../NotebookOutputFactory.java) (revision c3b489cd68b32f3a9759840cf83d2543aaae90b5) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookOutputFactory.java (.../NotebookOutputFactory.java) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) @@ -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 =================================================================== diff -u -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java (.../NotebookService.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java (.../NotebookService.java) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) @@ -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 =================================================================== diff -u -r0883d2881bdb1b40071f47d5de807c59a75f6c62 -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConstants.java (.../NotebookConstants.java) (revision 0883d2881bdb1b40071f47d5de807c59a75f6c62) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConstants.java (.../NotebookConstants.java) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) @@ -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 =================================================================== diff -u -r2e18692ee6a9c0d1c654db67a55915e4f52cae6d -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e --- lams_tool_survey/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 2e18692ee6a9c0d1c654db67a55915e4f52cae6d) +++ lams_tool_survey/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) @@ -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 =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java (.../SurveyConstants.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java (.../SurveyConstants.java) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) @@ -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 =================================================================== diff -u -rbcd7980b62ca16ad230dee6712f7112bf9021c70 -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyOutputFactory.java (.../SurveyOutputFactory.java) (revision bcd7980b62ca16ad230dee6712f7112bf9021c70) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyOutputFactory.java (.../SurveyOutputFactory.java) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) @@ -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 =================================================================== diff -u -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java (.../SurveyServiceImpl.java) (revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java (.../SurveyServiceImpl.java) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) @@ -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 =================================================================== diff -u -rbcd7980b62ca16ad230dee6712f7112bf9021c70 -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListOutputFactory.java (.../TaskListOutputFactory.java) (revision bcd7980b62ca16ad230dee6712f7112bf9021c70) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListOutputFactory.java (.../TaskListOutputFactory.java) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) @@ -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 =================================================================== diff -u -r0f26de94286ceba7860f8c3197f483a718a13e1b -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteOutputFactory.java (.../VoteOutputFactory.java) (revision 0f26de94286ceba7860f8c3197f483a718a13e1b) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteOutputFactory.java (.../VoteOutputFactory.java) (revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e) @@ -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)); }