Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -rbf43d38cb2b81bd0cd46b7b78652a4109ea6984d -r5cd45833dbbf97b54931280286b815a87b26b1c4 Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -rbf43d38cb2b81bd0cd46b7b78652a4109ea6984d -r5cd45833dbbf97b54931280286b815a87b26b1c4 Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputDefinition.as =================================================================== diff -u -r04425a2cd9dd2555c09c36a7988fdc0c728fcb8a -r5cd45833dbbf97b54931280286b815a87b26b1c4 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputDefinition.as (.../ToolOutputDefinition.as) (revision 04425a2cd9dd2555c09c36a7988fdc0c728fcb8a) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputDefinition.as (.../ToolOutputDefinition.as) (revision 5cd45833dbbf97b54931280286b815a87b26b1c4) @@ -38,7 +38,8 @@ private var _type:String; private var _startValue:Object; private var _endValue:Object; - private var _defaultConditions:Array; + private var _defaultConditions:Array; + private var _showConditionNameOnly:Boolean; function ToolOutputDefinition(){ _defaultConditions = new Array(); @@ -58,6 +59,8 @@ _defaultConditions.push(bdto); } } + + _showConditionNameOnly = dto.showConditionNameOnly; } @@ -115,6 +118,10 @@ public function get defaultConditions():Array { return _defaultConditions; + } + + public function get showConditionNameOnly():Boolean { + return _showConditionNameOnly; } } \ No newline at end of file Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as =================================================================== diff -u -r8c53f61ed4a3f15b302deda14d1126fd62608d8a -r5cd45833dbbf97b54931280286b815a87b26b1c4 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as (.../ToolOutputConditionsDialog.as) (revision 8c53f61ed4a3f15b302deda14d1126fd62608d8a) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as (.../ToolOutputConditionsDialog.as) (revision 5cd45833dbbf97b54931280286b815a87b26b1c4) @@ -253,25 +253,35 @@ _toolOutputLongOptions_cmb.addItem({label: Dictionary.getValue("to_conditions_dlg_lte_lbl"), data: OPTION_LTE}); _toolOutputLongOptions_cmb.addItem({label: Dictionary.getValue("to_conditions_dlg_range_lbl"), data: OPTION_RANGE}); + addConditionItemColumns(false); + + showElements(false); + + // wait second frame for steppers to be setup + this.onEnterFrame = initSetup; + + } + + private function addConditionItemColumns(hideValueColumn:Boolean):Void { + _condition_item_dgd.removeAllColumns(); + var column_name:DataGridColumn = new DataGridColumn("conditionName"); column_name.headerText = Dictionary.getValue("to_conditions_dlg_condition_items_name_col_lbl"); column_name.editable = true; - column_name.width = _condition_item_dgd.width*0.4; + column_name.width = (hideValueColumn) ? _condition_item_dgd.width : _condition_item_dgd.width*0.4; - var column_value:DataGridColumn = new DataGridColumn("conditionValue"); - column_value.headerText = Dictionary.getValue("to_conditions_dlg_condition_items_value_col_lbl"); - column_value.editable = false; - column_value.width = _condition_item_dgd.width*0.6; - _condition_item_dgd.addColumn(column_name); - _condition_item_dgd.addColumn(column_value); - showElements(false); + if(!hideValueColumn) { + var column_value:DataGridColumn = new DataGridColumn("conditionValue"); + column_value.headerText = Dictionary.getValue("to_conditions_dlg_condition_items_value_col_lbl"); + column_value.editable = false; + column_value.width = _condition_item_dgd.width*0.6; + + _condition_item_dgd.addColumn(column_value); + } - // wait second frame for steppers to be setup - this.onEnterFrame = initSetup; - } private function initSetup():Void { @@ -533,6 +543,12 @@ _selectedDefinition = _toolOutputDefin_cmb.dataProvider[_toolOutputDefin_cmb.selectedIndex]; Debugger.log("select definition: " + _selectedDefinition.description, Debugger.CRITICAL, "selectDefinition", "ToolOutputConditionsDialog"); + if(_selectedDefinition.showConditionNameOnly) + addConditionItemColumns(true); + else if(_condition_item_dgd.getColumnAt(1) == null) + addConditionItemColumns(false); + + switch(_selectedDefinition.type) { case ToolOutputDefinition.LONG: _condition_item_dgd.visible = true; @@ -691,9 +707,14 @@ _bgpanel.setSize(w,h); _condition_item_dgd.setSize(w - 2*_condition_item_dgd._x, h*0.45); - _condition_item_dgd.getColumnAt(0).width = _condition_item_dgd.width*0.4; - _condition_item_dgd.getColumnAt(1).width = _condition_item_dgd.width*0.6; - + + if(_condition_item_dgd.getColumnAt(1) != null) { + _condition_item_dgd.getColumnAt(0).width = _condition_item_dgd.width*0.4; + _condition_item_dgd.getColumnAt(1).width = _condition_item_dgd.width*0.6; + } else { + _condition_item_dgd.getColumnAt(0).width = _condition_item_dgd.width; + } + _toolOutputDefin_cmb.setSize(w - 2*_toolOutputDefin_cmb._x - help_btn.width - 5, 22); _toolOutputLongOptions_cmb.setSize(_toolOutputDefin_cmb._width, 22);