Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -r066d4ae414c52ddeadc1f768f90521bf6273f23f -re76b614d9ca801a4634a2103838784a094d10d32 Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -r066d4ae414c52ddeadc1f768f90521bf6273f23f -re76b614d9ca801a4634a2103838784a094d10d32 Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputDefinition.as =================================================================== diff -u -r7b65bab3de4ed5068c5631a245c30cb4eaa8f098 -re76b614d9ca801a4634a2103838784a094d10d32 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputDefinition.as (.../ToolOutputDefinition.as) (revision 7b65bab3de4ed5068c5631a245c30cb4eaa8f098) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputDefinition.as (.../ToolOutputDefinition.as) (revision e76b614d9ca801a4634a2103838784a094d10d32) @@ -26,14 +26,16 @@ /** * * @author Mitchell Seaton - * @version 2.1 + * @author Daniel Carlier + * @version 2.1.1 **/ class ToolOutputDefinition { public static var LONG:String = "OUTPUT_LONG"; public static var BOOL:String = "OUTPUT_BOOLEAN"; public static var USER_DEFINED:String = "OUTPUT_SET_BOOLEAN"; public static var COMPLEX:String = "OUTPUT_COMPLEX"; + public static var STRING:String = "OUTPUT_STRING"; private var _name:String; private var _description:String; Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as =================================================================== diff -u -r64f42c88ebf08393b1c53bbd00c3cd4fec211c10 -re76b614d9ca801a4634a2103838784a094d10d32 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as (.../ToolOutputConditionsDialog.as) (revision 64f42c88ebf08393b1c53bbd00c3cd4fec211c10) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as (.../ToolOutputConditionsDialog.as) (revision e76b614d9ca801a4634a2103838784a094d10d32) @@ -419,7 +419,10 @@ break; case ToolOutputDefinition.COMPLEX: _condition_item_dgd.addItem({conditionName: condition.displayName, conditionValue: String(condition.exactMatchValue), data: condition, orderID: condition.orderID}); - break; + break; + case ToolOutputDefinition.STRING: + _condition_item_dgd.addItem({conditionName: condition.displayName, conditionValue: String(condition.exactMatchValue), data: condition, orderID: condition.orderID}); + break; case ToolOutputDefinition.USER_DEFINED: _condition_item_dgd.addItem({conditionName: condition.displayName, conditionValue: String(condition.exactMatchValue), data: condition, orderID: condition.orderID}); break; @@ -472,6 +475,8 @@ return true; case ToolOutputDefinition.COMPLEX: return true; + case ToolOutputDefinition.STRING: + return true; case ToolOutputDefinition.USER_DEFINED: return true; default: @@ -666,6 +671,21 @@ addDefaultConditions(_selectedDefinition.defaultConditions); // _selectedDefinition object the same when working/not working break; + case ToolOutputDefinition.STRING: + _condition_item_dgd.visible = true; + _toolOutputLongOptions_cmb.visible = false; + + add_btn.visible = false; + remove_item_btn.visible = false; + clear_all_btn.visible = false; + + refresh_btn.visible = true; + + showSteppers(false, false); + + addDefaultConditions(_selectedDefinition.defaultConditions); + + break; case ToolOutputDefinition.USER_DEFINED: _condition_item_dgd.visible = true; _toolOutputLongOptions_cmb.visible = false; @@ -770,6 +790,10 @@ case ToolOutputDefinition.LONG: return Dictionary.getValue("to_conditions_dlg_defin_long_type"); break; + case ToolOutputDefinition.STRING: + //return Dictionary.getValue("to_conditions_dlg_defin_string_type"); + return Dictionary.getValue("to_conditions_dlg_defin_user_defined_type"); + break; case ToolOutputDefinition.USER_DEFINED: return Dictionary.getValue("to_conditions_dlg_defin_user_defined_type"); default: