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.9 -r1.25.2.10
--- lams_central/web/includes/javascript/authoring/authoringProperty.js 8 Oct 2015 15:47:13 -0000 1.25.2.9
+++ lams_central/web/includes/javascript/authoring/authoringProperty.js 19 Sep 2016 09:38:23 -0000 1.25.2.10
@@ -1106,7 +1106,7 @@
this.toolActivityUIID = activity.input.uiid;
var option = $('')
- .text(this.description + suffix)
+ .text(this.description + ' ' + suffix)
.data('output', this)
.appendTo(outputSelect);
// select the output for which mappings were already defined
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchCondition.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchCondition.java,v
diff -u -r1.14.2.2 -r1.14.2.3
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchCondition.java 11 May 2016 07:07:21 -0000 1.14.2.2
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchCondition.java 19 Sep 2016 09:38:20 -0000 1.14.2.3
@@ -20,7 +20,6 @@
* ****************************************************************
*/
-
package org.lamsfoundation.lams.learningdesign;
import org.apache.commons.lang.builder.CompareToBuilder;
@@ -29,6 +28,7 @@
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.log4j.Logger;
import org.lamsfoundation.lams.learningdesign.dto.BranchConditionDTO;
+import org.lamsfoundation.lams.tool.OutputType;
import org.lamsfoundation.lams.tool.ToolOutput;
import org.lamsfoundation.lams.tool.ToolOutputValue;
@@ -218,11 +218,13 @@
/** Is this condition met? */
public boolean isMet(ToolOutput output) {
- if (output != null) {
+ ToolOutputValue value = output == null ? null : output.getValue();
+ if (value != null && OutputType.OUTPUT_COMPLEX != value.getType()
+ && OutputType.OUTPUT_SET_BOOLEAN != value.getType()) {
if (exactMatchValue != null) {
- return exactMatchMet(output.getValue());
+ return exactMatchMet(value);
} else if (startValue != null || endValue != null) {
- return inRange(output.getValue());
+ return inRange(value);
}
}
return false;
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.3 -r1.10.4.4
--- lams_common/src/java/org/lamsfoundation/lams/tool/OutputFactory.java 11 May 2016 07:07:20 -0000 1.10.4.3
+++ lams_common/src/java/org/lamsfoundation/lams/tool/OutputFactory.java 19 Sep 2016 09:38:20 -0000 1.10.4.4
@@ -20,7 +20,6 @@
* ****************************************************************
*/
-
package org.lamsfoundation.lams.tool;
import java.util.ArrayList;
@@ -328,7 +327,7 @@
* using the getDescription() method and set the type to OUTPUT_COMPLEX.
*/
protected ToolOutputDefinition buildComplexOutputDefinition(String definitionName, Class valueClass) {
- return buildDefinition(definitionName, OutputType.OUTPUT_COMPLEX, null, null, null, Boolean.FALSE, valueClass);
+ return buildDefinition(definitionName, OutputType.OUTPUT_COMPLEX, null, null, null, Boolean.TRUE, valueClass);
}
/**
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.4 -r1.30.2.5
--- lams_tool_chat/conf/language/lams/ApplicationResources.properties 26 Jul 2016 08:23:26 -0000 1.30.2.4
+++ lams_tool_chat/conf/language/lams/ApplicationResources.properties 19 Sep 2016 09:38:24 -0000 1.30.2.5
@@ -122,7 +122,8 @@
monitor.summary.notification =Notification
monitor.summary.date.restriction.set =Deadline has been set
monitor.summary.date.restriction.removed =Deadline has been removed
-output.desc.all.users.messages.output.definition.chat =Each learner's messages sent in the Chat
+output.desc.all.users.messages.output.definition.chat =All learners' messages sent in the Chat
+output.desc.user.messages.output.definition.chat =Current learner's messages sent in the Chat
button.submit =Finish
label.reflections =Reflections
label.chat.options =Chat options
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.3 -r1.6.2.4
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatOutputFactory.java 11 May 2016 07:14:21 -0000 1.6.2.3
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatOutputFactory.java 19 Sep 2016 09:38:24 -0000 1.6.2.4
@@ -20,7 +20,6 @@
* ****************************************************************
*/
-
package org.lamsfoundation.lams.tool.chat.service;
import java.util.ArrayList;
@@ -54,19 +53,21 @@
public SortedMap getToolOutputDefinitions(Object toolContentObject,
int definitionType) throws ToolException {
SortedMap definitionMap = new TreeMap();
- Class stringArrayClass = new String[] {}.getClass();
+
switch (definitionType) {
case ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_CONDITION:
+ break;
+ case ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_DATA_FLOW:
+ Class stringArrayClass = new String[] {}.getClass();
if (toolContentObject != null) {
ToolOutputDefinition chatMessagesDefinition = buildComplexOutputDefinition(
ChatConstants.USER_MESSAGES_DEFINITION_NAME, stringArrayClass);
Chat chat = (Chat) toolContentObject;
// adding all existing conditions
chatMessagesDefinition.setDefaultConditions(new ArrayList(chat.getConditions()));
- chatMessagesDefinition.setShowConditionNameOnly(true);
definitionMap.put(ChatConstants.USER_MESSAGES_DEFINITION_NAME, chatMessagesDefinition);
}
- case ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_DATA_FLOW:
+
ToolOutputDefinition allUsersMessagesDefinition = buildComplexOutputDefinition(
ChatConstants.ALL_USERS_MESSAGES_DEFINITION_NAME, stringArrayClass);
definitionMap.put(ChatConstants.ALL_USERS_MESSAGES_DEFINITION_NAME, allUsersMessagesDefinition);
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.4 -r1.11.2.5
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java 11 May 2016 07:14:58 -0000 1.11.2.4
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java 19 Sep 2016 09:38:18 -0000 1.11.2.5
@@ -20,7 +20,6 @@
* ****************************************************************
*/
-
package org.lamsfoundation.lams.tool.forum.service;
import java.util.ArrayList;
@@ -62,24 +61,24 @@
int definitionType) throws ToolException {
SortedMap definitionMap = new TreeMap();
- Class topicDatesToAnswersClass = (new HashMap>()).getClass();
+
Class stringArrayClass = String[].class;
switch (definitionType) {
case ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_CONDITION:
- if (toolContentObject != null) {
- ToolOutputDefinition chosenTopicAnswersDefinition = buildComplexOutputDefinition(
- ForumConstants.TOPIC_DATE_TO_ANSWERS_DEFINITION_NAME, topicDatesToAnswersClass);
- Forum forum = (Forum) toolContentObject;
-
- // adding all existing conditions
- chosenTopicAnswersDefinition
- .setDefaultConditions(new ArrayList(forum.getConditions()));
-
- chosenTopicAnswersDefinition.setShowConditionNameOnly(true);
- definitionMap.put(ForumConstants.TOPIC_DATE_TO_ANSWERS_DEFINITION_NAME,
- chosenTopicAnswersDefinition);
- }
+// if (toolContentObject != null) {
+// Class topicDatesToAnswersClass = (new HashMap>()).getClass();
+// ToolOutputDefinition chosenTopicAnswersDefinition = buildComplexOutputDefinition(
+// ForumConstants.TOPIC_DATE_TO_ANSWERS_DEFINITION_NAME, topicDatesToAnswersClass);
+// Forum forum = (Forum) toolContentObject;
+//
+// // adding all existing conditions
+// chosenTopicAnswersDefinition
+// .setDefaultConditions(new ArrayList(forum.getConditions()));
+//
+// definitionMap.put(ForumConstants.TOPIC_DATE_TO_ANSWERS_DEFINITION_NAME,
+// chosenTopicAnswersDefinition);
+// }
ToolOutputDefinition numberOfPostsDefinition = buildRangeDefinition(
ForumConstants.LEARNER_NUM_POSTS_DEFINITION_NAME, new Long(0), null);
definitionMap.put(ForumConstants.LEARNER_NUM_POSTS_DEFINITION_NAME, numberOfPostsDefinition);
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.3 -r1.16.2.4
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java 11 May 2016 07:36:00 -0000 1.16.2.3
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java 19 Sep 2016 09:38:21 -0000 1.16.2.4
@@ -20,7 +20,6 @@
* ****************************************************************
*/
-
package org.lamsfoundation.lams.tool.qa.service;
import java.util.ArrayList;
@@ -68,26 +67,25 @@
Class stringArrayClass = String[].class;
Class arrayofStringArraysClass = String[][].class;
switch (definitionType) {
- case ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_CONDITION: {
- ToolOutputDefinition userAnswersDefinition = buildComplexOutputDefinition(
- QaAppConstants.USER_ANSWERS_DEFINITION_NAME, stringArrayClass);
+ case ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_CONDITION:
+// ToolOutputDefinition userAnswersDefinition = buildComplexOutputDefinition(
+// QaAppConstants.USER_ANSWERS_DEFINITION_NAME, stringArrayClass);
+//
+// // adding all existing conditions
+// userAnswersDefinition
+// .setDefaultConditions(new ArrayList(qaContent.getConditions()));
+// definitionMap.put(QaAppConstants.USER_ANSWERS_DEFINITION_NAME, userAnswersDefinition);
- // adding all existing conditions
- userAnswersDefinition
- .setDefaultConditions(new ArrayList(qaContent.getConditions()));
- userAnswersDefinition.setShowConditionNameOnly(true);
- definitionMap.put(QaAppConstants.USER_ANSWERS_DEFINITION_NAME, userAnswersDefinition);
- }
break;
- case ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_DATA_FLOW: {
+ case ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_DATA_FLOW:
ToolOutputDefinition groupAnswersDefinition = buildComplexOutputDefinition(
QaAppConstants.GROUP_ANSWERS_DEFINITION_NAME, arrayofStringArraysClass);
definitionMap.put(QaAppConstants.GROUP_ANSWERS_DEFINITION_NAME, groupAnswersDefinition);
ToolOutputDefinition questionsDefinition = buildComplexOutputDefinition(
QaAppConstants.QUESTIONS_DEFINITION_NAME, stringArrayClass);
definitionMap.put(QaAppConstants.QUESTIONS_DEFINITION_NAME, questionsDefinition);
- }
+
break;
}
}
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.4 -r1.10.2.5
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyOutputFactory.java 11 May 2016 07:37:30 -0000 1.10.2.4
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyOutputFactory.java 19 Sep 2016 09:38:19 -0000 1.10.2.5
@@ -20,7 +20,6 @@
* ****************************************************************
*/
-
package org.lamsfoundation.lams.tool.survey.service;
import java.util.ArrayList;
@@ -58,17 +57,22 @@
public SortedMap getToolOutputDefinitions(Object toolContentObject,
int definitionType) throws ToolException {
SortedMap definitionMap = new TreeMap();
- Class stringArrayClass = new String[] {}.getClass();
- if (toolContentObject != null) {
- ToolOutputDefinition allAnswersDefinition = buildComplexOutputDefinition(
- SurveyConstants.TEXT_SEARCH_DEFINITION_NAME, stringArrayClass);
- Survey survey = (Survey) toolContentObject;
+ switch (definitionType) {
+ case ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_CONDITION:
+ break;
+ case ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_DATA_FLOW:
+ Class stringArrayClass = new String[] {}.getClass();
+ if (toolContentObject != null) {
+ ToolOutputDefinition allAnswersDefinition = buildComplexOutputDefinition(
+ SurveyConstants.TEXT_SEARCH_DEFINITION_NAME, stringArrayClass);
+ Survey survey = (Survey) toolContentObject;
- // adding all existing conditions
- allAnswersDefinition.setDefaultConditions(new ArrayList(survey.getConditions()));
+ // adding all existing conditions
+ allAnswersDefinition.setDefaultConditions(new ArrayList(survey.getConditions()));
- allAnswersDefinition.setShowConditionNameOnly(true);
- definitionMap.put(SurveyConstants.TEXT_SEARCH_DEFINITION_NAME, allAnswersDefinition);
+ definitionMap.put(SurveyConstants.TEXT_SEARCH_DEFINITION_NAME, allAnswersDefinition);
+ }
+ break;
}
return definitionMap;
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.2 -r1.4.2.3
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListOutputFactory.java 11 May 2016 07:35:22 -0000 1.4.2.2
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListOutputFactory.java 19 Sep 2016 09:38:16 -0000 1.4.2.3
@@ -85,8 +85,6 @@
condition.getName(), OutputType.OUTPUT_BOOLEAN.toString(), null, null, trueString));
}
- definition.setShowConditionNameOnly(Boolean.TRUE);
-
definitionMap.put(OUTPUT_NAME_TOOL_CONDITION, definition);
}
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.2 -r1.12.2.3
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteOutputFactory.java 11 May 2016 07:37:00 -0000 1.12.2.2
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteOutputFactory.java 19 Sep 2016 09:38:22 -0000 1.12.2.3
@@ -96,7 +96,6 @@
VoteUtils.stripHTML(nomination.getQuestion()), OutputType.OUTPUT_BOOLEAN.toString(), null,
null, trueString));
}
- definition.setShowConditionNameOnly(Boolean.TRUE);
definitionMap.put(VoteOutputFactory.OUTPUT_NAME_NOMINATION_SELECTION, definition);
}