@openui5/sap.ui.mdc 1.111.1 → 1.112.0

package/src/sap/ui/mdc/condition/FilterOperatorUtil.js

@@ -54,7 +54,7 @@ function(
 		 *
 		 * @namespace
 		 * @author SAP SE
-		 * @version 1.111.1
+		 * @version 1.112.0
 		 * @since 1.73.0
 		 * @alias sap.ui.mdc.condition.FilterOperatorUtil
 		 *
@@ -917,7 +917,44 @@ function(
 						calcRange: function() {
 							return UniversalDateUtils.ranges.dateToYear();
 						}
+					}),
+					lastMinutes: new RangeOperator({
+						name: "LASTMINUTES",
+						valueTypes: [{name: "sap.ui.model.type.Integer", formatOptions: {emptyString: null}, constraints: { minimum: 0 }}],
+						paramTypes: ["(\\d+)"],
+						additionalInfo: "",
+						calcRange: function(iDuration) {
+							return UniversalDateUtils.ranges.lastMinutes(iDuration);
+						}
+					}),
+					nextMinutes: new RangeOperator({
+						name: "NEXTMINUTES",
+						valueTypes: [{name: "sap.ui.model.type.Integer", formatOptions: {emptyString: null}, constraints: { minimum: 0 }}],
+						paramTypes: ["(\\d+)"],
+						additionalInfo: "",
+						calcRange: function(iDuration) {
+							return UniversalDateUtils.ranges.nextMinutes(iDuration);
+						}
+					}),
+					lastHours: new RangeOperator({
+						name: "LASTHOURS",
+						valueTypes: [{name: "sap.ui.model.type.Integer", formatOptions: {emptyString: null}, constraints: { minimum: 0 }}],
+						paramTypes: ["(\\d+)"],
+						additionalInfo: "",
+						calcRange: function(iDuration) {
+							return UniversalDateUtils.ranges.lastHours(iDuration);
+						}
+					}),
+					nextHours: new RangeOperator({
+						name: "NEXTHOURS",
+						valueTypes: [{name: "sap.ui.model.type.Integer", formatOptions: {emptyString: null}, constraints: { minimum: 0 }}],
+						paramTypes: ["(\\d+)"],
+						additionalInfo: "",
+						calcRange: function(iDuration) {
+							return UniversalDateUtils.ranges.nextHours(iDuration);
+						}
 					})
+
 				},
 
 				_mDefaultOpsForType: {}, // defines default operators for types
