@openui5/sap.ui.mdc 1.94.0 → 1.97.0

package/src/sap/ui/mdc/field/ConditionType.js

@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @since 1.62.0
 	 * @private
@@ -56,18 +56,19 @@ sap.ui.define([
 	 * @param {object} [oFormatOptions] Formatting options
 	 * @param {sap.ui.model.Type} [oFormatOptions.valueType] Type of the value of the condition (used for formatting and parsing)
 	 * @param {string[]} [oFormatOptions.operators] Possible operators to be used in the condition
-	 * @param {sap.ui.mdc.enum.FieldDisplay} [oFormatOptions.display] DisplayFormat used to visualize value
-	 * @param {string} [oFormatOptions.fieldHelpID] ID of the field help, to determine key and description // TODO: async request????
+	 * @param {sap.ui.mdc.enum.FieldDisplay} [oFormatOptions.display] DisplayFormat used to visualize a value
+	 * @param {string} [oFormatOptions.fieldHelpID] ID of the field help to determine the key and description // TODO: async request????
 	 * @param {boolean} [oFormatOptions.hideOperator] If set, only the value of the condition is shown, but no operator //TODO
 	 * @param {int} [oFormatOptions.maxConditions] Maximum number of allowed conditions
-	 * @param {sap.ui.model.Context} [oFormatOptions.bindingContext] BindingContext of field. Used to get key or description from the value help using in/out parameters. (In table, the value help might be connected to different row)
-	 * @param {sap.ui.model.Type} [oFormatOptions.originalDateType] Type used on field. E.g. for date types internally a different type is used internally to have different <code>formatOptions</code>
+	 * @param {sap.ui.model.Context} [oFormatOptions.bindingContext] <code>BindingContext</code> of field. Used to get a key or description from the value help using in/out parameters. (In a table, the value help might be connected to a different row)
+	 * @param {sap.ui.model.Type} [oFormatOptions.originalDateType] Type used on field, for example, for date types; a different type is used internally to have different <code>formatOptions</code>
+	 * @param {sap.ui.model.Type} [oFormatOptions.additionalType] additional Type used on other part of a field. (This is the case for unit fields.)
 	 * @param {function} [oFormatOptions.getConditions] Function to get the existing conditions of the field. Only used if <code>isUnit</code> is set. // TODO: better solution
 	 * @param {function} [oFormatOptions.asyncParsing] Callback function to tell the <code>Field</code> the parsing is asynchronous.
-	 * @param {object} [oFormatOptions.navigateCondition] Condition of keyboard navigation. If this is filled, no real parsing is needed as the condition has already been determined. Just return it
+	 * @param {object} [oFormatOptions.navigateCondition] Condition of keyboard navigation. If this is filled, no real parsing is needed as the condition has already been determined and is just returned
 	 * @param {object} [oFormatOptions.delegate] Field delegate to handle model-specific logic
 	 * @param {object} [oFormatOptions.payload] Payload of the delegate
-	 * @param {boolean} [oFormatOptions.preventGetDescription] If set, description is not read by <code>formatValue</code> as it is known that no description exist or it might be set later
+	 * @param {boolean} [oFormatOptions.preventGetDescription] If set, description is not read by <code>formatValue</code> as it is known that no description exists or might be set later
 	 * @param {sap.ui.mdc.condition.ConditionModel} [oFormatOptions.conditionModel] <code>ConditionModel</code>, if bound to one
 	 * @param {string} [oFormatOptions.conditionModelName] Name of the <code>ConditionModel</code>, if bound to one
 	 * @param {string} [oFormatOptions.defaultOperatorName] Name of the default <code>Operator</code>
@@ -114,12 +115,10 @@ sap.ui.define([
 		}
 
 		var oType = _getValueType.call(this);
-		var oOriginalDateType = _getOriginalDateType.call(this);
 		var bIsUnit = _isUnit(oType);
 		var bPreventGetDescription = this.oFormatOptions.preventGetDescription;
 
-		_attachCurrentValueAtType.call(this, oCondition, oOriginalDateType); // use original condition
-		_attachCurrentValueAtType.call(this, oCondition, oType);
+		_attachCurrentValueAtType.call(this, oCondition, oType); // use original condition
 
 		switch (this.getPrimitiveType(sInternalType)) {
 			case "string":
@@ -267,7 +266,7 @@ sap.ui.define([
 		var sDisplay = _getDisplay.call(this);
 		var bInputValidationEnabled = _isInputValidationEnabled.call(this);
 		var oType = _getValueType.call(this);
-		var oOriginalDateType = _getOriginalDateType.call(this);
+		var oOriginalType = _getOriginalType.call(this);
 		var aOperators = _getOperators.call(this);
 		var bIsUnit = _isUnit(oType);
 		var sDefaultOperator;
@@ -279,8 +278,6 @@ sap.ui.define([
 		}
 
 		_initCurrentValueAtType.call(this, oType);
-		_initCurrentValueAtType.call(this, oOriginalDateType);
-		_useCurrentValueFromOriginalType.call(this, oType, oOriginalDateType);
 
 		switch (this.getPrimitiveType(sInternalType)) {
 			case "string":
@@ -349,12 +346,12 @@ sap.ui.define([
 							}
 						} catch (oException) {
 							var oMyException = oException;
-							if (oMyException instanceof ParseException && oOriginalDateType) {
+							if (oMyException instanceof ParseException && oOriginalType) {
 								// As internal yyyy-MM-dd is used as pattern for dates (times similar) the
 								// parse exception might contain this as pattern. The user should see the pattern thats shown
 								// So try to parse date with the original type to get parseException with right pattern.
 								try {
-									oOriginalDateType.parseValue(vValue, "string", oOriginalDateType._aCurrentValue);
+									oOriginalType.parseValue(vValue, "string", oOriginalType._aCurrentValue);
 								} catch (oOriginalException) {
 									oMyException = oOriginalException;
 								}
@@ -395,7 +392,6 @@ sap.ui.define([
 	function _finishParseFromString(oCondition, oType) {
 
 		var bIsUnit = _isUnit(oType);
-		var oOriginalDateType = _getOriginalDateType.call(this);
 
 		if (oCondition && !bIsUnit) {
 			var sName = oType.getMetadata().getName();
@@ -413,7 +409,6 @@ sap.ui.define([
 		}
 
 		_attachCurrentValueAtType.call(this, oCondition, oType);
-		_attachCurrentValueAtType.call(this, oCondition, oOriginalDateType);
 
 		return oCondition;
 
@@ -570,7 +565,10 @@ sap.ui.define([
 		// Field accepts values that are not found -> must be checked by caller
 		// if user input fits to the type, let the caller validate it
 		var oOperator;
-		if (aOperators.length === 1) {
+		if (_isUnit(oType)) {
+			// in unit case just use EQ operator
+			oOperator = FilterOperatorUtil.getEQOperator("EQ");
+		} else if (aOperators.length === 1) {
 			// just use the one supported type
 			oOperator = FilterOperatorUtil.getOperator(aOperators[0]);
 		} else {
@@ -589,6 +587,10 @@ sap.ui.define([
 
 		if (oCondition) {
 			oCondition.validated = ConditionValidated.NotValidated;
+			if (_isUnit(oType) && Array.isArray(oCondition.values[0])) {
+				// user input is valid for type -> just return unit for further processing
+				oCondition.values[0] = oCondition.values[0][1];
+			}
 		}
 
 		return oCondition;
@@ -598,7 +600,7 @@ sap.ui.define([
 	ConditionType.prototype.validateValue = function(oCondition) {
 
 		var oType = _getValueType.call(this);
-		var oOriginalDateType = _getOriginalDateType.call(this);
+		var oOriginalType = _getOriginalType.call(this);
 		var aOperators = _getOperators.call(this);
 		var bIsUnit = _isUnit(oType);
 
@@ -647,11 +649,11 @@ sap.ui.define([
 		try {
 			oOperator.validate(oCondition.values, oType);
 		} catch (oException) {
-			if (oException instanceof ValidateException && oOriginalDateType) {
+			if (oException instanceof ValidateException && oOriginalType) {
 				// As internal yyyy-MM-dd is used as pattern for dates (times similar) the
 				// ValidateException might contain this as pattern. The user should see the pattern thats shown
 				// So try to validate date with the original type to get ValidateException with right pattern.
-				oOperator.validate(oCondition.values, oOriginalDateType);
+				oOperator.validate(oCondition.values, oOriginalType);
 			}
 			throw oException;
 		}
@@ -691,12 +693,18 @@ sap.ui.define([
 
 	}
 
-	function _getOriginalDateType() {
+	function _getOriginalType() {
 
 		return this.oFormatOptions.originalDateType;
 
 	}
 
+	function _getAdditionalType() {
+
+		return this.oFormatOptions.additionalType;
+
+	}
+
 	function _getOperators() {
 
 		var aOperators = this.oFormatOptions.operators;
@@ -713,7 +721,7 @@ sap.ui.define([
 		var sID = this.oFormatOptions.fieldHelpID;
 		if (sID) {
 			var oFieldHelp = sap.ui.getCore().byId(sID);
-			if (oFieldHelp && oFieldHelp.isUsableForValidation()) {
+			if (oFieldHelp && oFieldHelp.isValidationSupported()) {
 				return oFieldHelp;
 			}
 		}
@@ -746,23 +754,32 @@ sap.ui.define([
 	function _attachCurrentValueAtType(oCondition, oType) {
 
 		if (_isCompositeType.call(this, oType) && oCondition && oCondition.values[0]) {
-				oType._aCurrentValue = oCondition.values[0];
-		}
-
-	}
+			oType._aCurrentValue = oCondition.values[0];
 
-	function _initCurrentValueAtType(oType) {
+			var oAdditionalType = _getAdditionalType.call(this);
+			if (_isCompositeType.call(this, oAdditionalType)) { // store in corresponding unit or measure type too
+				oAdditionalType._aCurrentValue = oCondition.values[0];
+			}
 
-		if (_isCompositeType.call(this, oType) && !oType._aCurrentValue) {
-				oType._aCurrentValue = [];
+			var oOriginalType = _getOriginalType.call(this);
+			if (_isCompositeType.call(this, oOriginalType)) { // store in original type too (Currently not used in Unit/Currency type, but basically in CompositeType for parsing)
+				oOriginalType._aCurrentValue = oCondition.values[0];
+			}
 		}
 
 	}
 
-	function _useCurrentValueFromOriginalType(oType, oOriginalDateType) {
+	function _initCurrentValueAtType(oType) {
+
+		if (_isCompositeType.call(this, oType)) {
+			var oAdditionalType = _getAdditionalType.call(this);
+			if (_isCompositeType.call(this, oAdditionalType)) {
+				if (!oAdditionalType._aCurrentValue) {
+					oAdditionalType._aCurrentValue = [];
+				}
 
-		if (_isCompositeType.call(this, oType) && _isCompositeType.call(this, oOriginalDateType) && oOriginalDateType._aCurrentValue) {
-				oType._aCurrentValue = oOriginalDateType._aCurrentValue;
+				oType._aCurrentValue = oAdditionalType._aCurrentValue; // to use before entered corresponding number or unit
+			}
 		}
 
 	}
@@ -844,11 +861,26 @@ sap.ui.define([
 		var oFieldHelp = _getFieldHelp.call(this);
 		var oDelegate = this.oFormatOptions.delegate;
 		var oPayload = this.oFormatOptions.payload;
+		var oConfig = {
+				value: vValue,
+				parsedValue: vParsedValue,
+				inParameters: undefined, // TODO: needed?
+				outParameters: undefined, // TODO: needed?
+				bindingContext: oBindingContext,
+				checkKeyFirst: bCheckKeyFirst, // TODO: not longer needed?
+				checkKey: bCheckKey,
+				checkDescription: bCheckDescription,
+				conditionModel: oConditionModel,
+				conditionModelName: sConditionModelName,
+				exception: ParseException
+		};
 
 		if (oDelegate) {
-			return oDelegate.getItemForValue(oPayload, oFieldHelp, vValue, vParsedValue, oBindingContext, bCheckKeyFirst, bCheckKey, bCheckDescription, oConditionModel, sConditionModelName);
+//			return oDelegate.getItemForValue(oPayload, oFieldHelp, vValue, vParsedValue, oBindingContext, bCheckKeyFirst, bCheckKey, bCheckDescription, oConditionModel, sConditionModelName);
+			return oDelegate.getItemForValue(oPayload, oFieldHelp, oConfig);
 		} else if (oFieldHelp) {
-			return oFieldHelp.getItemForValue(vValue, vParsedValue, undefined, undefined, oBindingContext, bCheckKeyFirst, bCheckKey, bCheckDescription, oConditionModel, sConditionModelName);
+//			return oFieldHelp.getItemForValue(vValue, vParsedValue, undefined, undefined, oBindingContext, bCheckKeyFirst, bCheckKey, bCheckDescription, oConditionModel, sConditionModelName);
+			return oFieldHelp.getItemForValue(oConfig);
 		}
 
 	}

package/src/sap/ui/mdc/field/ConditionsType.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @since 1.62.0
 	 * @private
@@ -46,18 +46,19 @@ sap.ui.define([
 	 * @param {object} [oFormatOptions] Formatting options
 	 * @param {sap.ui.model.Type} [oFormatOptions.valueType] Type of the value of the condition (used for formatting and parsing)
 	 * @param {string[]} [oFormatOptions.operators] Possible operators to be used in the condition
-	 * @param {sap.ui.mdc.enum.FieldDisplay} [oFormatOptions.display] DisplayFormat used to visualize value
-	 * @param {string} [oFormatOptions.fieldHelpID] ID of the field help, to determine key and description // TODO: async request????
+	 * @param {sap.ui.mdc.enum.FieldDisplay} [oFormatOptions.display] DisplayFormat used to visualize a value
+	 * @param {string} [oFormatOptions.fieldHelpID] ID of the field help to determine the key and description // TODO: async request????
 	 * @param {boolean} [oFormatOptions.hideOperator] If set, only the value of the condition is shown, but no operator //TODO
 	 * @param {int} [oFormatOptions.maxConditions] Maximum number of allowed conditions
-	 * @param {sap.ui.model.Context} [oFormatOptions.bindingContext] BindingContext of field. Used to get key or description from the value help using in/out parameters. (In table, the value help might be connected to different row)
-	 * @param {sap.ui.model.Type} [oFormatOptions.originalDateType] Type used on field. E.g. for date types internally a different type is used internally to have different <code>formatOptions</code>
+	 * @param {sap.ui.model.Context} [oFormatOptions.bindingContext] <code>BindingContext</code> of field. Used to get a key or description from the value help using in/out parameters. (In a table, the value help might be connected to a different row)
+	 * @param {sap.ui.model.Type} [oFormatOptions.originalDateType] Type used on field, for example, for date types; a different type is used internally to have different <code>formatOptions</code>
+	 * @param {sap.ui.model.Type} [oFormatOptions.additionalType] additional Type used on other part of a field. (This is the case for unit fields.)
 	 * @param {function} [oFormatOptions.getConditions] Function to get the existing conditions of the field. Only used if <code>isUnit</code> is set. TODO: better solution
 	 * @param {function} [oFormatOptions.asyncParsing] Callback function to tell the <code>Field</code> the parsing is asynchronous.
-	 * @param {object} [oFormatOptions.navigateCondition] Condition of keyboard navigation. If this is filled, no real parsing is needed as the condition has already been determined. Just return it
+	 * @param {object} [oFormatOptions.navigateCondition] Condition of keyboard navigation. If this is filled, no real parsing is needed as the condition has already been determined and is just returned
 	 * @param {object} [oFormatOptions.delegate] Field delegate to handle model-specific logic
 	 * @param {object} [oFormatOptions.payload] Payload of the delegate
-	 * @param {boolean} [oFormatOptions.preventGetDescription] If set, description is not read by <code>formatValue</code> as it is known that no description exist or it might be set later
+	 * @param {boolean} [oFormatOptions.preventGetDescription] If set, description is not read by <code>formatValue</code> as it is known that no description exists or might be set later
 	 * @param {sap.ui.mdc.condition.ConditionModel} [oFormatOptions.conditionModel] <code>ConditionModel</code>, if bound to one
 	 * @param {string} [oFormatOptions.conditionModelName] Name of the <code>ConditionModel</code>, if bound to one
 	 * @param {string} [oFormatOptions.defaultOperatorName] Name of the default <code>Operator</code>
@@ -72,6 +73,7 @@ sap.ui.define([
 			oFormatOptions = _createFormatOptionsForConditionType(oFormatOptions);
 //			var oConstraints = merge({}, this.oConstraints);
 			this._oConditionType = new ConditionType(oFormatOptions, this.oConstraints);
+			this._oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
 		}
 
 	});
@@ -159,8 +161,8 @@ sap.ui.define([
 		}
 
 		return SyncPromise.all(aSyncPromises).then(function(aFormattedValues) {
-			return _concatenateFormattedValues(aFormattedValues, vValue);
-		}).unwrap();
+			return _concatenateFormattedValues.call(this, aFormattedValues, vValue);
+		}.bind(this)).unwrap();
 
 	};
 
@@ -168,7 +170,7 @@ sap.ui.define([
 
 		for (var i = 0; i < aFormattedValues.length; i++) {
 			if (vValue) {
-				vValue = vValue + "; " +  aFormattedValues[i];
+				vValue = vValue + this._oResourceBundle.getText("field.SEPARATOR") +  aFormattedValues[i];
 			} else {
 				vValue =  aFormattedValues[i];
 			}

package/src/sap/ui/mdc/field/CustomFieldHelp.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A field help used in the <code>FieldHelp</code> association in <code>FieldBase</code> controls that allows you to add custom content.
 	 * @extends sap.ui.mdc.field.FieldHelpBase
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe

package/src/sap/ui/mdc/field/CustomFieldInfo.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A field help used in the <code>FieldInfo</code> aggregation in <code>FieldBase</code> controls that allows you to add custom content.
 	 * @extends sap.ui.mdc.field.FieldInfoBase
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe

package/src/sap/ui/mdc/field/DefineConditionPanel.js

@@ -88,7 +88,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.field.DefineConditionPanel
@@ -169,7 +169,12 @@ sap.ui.define([
 					visibility: "hidden"
 				}
 			},
-			events: {}
+			events: {
+				/**
+				 * Event is fired if the user processes a condition. (Not known if changed.)
+				 */
+				conditionProcessed: {}
+			}
 		},
 		_oManagedObjectModel: null,
 
@@ -272,6 +277,8 @@ sap.ui.define([
 
 			aConditions.splice(iIndex, 1);
 			this.setProperty("conditions", aConditions, true); // do not invalidate whole DefineConditionPanel
+
+			this.fireConditionProcessed();
 		},
 
 		addCondition: function(oEvent) {
@@ -492,6 +499,8 @@ sap.ui.define([
 					FilterOperatorUtil.checkConditionsEmpty(aConditions);
 					this.setProperty("conditions", aConditions, true); // do not invalidate whole DefineConditionPanel
 
+					this.fireConditionProcessed();
+
 				}.bind(this), 0);
 			}
 		},
@@ -1452,6 +1461,8 @@ sap.ui.define([
 		// check if at least one condition has an error
 		_checkInvalidInput.call(this, bInvalid);
 
+		this.fireConditionProcessed();
+
 	}
 
 	function _checkInvalidInput(bInvalid) {