Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/ComplexActivity.as =================================================================== diff -u -rf71aa62a9a835731868cb1bea3ce3bcc346a3c4a -r54404f7e8a6d3ab07b0d3070427c0aa6e6839578 --- lams_central/src/flash/org/lamsfoundation/lams/authoring/ComplexActivity.as (.../ComplexActivity.as) (revision f71aa62a9a835731868cb1bea3ce3bcc346a3c4a) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/ComplexActivity.as (.../ComplexActivity.as) (revision 54404f7e8a6d3ab07b0d3070427c0aa6e6839578) @@ -4,7 +4,7 @@ * For reference these are the activity types *
* public static var PARALLEL_ACTIVITY_TYPE:Number = 6;
-* public static var OPTIONS_ACTIVITY_TYPE:Number = 7;
+* public static var OPTIONAL_ACTIVITY_TYPE:Number = 7;
* public static var SEQUENCE_ACTIVITY_TYPE:Number = 8;
*
* @author DC
@@ -32,7 +32,7 @@
*/
public function populateFromDTO(dto:Object){
super.populateFromDTO(dto);
- if(_activityTypeID == Activity.OPTIONS_ACTIVITY_TYPE){
+ if(_activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE){
_maxOptions = dto.maxOptions;
_minOptions = dto.minOptions;
//TODO: This is missing in the Library packet - tell mai.
@@ -49,7 +49,7 @@
*/
public function toData():Object{
var dto:Object = super.toData();
- if(_activityTypeID == Activity.OPTIONS_ACTIVITY_TYPE){
+ if(_activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE){
if(_maxOptions){ dto.maxOptions = _maxOptions; }
if(_minOptions){ dto.minOptions = _minOptions; }
if(_optionsInstructions){ dto.optionsInstructions = _optionsInstructions; }
@@ -71,7 +71,7 @@
/**
- * Used by OPTIONS_ACTIVITY_TYPE
+ * Used by OPTIONAL_ACTIVITY_TYPE
* @usage
* @param newmaxOptions
* @return
@@ -80,7 +80,7 @@
_maxOptions = newmaxOptions;
}
/**
- * used by OPTIONS_ACTIVITY_TYPE
+ * used by OPTIONAL_ACTIVITY_TYPE
* @usage
* @return
*/
@@ -90,7 +90,7 @@
/**
- * used by OPTIONS_ACTIVITY_TYPE
+ * used by OPTIONAL_ACTIVITY_TYPE
* @usage
* @param newminOptions
* @return
@@ -99,7 +99,7 @@
_minOptions = newminOptions;
}
/**
- * used by OPTIONS_ACTIVITY_TYPE
+ * used by OPTIONAL_ACTIVITY_TYPE
* @usage
* @return
*/