Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.111.2.24 -r1.111.2.25
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties 21 Dec 2016 16:57:02 -0000 1.111.2.24
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties 31 Jan 2017 14:09:18 -0000 1.111.2.25
@@ -597,6 +597,7 @@
authoring.fla.branch.mapping.default.branch.suffix =(default)
authoring.fla.complex.output.suffix =(user defined)
authoring.fla.range.output.suffix =(range)
+authoring.fla.boolean.output.suffix =(boolean: 1 or 0)
authoring.fla.range.condition.description =Range [0] to [1]
authoring.fla.exact.condition.description =Exact value of
authoring.fla.less.condition.description =Less than or eq
Index: lams_central/web/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/authoring/authoring.jsp,v
diff -u -r1.6.2.47 -r1.6.2.48
--- lams_central/web/authoring/authoring.jsp 2 Jan 2017 08:58:11 -0000 1.6.2.47
+++ lams_central/web/authoring/authoring.jsp 31 Jan 2017 14:09:18 -0000 1.6.2.48
@@ -227,6 +227,8 @@
COMPLEX_OUTPUT_SUFFIX : '',
RANGE_OUTPUT_SUFFIX : '',
+
+ BOOLEAN_OUTPUT_SUFFIX : '',
RANGE_CONDITION_DESCRIPTION : '',
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.15 -r1.25.2.16
--- lams_central/web/includes/javascript/authoring/authoringProperty.js 30 Jan 2017 13:52:29 -0000 1.25.2.15
+++ lams_central/web/includes/javascript/authoring/authoringProperty.js 31 Jan 2017 14:09:18 -0000 1.25.2.16
@@ -1,4 +1,4 @@
-/**
+/**
* This file contains methods for Activity properties dialogs.
*/
@@ -1049,6 +1049,10 @@
case 'OUTPUT_LONG' :
suffix = LABELS.RANGE_OUTPUT_SUFFIX;
break;
+
+ case 'OUTPUT_BOOLEAN' :
+ suffix = LABELS.BOOLEAN_OUTPUT_SUFFIX;
+ break;
};
this.toolActivityUIID = activity.input.uiid;
@@ -1541,13 +1545,24 @@
gradebookDropdown = $('.propertiesContentFieldGradebook', activity.propertiesContent).empty().append(emptyOption);
// build output dropdown and bind data to each option
$.each(activity.outputDefinitions,function(){
- if (this.type != 'OUTPUT_LONG') {
+ if (this.type != 'OUTPUT_LONG' && this.type != 'OUTPUT_BOOLEAN') {
return true;
}
optionsFound = true;
+ var suffix = '';
+ switch(this.type) {
+ case 'OUTPUT_BOOLEAN' :
+ suffix = LABELS.BOOLEAN_OUTPUT_SUFFIX;
+ break;
+
+ case 'OUTPUT_LONG' :
+ suffix = LABELS.RANGE_OUTPUT_SUFFIX;
+ break;
+ };
+
var option = $('')
- .text(this.description + ' ' + LABELS.RANGE_OUTPUT_SUFFIX)
+ .text(this.description + ' ' + suffix)
.val(this.name)
.appendTo(gradebookDropdown);