@@ -1643,6 +1680,11 @@ function(
 				 FilterOperatorUtil._mOperators.notGreaterThan,
 				 FilterOperatorUtil._mOperators.notGreaterEqual,
 
+				 FilterOperatorUtil._mOperators.lastMinutes,
+				 FilterOperatorUtil._mOperators.nextMinutes,
+				 FilterOperatorUtil._mOperators.lastHours,
+				 FilterOperatorUtil._mOperators.nextHours,
+
 				 FilterOperatorUtil._mOperators.today,
 				 FilterOperatorUtil._mOperators.yesterday,
 				 FilterOperatorUtil._mOperators.tomorrow,

package/src/sap/ui/mdc/condition/Operator.js

@@ -84,7 +84,7 @@ sap.ui.define([
 		 * @param {string} [oConfiguration.additionalInfo] additionalInfo text for the operator. Will be shown in the operator suggest as second column. If not used (undefined) the Include or Exclude information of the operator is used.
 		 * @constructor
 		 * @author SAP SE
-		 * @version 1.111.1
+		 * @version 1.112.0
 		 * @private
 		 * @ui5-restricted sap.fe
 		 * @MDC_PUBLIC_CANDIDATE

package/src/sap/ui/mdc/condition/OperatorDynamicDateOption.js

@@ -51,7 +51,7 @@ sap.ui.define([
 		 * @extends sap.m.DynamicDateOption
 		 *
 		 * @author SAP SE
-		 * @version 1.111.1
+		 * @version 1.112.0
 		 *
 		 * @private
 		 * @ui5-restricted sap.ui.mdc
@@ -262,8 +262,7 @@ sap.ui.define([
 						// TODO: DatePicker or Calendar?
 						// convert internal value to date
 						if (oValue && oValue.values[i]) {
-							oDate = DateUtil.typeToUniversalDate(oValue.values[i], oType, sBaseType);
-							oDate = DateUtil.utcToLocal(oDate);
+							oDate = DateUtil.typeToDate(oValue.values[i], oType, sBaseType);
 						}
 						var oFormatOptions = oType.getFormatOptions();
 
@@ -379,11 +378,10 @@ sap.ui.define([
 						if (!oInputControl.isValidValue()) {
 							throw new ParseException(); // to show error state
 						}
-						vValue = oInputControl.getDateValue();
+						vValue = oInputControl.getDateValue(); // returns local UI5Date
 						if (vValue) {
 							// parse to Types format
-							vValue = DateUtil.localToUtc(vValue);
-							vValue = DateUtil.universalDateToType(vValue, oType, sBaseType);
+							vValue = DateUtil.dateToType(vValue, oType, sBaseType);
 						}
 					} else {
 						vValue = oInputControl.getValue();
@@ -424,21 +422,17 @@ sap.ui.define([
 			var i = 0;
 
 			if (oOperator.isA("sap.ui.mdc.condition.RangeOperator")) {
-				aRange = oOperator._getRange(oValue && oValue.values, oType, sBaseType);
+				aRange = oOperator._getRange(oValue && oValue.values, oType, sBaseType); // aRange contains date in Type presentation
 				// convert to local date
 				for (i = 0; i < aRange.length; i++) {
-					aRange[i] = DateUtil.typeToUniversalDate(aRange[i], oType, sBaseType);
-					aRange[i] = DateUtil.utcToLocal(aRange[i]);
+					aRange[i] = DateUtil.typeToDate(aRange[i], oType, sBaseType);
 				}
 			} else if (oOperator.valueTypes.length === 0) {
 				aRange = [];
 			} else if (oOperator.valueTypes[0] === Operator.ValueType.Self) {
-				aRange = oValue.values;
-				for (i = 0; i < aRange.length; i++) {
-					if (aRange[i]) {
-						aRange[i] = DateUtil.typeToUniversalDate(aRange[i], oType, sBaseType);
-						aRange[i] = DateUtil.utcToLocal(aRange[i]);
-					}
+				aRange = [];
+				for (i = 0; i < oValue.values.length; i++) {
+					aRange.push(oValue.values[i] ? DateUtil.typeToDate(oValue.values[i], oType, sBaseType) : oValue.values[i]);
 				}
 				if (aRange.length === 1) {
 					// TODO: better solution for single dates
@@ -446,10 +440,9 @@ sap.ui.define([
 				}
 				// TODO How to convert GT or GE.....
 			} else if ([Operator.ValueType.Self, Operator.ValueType.Static].indexOf(oOperator.valueTypes[0]) === -1) {
-				// oType = oOperator._createLocalType(oOperator.valueTypes[0], this.type);
 				throw new Error("Cannot convert to date, use RangeOperator");
 			}
-			return aRange;
+			return aRange; // aRange contains local UI5Dates
 		};
 
 		OperatorDynamicDateOption.prototype.format = function(oValue) {

package/src/sap/ui/mdc/condition/RangeOperator.js

@@ -5,15 +5,15 @@
 */
 sap.ui.define([
 		'sap/ui/mdc/condition/Operator',
-		'sap/ui/model/Filter',
 		'sap/ui/mdc/util/DateUtil',
+		'sap/ui/model/Filter',
 		'sap/base/Log'
 	],
 
 	function(
 		Operator,
-		Filter,
 		DateUtil,
+		Filter,
 		Log
 	) {
 		"use strict";
@@ -33,7 +33,7 @@ sap.ui.define([
 		 * @param {int[]|function} [oConfiguration.defaultValues] Array of values for the defaults of <code>RangeOperators</code> parameter. This can be a function, which returns the array of values. If not used the default for the values is 1.
 		 * @constructor
 		 * @author SAP SE
-		 * @version 1.111.1
+		 * @version 1.112.0
 		 * @private
 		 * @ui5-restricted sap.fe
 		 * @MDC_PUBLIC_CANDIDATE
@@ -93,7 +93,7 @@ sap.ui.define([
 		};
 
 		RangeOperator.prototype._getRange = function(aValues, oType, sBaseType) {
-			var aRange;
+			var aRange; // contains UniversalDates in local time
 			if (aValues) {
 				if (aValues.length === 2) {
 					aRange = this.calcRange(aValues[0], aValues[1]);
@@ -105,12 +105,11 @@ sap.ui.define([
 			}
 
 			for (var i = 0; i < 2; i++) {
-				//the calcRange result must be converted from local time to UTC and into the correct type format.
-				aRange[i].oDate = DateUtil.localToUtc(aRange[i].oDate);
-				aRange[i] = DateUtil.universalDateToType(aRange[i], oType, sBaseType);
+				//the calcRange result must be converted from local time into the correct type format.
+				aRange[i] = DateUtil.dateToType(aRange[i].getJSDate(), oType, sBaseType);
 			}
 
-			return aRange;
+			return aRange; // containes type presentation of dates in local time
 		};
 
 		/**

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

@@ -53,7 +53,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.111.1
+	 * @version 1.112.0
 	 *
 	 * @since 1.62.0
 	 * @private

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

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.111.1
+	 * @version 1.112.0
 	 *
 	 * @since 1.62.0
 	 * @private

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.111.1
+	 * @version 1.112.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe

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

@@ -93,7 +93,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.111.1
+	 * @version 1.112.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.field.DefineConditionPanel
@@ -290,7 +290,7 @@ sap.ui.define([
 			for (var i = 0; i < aGridContent.length && iRow <= iIndex; i++) {
 				var oField = aGridContent[i];
 				if (iRow === iIndex && oField instanceof Field && oField.hasOwnProperty("_iValueIndex")) {
-					if (oField._bParseError) { // TODO: better was to find out parsing error
+					if (oField._isInvalidInput()) { // TODO: better was to find out parsing error
 						oField.setValue(null); // to remove invalid value from parsing
 					}
 				}
@@ -594,7 +594,7 @@ sap.ui.define([
 			for (var i = 0; i < aGridContent.length; i++) {
 				var oField = aGridContent[i];
 				if (oField instanceof Field && oField.hasOwnProperty("_iValueIndex")) {
-					if (oField._bParseError) { // TODO: better was to find out parsing error
+					if (oField._isInvalidInput()) { // TODO: better was to find out parsing error
 						oField.setValue(); // to remove invalid value from parsing
 					}
 				}
@@ -705,14 +705,14 @@ sap.ui.define([
 			// find fields and initialize error state
 			oValue0Field = oGrid.getContent()[iIndex + 2];
 			if (oValue0Field && oValue0Field.hasOwnProperty("_iValueIndex") && oValue0Field._iValueIndex === 0) {
-				if (oValue0Field instanceof Field && !oValue0Field._bParseError) { // TODO: better was to find out parsing error // TODO: handle custom controls
+				if (oValue0Field instanceof Field && !oValue0Field._isInvalidInput()) { // TODO: better was to find out parsing error // TODO: handle custom controls
 					// if Field is in parsing error state, don't remove error
 					oValue0Field.setValueState(ValueState.None);
 					oValue0Field.setValueStateText();
 				}
 				oValue1Field = oGrid.getContent()[iIndex + 3]; // second field only exists if first field exist
 				if (oValue1Field && oValue1Field.hasOwnProperty("_iValueIndex") && oValue1Field._iValueIndex === 1) {
-					if (oValue1Field instanceof Field && !oValue1Field._bParseError) { // TODO: better was to find out parsing error // TODO: handle custom controls
+					if (oValue1Field instanceof Field && !oValue1Field._isInvalidInput()) { // TODO: better was to find out parsing error // TODO: handle custom controls
 						// if Field is in parsing error state, don't remove error
 						oValue1Field.setValueState(ValueState.None);
 						oValue1Field.setValueStateText();
@@ -1604,7 +1604,7 @@ sap.ui.define([
 				}
 			}
 
-			if (oField.getMetadata().getAllProperties().valueState && !oField._bParseError && (!oField2 || !oField2._bParseError)) { // TODO: better was to find out parsing error
+			if (oField.getMetadata().getAllProperties().valueState && !oField._isInvalidInput() && (!oField2 || !oField2._isInvalidInput())) { // TODO: better was to find out parsing error
 				// if Field is in parsing error state, user entry is not transfered to condition, so validating makes no sense.
 				var oType = oField.getBinding("value").getType(); // use nullable data type from Field - don't create new type for each check
 				try {

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

@@ -12,12 +12,11 @@ sap.ui.define([
 	'sap/ui/mdc/condition/Condition',
 	'sap/ui/mdc/enum/ConditionValidated',
 	'sap/ui/mdc/enum/BaseType',
-	"sap/ui/mdc/util/DateUtil",
+	'sap/ui/mdc/util/DateUtil',
 	'sap/ui/model/SimpleType',
 	'sap/ui/model/FormatException',
 	'sap/ui/model/ParseException',
 	'sap/ui/model/ValidateException',
-	'sap/m/DynamicDate',
 	'sap/m/library'
 ],
 	function(
@@ -32,7 +31,6 @@ sap.ui.define([
 		FormatException,
 		ParseException,
 		ValidateException,
-		DynamicDateType,
 		mLibrary
 		) {
 	"use strict";
@@ -46,7 +44,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.field.ConditionsType
 	 *
 	 * @author SAP SE
-	 * @version 1.111.1
+	 * @version 1.112.0
 	 *
 	 * @since 1.96.0
 	 * @private
@@ -122,10 +120,21 @@ sap.ui.define([
 			var sOption = FilterOperatorUtil.getDynamicDateOptionForOperator(oOperator, mLibrary.StandardDynamicDateRangeKeys, sBaseType);
 
 			for (var i = 0; i < oOperator.valueTypes.length; i++) {
-				if (sOption && oOperator.valueTypes[i] === Operator.ValueType.Self) { // only for standard operators
-					aValues.push(_dateToTimestamp.call(this, oCondition.values[i]));
-				} else if (oOperator.valueTypes[i] && oOperator.valueTypes[i] !== Operator.ValueType.Static) {
-					aValues.push(oCondition.values[i]);
+				if (oOperator.valueTypes[i] && oOperator.valueTypes[i] !== Operator.ValueType.Static) {
+					if (sOption) { // only for standard operators  (dates are needed as local dates)
+						if (oOperator.valueTypes[i] === Operator.ValueType.Self) {
+							aValues.push(DateUtil.typeToDate(oCondition.values[i], _getValueType.call(this), sBaseType));
+						} else {
+							var sOperatorBaseType = _getBaseTypeForValueType.call(this, oOperator.valueTypes[i]);
+							if (sOperatorBaseType === BaseType.Date || sOperatorBaseType === BaseType.DateTime) {
+								aValues.push(DateUtil.typeToDate(oCondition.values[i], _getOperatorType.call(this, oOperator, i), sOperatorBaseType));
+							} else {
+								aValues.push(oCondition.values[i]); // e.g integer value
+							}
+						}
+					} else {
+						aValues.push(oCondition.values[i]); // for custom operators just forward value. (Operator inside handle it)
+					}
 				}
 			}
 
@@ -133,56 +142,13 @@ sap.ui.define([
 				sOption = FilterOperatorUtil.getCustomDynamicDateOptionForOperator(oOperator, sBaseType);
 			}
 
-			var oDynamicDateType = _getDynamicDateType.call(this, sBaseType);
-			vResult = oDynamicDateType.formatValue({operator: sOption, values: aValues}, sInternalType);
+			vResult = {operator: sOption, values: aValues};
 		}
 
 		return vResult;
 
 	};
 
-	function _getDynamicDateType(sBaseType) {
-
-		if (!this._oDynamicDateType) {
-			var oDynamicDateFormatOptions = {
-				date: {
-					source: {pattern: "timestamp"}
-				},
-				"int": {}
-			};
-			if (sBaseType === BaseType.DateTime) {
-				oDynamicDateFormatOptions.datetime = {
-					source: {pattern: "timestamp"}
-				};
-			}
-
-			this._oDynamicDateType = new DynamicDateType(oDynamicDateFormatOptions);
-		}
-
-		return this._oDynamicDateType;
-	}
-
-	function _dateToTimestamp(vValue) {
-
-		var oType = _getValueType.call(this);
-		var oModelFormat = oType.getModelFormat();
-		var oDate = oModelFormat.parse(vValue); // All Date and DateTime types parse the model specific value into a JS-Date via ModelFormat. UTC is used, so the JS Date is timezone independent. For Date types UTC 00:00:00 is used.
-		return oDate.getTime();
-
-	}
-
-	function _timestampToDate(iTimeStamp) {
-
-		var oType = _getValueType.call(this);
-		var oModelFormat = oType.getModelFormat();
-		var oDate = new Date(iTimeStamp);
-		oDate.setUTCMilliseconds(0); // ignore missiseconds for the moment (As not saved in variants)
-		var vDate = oModelFormat.format(oDate); // All Date and DateTime types parse the model specific value into a JS-Date via ModelFormat. UTC is used, so the JS Date is timezone independent. For Date types UTC 00:00:00 is used.
-
-		return vDate;
-
-	}
-
 	DynamicDateRangeConditionsType.prototype.parseValue = function(oValue, sInternalType) {
 
 		if (this._bDestroyed) { // if destroyed do nothing
@@ -200,21 +166,29 @@ sap.ui.define([
 				throw new ParseException(oValue.values[0]);
 			}
 
-			var sOperator = oValue.operator; // sOperator is the Option name
-			var oOperator = FilterOperatorUtil.getOperatorForDynamicDateOption(sOperator, _getBaseType.call(this)); // search via name and alias
-			sOperator = oOperator.name; // map it back to the real Operator name
+			var sOption = oValue.operator; // sOperator is the Option name
+			var oOperator = FilterOperatorUtil.getOperatorForDynamicDateOption(sOption, _getBaseType.call(this)); // search via name and alias
 
 			if (oOperator) {
 				var sBaseType = _getBaseType.call(this);
-				var oDynamicDateType = _getDynamicDateType.call(this, sBaseType);
-				var vResult = oDynamicDateType.parseValue(oValue, sInternalType);
 				var aValues = [];
 
 				for (var i = 0; i < oOperator.valueTypes.length; i++) {
-					if (mLibrary.StandardDynamicDateRangeKeys[oValue.operator] && oOperator.valueTypes[i] === Operator.ValueType.Self) { // only for standard operators
-						aValues.push(_timestampToDate.call(this, vResult.values[i]));
-					} else if (oOperator.valueTypes[i] && oOperator.valueTypes[i] !== Operator.ValueType.Static) {
-						aValues.push(vResult.values[i]);
+					if (oOperator.valueTypes[i] && oOperator.valueTypes[i] !== Operator.ValueType.Static) {
+						if (mLibrary.StandardDynamicDateRangeKeys[sOption]) { // only for standard operators (dates are returned as local dates)
+							if (oOperator.valueTypes[i] === Operator.ValueType.Self) {
+								aValues.push(DateUtil.dateToType(oValue.values[i], _getValueType.call(this), sBaseType));
+							} else {
+								var sOperatorBaseType = oOperator.valueTypes[i] === Operator.ValueType.Self ? sBaseType : _getBaseTypeForValueType.call(this, oOperator.valueTypes[i]);
+								if (sOperatorBaseType === BaseType.Date || sOperatorBaseType === BaseType.DateTime) {
+									aValues.push(DateUtil.dateToType(oValue.values[i], _getOperatorType.call(this, oOperator, i), sOperatorBaseType));
+								} else {
+									aValues.push(oValue.values[i]); // e.g integer values
+								}
+							}
+						} else {
+							aValues.push(oValue.values[i]); // for custom operators take what comes (inside the Operator already creted te right value)
+						}
 					}
 				}
 
@@ -300,14 +274,27 @@ sap.ui.define([
 		var sType = oType.getMetadata().getName();
 		var oFormatOptions = oType.getFormatOptions();
 		var oConstraints = oType.getConstraints();
+
+		return _getBaseTypeForValueType.call(this, {name: sType, formatOptions: oFormatOptions, constraints: oConstraints});
+
+	}
+
+	function _getBaseTypeForValueType(oValueType) {
+
 		var oDelegate = this.oFormatOptions.delegate;
 		var oPayload = this.oFormatOptions.payload;
-		var sBaseType = oDelegate ? oDelegate.getTypeUtil(oPayload).getBaseType(sType, oFormatOptions, oConstraints) : BaseType.Date;
+		var sBaseType = oDelegate ? oDelegate.getTypeUtil(oPayload).getBaseType(oValueType.name, oValueType.formatOptions, oValueType.constraints) : BaseType.Date;
 
 		return sBaseType;
 
 	}
 
+	function _getOperatorType(oOperator, iIndex) {
+
+		return oOperator._createLocalType(oOperator.valueTypes[iIndex]);
+
+	}
+
 	return DynamicDateRangeConditionsType;
 
 });