@openui5/sap.ui.mdc 1.130.1 → 1.131.0

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

@@ -19,6 +19,7 @@ sap.ui.define([
 		'sap/ui/mdc/util/loadModules',
 		'sap/ui/core/date/UniversalDate',
 		'sap/ui/core/date/UniversalDateUtils',
+		'sap/ui/core/date/UI5Date',
 		'sap/ui/core/format/DateFormat',
 		'sap/ui/core/StaticArea',
 		'sap/ui/model/json/JSONModel',
@@ -42,6 +43,7 @@ sap.ui.define([
 		loadModules,
 		UniversalDate,
 		UniversalDateUtils,
+		UI5Date,
 		DateFormat,
 		StaticArea,
 		JSONModel,
@@ -53,8 +55,10 @@ sap.ui.define([
 
 		// translation utils
 		let oMessageBundle = Library.getResourceBundleFor("sap.ui.mdc");
+		let oMessageBundleM = Library.getResourceBundleFor("sap.m");
 		Localization.attachChange(() => {
 			oMessageBundle = Library.getResourceBundleFor("sap.ui.mdc");
+			oMessageBundleM = Library.getResourceBundleFor("sap.m");
 		});
 
 		/**
@@ -62,7 +66,7 @@ sap.ui.define([
 		 *
 		 * @namespace
 		 * @author SAP SE
-		 * @version 1.130.1
+		 * @version 1.131.0
 		 * @since 1.73.0
 		 * @alias sap.ui.mdc.condition.FilterOperatorUtil
 		 *
@@ -583,7 +587,8 @@ sap.ui.define([
 				 */
 				yesterday: new RangeOperator({
 					name: OperatorName.YESTERDAY,
-					longText: _getText(OperatorName.YESTERDAY, true),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_YESTERDAY_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_YESTERDAY_FORMAT", undefined, true),
 					valueTypes: [OperatorValueType.Static],
 					calcRange: function() {
 						return UniversalDateUtils.ranges.yesterday();
@@ -597,7 +602,8 @@ sap.ui.define([
 				 */
 				today: new RangeOperator({
 					name: OperatorName.TODAY,
-					longText: _getText(OperatorName.TODAY, true),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_TODAY_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_TODAY_FORMAT", undefined, true),
 					valueTypes: [OperatorValueType.Static],
 					calcRange: function() {
 						return UniversalDateUtils.ranges.today();
@@ -611,7 +617,8 @@ sap.ui.define([
 				 */
 				tomorrow: new RangeOperator({
 					name: OperatorName.TOMORROW,
-					longText: _getText(OperatorName.TOMORROW, true),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_TOMORROW_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_TOMORROW_FORMAT", undefined, true),
 					valueTypes: [OperatorValueType.Static],
 					calcRange: function() {
 						return UniversalDateUtils.ranges.tomorrow();
@@ -625,7 +632,7 @@ sap.ui.define([
 				 */
 				lastDays: new RangeOperator({
 					name: OperatorName.LASTDAYS,
-					tokenText: _getText(OperatorName.LASTDAYS, false),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_LASTDAYS_FORMAT", undefined, true),
 					valueTypes: [{ name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null }, constraints: { minimum: 0 } }],
 					paramTypes: ["(\\d+)"],
 					additionalInfo: "",
@@ -638,7 +645,8 @@ sap.ui.define([
 				 */
 				firstDayWeek: new RangeOperator({
 					name: OperatorName.FIRSTDAYWEEK,
-					longText: _getText(OperatorName.FIRSTDAYWEEK, true),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_FIRSTDAYWEEK_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_FIRSTDAYWEEK_FORMAT", undefined, true),
 					valueTypes: [OperatorValueType.Static],
 					calcRange: function() {
 						return UniversalDateUtils.ranges.firstDayOfWeek();
@@ -652,7 +660,8 @@ sap.ui.define([
 				 */
 				lastDayWeek: new RangeOperator({
 					name: OperatorName.LASTDAYWEEK,
-					longText: _getText(OperatorName.LASTDAYWEEK, true),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_LASTDAYWEEK_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_LASTDAYWEEK_FORMAT", undefined, true),
 					valueTypes: [OperatorValueType.Static],
 					calcRange: function() {
 						return UniversalDateUtils.ranges.lastDayOfWeek();
@@ -666,7 +675,8 @@ sap.ui.define([
 				 */
 				firstDayMonth: new RangeOperator({
 					name: OperatorName.FIRSTDAYMONTH,
-					longText: _getText(OperatorName.FIRSTDAYMONTH, true),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_FIRSTDAYMONTH_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_FIRSTDAYMONTH_FORMAT", undefined, true),
 					valueTypes: [OperatorValueType.Static],
 					calcRange: function() {
 						return UniversalDateUtils.ranges.firstDayOfMonth();
@@ -680,7 +690,8 @@ sap.ui.define([
 				 */
 				lastDayMonth: new RangeOperator({
 					name: OperatorName.LASTDAYMONTH,
-					longText: _getText(OperatorName.LASTDAYMONTH, true),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_LASTDAYMONTH_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_LASTDAYMONTH_FORMAT", undefined, true),
 					valueTypes: [OperatorValueType.Static],
 					calcRange: function() {
 						return UniversalDateUtils.ranges.lastDayOfMonth();
@@ -694,7 +705,8 @@ sap.ui.define([
 				 */
 				firstDayQuarter: new RangeOperator({
 					name: OperatorName.FIRSTDAYQUARTER,
-					longText: _getText(OperatorName.FIRSTDAYQUARTER, true),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_FIRSTDAYQUARTER_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_FIRSTDAYQUARTER_FORMAT", undefined, true),
 					valueTypes: [OperatorValueType.Static],
 					calcRange: function() {
 						return UniversalDateUtils.ranges.firstDayOfQuarter();
@@ -708,7 +720,8 @@ sap.ui.define([
 				 */
 				lastDayQuarter: new RangeOperator({
 					name: OperatorName.LASTDAYQUARTER,
-					longText: _getText(OperatorName.LASTDAYQUARTER, true),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_LASTDAYQUARTER_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_LASTDAYQUARTER_FORMAT", undefined, true),
 					valueTypes: [OperatorValueType.Static],
 					calcRange: function() {
 						return UniversalDateUtils.ranges.lastDayOfQuarter();
@@ -722,7 +735,8 @@ sap.ui.define([
 				 */
 				firstDayYear: new RangeOperator({
 					name: OperatorName.FIRSTDAYYEAR,
-					longText: _getText(OperatorName.FIRSTDAYYEAR, true),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_FIRSTDAYYEAR_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_FIRSTDAYYEAR_FORMAT", undefined, true),
 					valueTypes: [OperatorValueType.Static],
 					calcRange: function() {
 						return UniversalDateUtils.ranges.firstDayOfYear();
@@ -736,7 +750,8 @@ sap.ui.define([
 				 */
 				lastDayYear: new RangeOperator({
 					name: OperatorName.LASTDAYYEAR,
-					longText: _getText(OperatorName.LASTDAYYEAR, true),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_LASTDAYYEAR_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_LASTDAYYEAR_FORMAT", undefined, true),
 					valueTypes: [OperatorValueType.Static],
 					calcRange: function() {
 						return UniversalDateUtils.ranges.lastDayOfYear();
@@ -750,13 +765,47 @@ sap.ui.define([
 				 */
 				todayFromTo: new RangeOperator({
 					name: OperatorName.TODAYFROMTO,
-					tokenText: _getText(OperatorName.TODAYFROMTO, false),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_TODAYFROMTO_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_TODAYFROMTO_FORMAT", undefined, true),
 					valueTypes: [
 						{ name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null } }, { name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null } }
 					],
 					paramTypes: ["([-+]?\\d+)", "([-+]?\\d+)"],
 					//label:["x", "y"],
 					additionalInfo: "",
+					format: function(oCondition, oType, sDisplay, bHideOperator, aCompositeTypes, oAdditionalType, aAdditionalCompositeTypes, sCustomFormat) {
+						// format numbers into strings with leading "+" and "-"
+						let sTokenText = sCustomFormat || this.tokenFormat;
+						const iFrom = (oCondition.values[0] || 0) * -1;
+						const iTo = oCondition.values[1] || 0;
+						let sFrom = iFrom < 0 ? "" : "+";
+						sFrom = sFrom + this._formatValue(iFrom, this._createLocalType(this.valueTypes[0], oType));
+						let sTo = iTo < 0 ? "" : "+";
+						sTo = sTo + this._formatValue(iTo, this._createLocalType(this.valueTypes[1], oType));
+
+						if (iFrom <= iTo) {
+							sTokenText = sTokenText.replace(new RegExp("\\$" + 0 + "|" + 0 + "\\$" + "|" + "\\{" + 0 + "\\}", "g"), sFrom);
+							sTokenText = sTokenText.replace(new RegExp("\\$" + 1 + "|" + 1 + "\\$" + "|" + "\\{" + 1 + "\\}", "g"), sTo);
+						} else {
+							sTokenText = sTokenText.replace(new RegExp("\\$" + 0 + "|" + 0 + "\\$" + "|" + "\\{" + 0 + "\\}", "g"), sTo);
+							sTokenText = sTokenText.replace(new RegExp("\\$" + 1 + "|" + 1 + "\\$" + "|" + "\\{" + 1 + "\\}", "g"), sFrom);
+						}
+
+						return sTokenText;
+					},
+					parse: function(sText, oType, sDisplayFormat, bDefaultOperator, aCompositeTypes, oAdditionalType, aAdditionalCompositeTypes, bHideOperator) {
+						const aValues = this.getValues(sText, sDisplayFormat, bDefaultOperator, bHideOperator);
+						let iFrom = this._parseValue(aValues[0], this._createLocalType(this.valueTypes[0], oType));
+						let iTo = this._parseValue(aValues[1], this._createLocalType(this.valueTypes[1], oType));
+
+						if (iFrom > iTo) {
+							const iTemp = iFrom;
+							iFrom = iTo;
+							iTo = iTemp;
+						}
+						iFrom = iFrom * -1;
+						return [iFrom, iTo];
+					},
 					calcRange: function(xDays, yDays) {
 						let oStart = xDays >= 0 ? UniversalDateUtils.ranges.lastDays(xDays)[0] : UniversalDateUtils.ranges.nextDays(-xDays)[1];
 						let oEnd = yDays >= 0 ? UniversalDateUtils.ranges.nextDays(yDays)[1] : UniversalDateUtils.ranges.lastDays(-yDays)[0];
@@ -773,7 +822,7 @@ sap.ui.define([
 				 */
 				nextDays: new RangeOperator({
 					name: OperatorName.NEXTDAYS,
-					tokenText: _getText(OperatorName.NEXTDAYS, false),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_NEXTDAYS_FORMAT", undefined, true),
 					valueTypes: [{ name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null }, constraints: { minimum: 0 } }],
 					paramTypes: ["(\\d+)"],
 					additionalInfo: "",
@@ -786,7 +835,8 @@ sap.ui.define([
 				 */
 				lastWeek: new RangeOperator({
 					name: OperatorName.LASTWEEK,
-					longText: _getText(OperatorName.LASTWEEK, true),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_LASTWEEK_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_LASTWEEK_FORMAT", undefined, true),
 					valueTypes: [OperatorValueType.Static],
 					calcRange: function() {
 						return UniversalDateUtils.ranges.lastWeek();
@@ -797,7 +847,8 @@ sap.ui.define([
 				 */
 				thisWeek: new RangeOperator({
 					name: OperatorName.THISWEEK,
-					longText: _getText(OperatorName.THISWEEK, true),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_THISWEEK_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_THISWEEK_FORMAT", undefined, true),
 					valueTypes: [OperatorValueType.Static],
 					calcRange: function() {
 						return UniversalDateUtils.ranges.currentWeek();
@@ -808,7 +859,8 @@ sap.ui.define([
 				 */
 				nextWeek: new RangeOperator({
 					name: OperatorName.NEXTWEEK,
-					longText: _getText(OperatorName.NEXTWEEK, true),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_NEXTWEEK_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_NEXTWEEK_FORMAT", undefined, true),
 					valueTypes: [OperatorValueType.Static],
 					calcRange: function() {
 						return UniversalDateUtils.ranges.nextWeek();
@@ -819,7 +871,7 @@ sap.ui.define([
 				 */
 				lastWeeks: new RangeOperator({
 					name: OperatorName.LASTWEEKS,
-					tokenText: _getText(OperatorName.LASTWEEKS, false),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_LASTWEEKS_FORMAT", undefined, true),
 					valueTypes: [{ name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null }, constraints: { minimum: 0 } }],
 					paramTypes: ["(\\d+)"],
 					additionalInfo: "",
@@ -832,7 +884,7 @@ sap.ui.define([
 				 */
 				nextWeeks: new RangeOperator({
 					name: OperatorName.NEXTWEEKS,
-					tokenText: _getText(OperatorName.NEXTWEEKS, false),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_NEXTWEEKS_FORMAT", undefined, true),
 					valueTypes: [{ name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null }, constraints: { minimum: 0 } }],
 					paramTypes: ["(\\d+)"],
 					additionalInfo: "",
@@ -845,7 +897,8 @@ sap.ui.define([
 				 */
 				lastMonth: new RangeOperator({
 					name: OperatorName.LASTMONTH,
-					longText: _getText(OperatorName.LASTMONTH, true),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_LASTMONTH_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_LASTMONTH_FORMAT", undefined, true),
 					valueTypes: [OperatorValueType.Static],
 					calcRange: function() {
 						return UniversalDateUtils.ranges.lastMonth();
@@ -856,7 +909,8 @@ sap.ui.define([
 				 */
 				thisMonth: new RangeOperator({
 					name: OperatorName.THISMONTH,
-					longText: _getText(OperatorName.THISMONTH, true),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_THISMONTH_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_THISMONTH_FORMAT", undefined, true),
 					valueTypes: [OperatorValueType.Static],
 					calcRange: function() {
 						return UniversalDateUtils.ranges.currentMonth();
@@ -867,7 +921,8 @@ sap.ui.define([
 				 */
 				nextMonth: new RangeOperator({
 					name: OperatorName.NEXTMONTH,
-					longText: _getText(OperatorName.NEXTMONTH, true),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_NEXTMONTH_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_NEXTMONTH_FORMAT", undefined, true),
 					valueTypes: [OperatorValueType.Static],
 					calcRange: function() {
 						return UniversalDateUtils.ranges.nextMonth();
@@ -878,7 +933,7 @@ sap.ui.define([
 				 */
 				lastMonths: new RangeOperator({
 					name: OperatorName.LASTMONTHS,
-					tokenText: _getText(OperatorName.LASTMONTHS, false),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_LASTMONTHS_FORMAT", undefined, true),
 					valueTypes: [{ name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null }, constraints: { minimum: 0 } }],
 					paramTypes: ["(\\d+)"],
 					additionalInfo: "",
@@ -891,7 +946,7 @@ sap.ui.define([
 				 */
 				nextMonths: new RangeOperator({
 					name: OperatorName.NEXTMONTHS,
-					tokenText: _getText(OperatorName.NEXTMONTHS, false),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_NEXTMONTHS_FORMAT", undefined, true),
 					valueTypes: [{ name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null }, constraints: { minimum: 0 } }],
 					paramTypes: ["(\\d+)"],
 					additionalInfo: "",
@@ -904,7 +959,8 @@ sap.ui.define([
 				 */
 				lastQuarter: new RangeOperator({
 					name: OperatorName.LASTQUARTER,
-					longText: _getText(OperatorName.LASTQUARTER, true),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_LASTQUARTER_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_LASTQUARTER_FORMAT", undefined, true),
 					valueTypes: [OperatorValueType.Static],
 					calcRange: function() {
 						return UniversalDateUtils.ranges.lastQuarter();
@@ -915,7 +971,8 @@ sap.ui.define([
 				 */
 				thisQuarter: new RangeOperator({
 					name: OperatorName.THISQUARTER,
-					longText: _getText(OperatorName.THISQUARTER, true),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_THISQUARTER_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_THISQUARTER_FORMAT", undefined, true),
 					valueTypes: [OperatorValueType.Static],
 					calcRange: function() {
 						return UniversalDateUtils.ranges.currentQuarter();
@@ -926,7 +983,8 @@ sap.ui.define([
 				 */
 				nextQuarter: new RangeOperator({
 					name: OperatorName.NEXTQUARTER,
-					longText: _getText(OperatorName.NEXTQUARTER, true),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_NEXTQUARTER_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_NEXTQUARTER_FORMAT", undefined, true),
 					valueTypes: [OperatorValueType.Static],
 					calcRange: function() {
 						return UniversalDateUtils.ranges.nextQuarter();
@@ -937,7 +995,7 @@ sap.ui.define([
 				 */
 				lastQuarters: new RangeOperator({
 					name: OperatorName.LASTQUARTERS,
-					tokenText: _getText(OperatorName.LASTQUARTERS, false),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_LASTQUARTERS_FORMAT", undefined, true),
 					valueTypes: [{ name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null }, constraints: { minimum: 0 } }],
 					paramTypes: ["(\\d+)"],
 					additionalInfo: "",
@@ -950,7 +1008,7 @@ sap.ui.define([
 				 */
 				nextQuarters: new RangeOperator({
 					name: OperatorName.NEXTQUARTERS,
-					tokenText: _getText(OperatorName.NEXTQUARTERS, false),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_NEXTQUARTERS_FORMAT", undefined, true),
 					valueTypes: [{ name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null }, constraints: { minimum: 0 } }],
 					paramTypes: ["(\\d+)"],
 					additionalInfo: "",
@@ -963,7 +1021,8 @@ sap.ui.define([
 				 */
 				quarter1: new RangeOperator({
 					name: OperatorName.QUARTER1,
-					longText: _getText(OperatorName.QUARTER1, true),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_QUARTER1_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_QUARTER1_FORMAT", undefined, true),
 					valueTypes: [OperatorValueType.Static],
 					calcRange: function() {
 						return UniversalDateUtils.ranges.quarter(1);
@@ -974,7 +1033,8 @@ sap.ui.define([
 				 */
 				quarter2: new RangeOperator({
 					name: OperatorName.QUARTER2,
-					longText: _getText(OperatorName.QUARTER2, true),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_QUARTER2_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_QUARTER2_FORMAT", undefined, true),
 					valueTypes: [OperatorValueType.Static],
 					calcRange: function() {
 						return UniversalDateUtils.ranges.quarter(2);
@@ -985,7 +1045,8 @@ sap.ui.define([
 				 */
 				quarter3: new RangeOperator({
 					name: OperatorName.QUARTER3,
-					longText: _getText(OperatorName.QUARTER3, true),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_QUARTER3_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_QUARTER3_FORMAT", undefined, true),
 					valueTypes: [OperatorValueType.Static],
 					calcRange: function() {
 						return UniversalDateUtils.ranges.quarter(3);
@@ -996,7 +1057,8 @@ sap.ui.define([
 				 */
 				quarter4: new RangeOperator({
 					name: OperatorName.QUARTER4,
-					longText: _getText(OperatorName.QUARTER4, true),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_QUARTER4_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_QUARTER4_FORMAT", undefined, true),
 					valueTypes: [OperatorValueType.Static],
 					calcRange: function() {
 						return UniversalDateUtils.ranges.quarter(4);
@@ -1007,7 +1069,8 @@ sap.ui.define([
 				 */
 				lastYear: new RangeOperator({
 					name: OperatorName.LASTYEAR,
-					longText: _getText(OperatorName.LASTYEAR, true),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_LASTYEAR_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_LASTYEAR_FORMAT", undefined, true),
 					valueTypes: [OperatorValueType.Static],
 					calcRange: function() {
 						return UniversalDateUtils.ranges.lastYear();
@@ -1018,7 +1081,8 @@ sap.ui.define([
 				 */
 				thisYear: new RangeOperator({
 					name: OperatorName.THISYEAR,
-					longText: _getText(OperatorName.THISYEAR, true),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_THISYEAR_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_THISYEAR_FORMAT", undefined, true),
 					valueTypes: [OperatorValueType.Static],
 					calcRange: function() {
 						return UniversalDateUtils.ranges.currentYear();
@@ -1029,7 +1093,8 @@ sap.ui.define([
 				 */
 				nextYear: new RangeOperator({
 					name: OperatorName.NEXTYEAR,
-					longText: _getText(OperatorName.NEXTYEAR, true),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_NEXTYEAR_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_NEXTYEAR_FORMAT", undefined, true),
 					valueTypes: [OperatorValueType.Static],
 					calcRange: function() {
 						return UniversalDateUtils.ranges.nextYear();
@@ -1040,7 +1105,7 @@ sap.ui.define([
 				 */
 				lastYears: new RangeOperator({
 					name: OperatorName.LASTYEARS,
-					tokenText: _getText(OperatorName.LASTYEARS, false),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_LASTYEARS_FORMAT", undefined, true),
 					valueTypes: [{ name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null }, constraints: { minimum: 0 } }],
 					paramTypes: ["(\\d+)"],
 					additionalInfo: "",
@@ -1053,7 +1118,7 @@ sap.ui.define([
 				 */
 				nextYears: new RangeOperator({
 					name: OperatorName.NEXTYEARS,
-					tokenText: _getText(OperatorName.NEXTYEARS, false),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_NEXTYEARS_FORMAT", undefined, true),
 					valueTypes: [{ name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null }, constraints: { minimum: 0 } }],
 					paramTypes: ["(\\d+)"],
 					additionalInfo: "",
@@ -1066,10 +1131,10 @@ sap.ui.define([
 				 */
 				specificMonth: new RangeOperator({
 					name: OperatorName.SPECIFICMONTH,
-					longText: _getText(OperatorName.SPECIFICMONTH, true),
-					tokenText: _getText(OperatorName.SPECIFICMONTH, false),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_SPECIFICMONTH_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_SPECIFICMONTH_FORMAT", undefined, true),
 					valueTypes: [{ name: "sap.ui.model.type.Integer", constraints: { minimum: 0, maximum: 11 } }],
-					paramTypes: ["(.+)"],
+					paramTypes: [_getMonthRegExp.call(this)],
 					additionalInfo: "",
 					label: [oMessageBundle.getText("operators.SPECIFICMONTH_MONTH.label")],
 					defaultValues: function() {
@@ -1085,7 +1150,7 @@ sap.ui.define([
 						return UniversalDateUtils.getRange(0, "MONTH", oDate);
 					},
 					format: function(oCondition, oType, sDisplayFormat, bHideOperator, aCompositeTypes, oAdditionalType, aAdditionalCompositeTypes) {
-						const iValue = oCondition.values[0];
+						const [iValue] = oCondition.values;
 						const sTokenText = this.tokenFormat;
 						const sReplace = _getMonths.apply(this)[iValue];
 
@@ -1128,10 +1193,10 @@ sap.ui.define([
 				 */
 				specificMonthInYear: new RangeOperator({
 					name: OperatorName.SPECIFICMONTHINYEAR,
-					longText: _getText(OperatorName.SPECIFICMONTHINYEAR, true),
-					tokenText: _getText(OperatorName.SPECIFICMONTHINYEAR, false),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_SPECIFICMONTHINYEAR_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_SPECIFICMONTHINYEAR_FORMAT", undefined, true),
 					valueTypes: [{ name: "sap.ui.model.type.Integer", constraints: { minimum: 0, maximum: 11 } }, { name: "sap.ui.model.type.Integer", constraints: { minimum: 1, maximum: 9999 } }],
-					paramTypes: ["(.+)", "(.+)"],
+					paramTypes: [_getMonthRegExp.call(this), "(.+)"],
 					additionalInfo: "",
 					label: [oMessageBundle.getText("operators.SPECIFICMONTHINYEAR_MONTH.label"), oMessageBundle.getText("operators.SPECIFICMONTHINYEAR_YEAR.label")],
 					defaultValues: function() {
@@ -1148,8 +1213,7 @@ sap.ui.define([
 						return UniversalDateUtils.getRange(0, "MONTH", oDate);
 					},
 					format: function(oCondition, oType, sDisplayFormat, bHideOperator, aCompositeTypes, oAdditionalType, aAdditionalCompositeTypes) {
-						const iValue = oCondition.values[0];
-						const iYear = oCondition.values[1];
+						const [iValue, iYear] = oCondition.values;
 						let sTokenText = this.tokenFormat;
 						const sReplace = _getMonths.apply(this)[iValue];
 
@@ -1210,7 +1274,8 @@ sap.ui.define([
 				 */
 				yearToDate: new RangeOperator({
 					name: OperatorName.YEARTODATE,
-					longText: _getText(OperatorName.YEARTODATE, true),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_YEARTODATE_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_YEARTODATE_FORMAT", undefined, true),
 					valueTypes: [OperatorValueType.Static],
 					calcRange: function() {
 						return UniversalDateUtils.ranges.yearToDate();
@@ -1221,7 +1286,8 @@ sap.ui.define([
 				 */
 				dateToYear: new RangeOperator({
 					name: OperatorName.DATETOYEAR,
-					longText: _getText(OperatorName.DATETOYEAR, true),
+					longText: oMessageBundleM.getText("DYNAMIC_DATE_DATETOYEAR_TITLE", undefined, true),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_DATETOYEAR_FORMAT", undefined, true),
 					valueTypes: [OperatorValueType.Static],
 					calcRange: function() {
 						return UniversalDateUtils.ranges.dateToYear();
@@ -1232,7 +1298,7 @@ sap.ui.define([
 				 */
 				lastMinutes: new RangeOperator({
 					name: OperatorName.LASTMINUTES,
-					tokenText: _getText(OperatorName.LASTMINUTES, false),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_LASTMINUTES_FORMAT", undefined, true),
 					valueTypes: [{ name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null }, constraints: { minimum: 0 } }],
 					paramTypes: ["(\\d+)"],
 					additionalInfo: "",
@@ -1245,7 +1311,7 @@ sap.ui.define([
 				 */
 				nextMinutes: new RangeOperator({
 					name: OperatorName.NEXTMINUTES,
-					tokenText: _getText(OperatorName.NEXTMINUTES, false),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_NEXTMINUTES_FORMAT", undefined, true),
 					valueTypes: [{ name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null }, constraints: { minimum: 0 } }],
 					paramTypes: ["(\\d+)"],
 					additionalInfo: "",
@@ -1258,7 +1324,7 @@ sap.ui.define([
 				 */
 				lastHours: new RangeOperator({
 					name: OperatorName.LASTHOURS,
-					tokenText: _getText(OperatorName.LASTHOURS, false),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_LASTHOURS_FORMAT", undefined, true),
 					valueTypes: [{ name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null }, constraints: { minimum: 0 } }],
 					paramTypes: ["(\\d+)"],
 					additionalInfo: "",
@@ -1271,13 +1337,223 @@ sap.ui.define([
 				 */
 				nextHours: new RangeOperator({
 					name: OperatorName.NEXTHOURS,
-					tokenText: _getText(OperatorName.NEXTHOURS, false),
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_NEXTHOURS_FORMAT", undefined, true),
 					valueTypes: [{ name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null }, constraints: { minimum: 0 } }],
 					paramTypes: ["(\\d+)"],
 					additionalInfo: "",
 					calcRange: function(iDuration) {
 						return UniversalDateUtils.ranges.nextHours(iDuration);
 					}
+				}),
+				/*
+				 * "Last X Minutes" operator including current minute
+				 */
+				lastMinutesIncluded: new RangeOperator({
+					name: OperatorName.LASTMINUTESINCLUDED,
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_LASTMINUTESINCLUDED_FORMAT", undefined, true),
+					valueTypes: [{ name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null }, constraints: { minimum: 0 } }],
+					paramTypes: ["(\\d+)"],
+					additionalInfo: "",
+					calcRange: function(iDuration) {
+						const oResultValues = UniversalDateUtils.ranges.lastMinutes(iDuration - 1);
+						oResultValues[0].setSeconds(0);
+						return oResultValues;
+					}
+				}),
+				/*
+				 * "Next X Minutes" operator including current minute
+				 */
+				nextMinutesIncluded: new RangeOperator({
+					name: OperatorName.NEXTMINUTESINCLUDED,
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_NEXTMINUTESINCLUDED_FORMAT", undefined, true),
+					valueTypes: [{ name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null }, constraints: { minimum: 0 } }],
+					paramTypes: ["(\\d+)"],
+					additionalInfo: "",
+					calcRange: function(iDuration) {
+						const oResultValues = UniversalDateUtils.ranges.nextMinutes(iDuration - 1);
+						oResultValues[1].setSeconds(59);
+						return oResultValues;
+					}
+				}),
+				/*
+				 * "Last X Hours" operator including current hour
+				 */
+				lastHoursIncluded: new RangeOperator({
+					name: OperatorName.LASTHOURSINCLUDED,
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_LASTHOURSINCLUDED_FORMAT", undefined, true),
+					valueTypes: [{ name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null }, constraints: { minimum: 0 } }],
+					paramTypes: ["(\\d+)"],
+					additionalInfo: "",
+					calcRange: function(iDuration) {
+						const oResultValues = UniversalDateUtils.ranges.lastHours(iDuration - 1);
+						oResultValues[0].setMinutes(0, 0);
+						return oResultValues;
+					}
+				}),
+				/*
+				 * "Next X Hours" operator including current hour
+				 */
+				nextHoursIncluded: new RangeOperator({
+					name: OperatorName.NEXTHOURSINCLUDED,
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_NEXTHOURSINCLUDED_FORMAT", undefined, true),
+					valueTypes: [{ name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null }, constraints: { minimum: 0 } }],
+					paramTypes: ["(\\d+)"],
+					additionalInfo: "",
+					calcRange: function(iDuration) {
+						const oResultValues = UniversalDateUtils.ranges.nextHours(iDuration - 1);
+						oResultValues[1].setMinutes(59, 59);
+						return oResultValues;
+					}
+				}),
+				/*
+				 * "Last X Days" operator including current day
+				 */
+				lastDaysIncluded: new RangeOperator({
+					name: OperatorName.LASTDAYSINCLUDED,
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_LASTDAYSINCLUDED_FORMAT", undefined, true),
+					valueTypes: [{ name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null }, constraints: { minimum: 0 } }],
+					paramTypes: ["(\\d+)"],
+					additionalInfo: "",
+					calcRange: function(iDuration) {
+						const oResultValues = UniversalDateUtils.ranges.lastDays(iDuration - 1);
+						oResultValues[1] = UniversalDate.getInstance(UI5Date.getInstance());
+						return oResultValues;
+					}
+				}),
+				/*
+				 * "Next X Days" operator including current day
+				 */
+				nextDaysIncluded: new RangeOperator({
+					name: OperatorName.NEXTDAYSINCLUDED,
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_NEXTDAYSINCLUDED_FORMAT", undefined, true),
+					valueTypes: [{ name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null }, constraints: { minimum: 0 } }],
+					paramTypes: ["(\\d+)"],
+					additionalInfo: "",
+					calcRange: function(iDuration) {
+						const oResultValues = UniversalDateUtils.ranges.nextDays(iDuration - 1);
+						oResultValues[0] = UniversalDate.getInstance(UI5Date.getInstance());
+						return oResultValues;
+					}
+				}),
+				/*
+				 * "Last X Weeks" operator including current week
+				 */
+				lastWeeksIncluded: new RangeOperator({
+					name: OperatorName.LASTWEEKSINCLUDED,
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_LASTWEEKSINCLUDED_FORMAT", undefined, true),
+					valueTypes: [{ name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null }, constraints: { minimum: 0 } }],
+					paramTypes: ["(\\d+)"],
+					additionalInfo: "",
+					calcRange: function(iDuration) {
+						const oResultValues = UniversalDateUtils.ranges.lastWeeks(iDuration - 1);
+						oResultValues[1] = UniversalDate.getInstance(UI5Date.getInstance());
+						return oResultValues;
+					}
+				}),
+				/*
+				 * "Next X Weeks" operator including current week
+				 */
+				nextWeeksIncluded: new RangeOperator({
+					name: OperatorName.NEXTWEEKSINCLUDED,
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_NEXTWEEKSINCLUDED_FORMAT", undefined, true),
+					valueTypes: [{ name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null }, constraints: { minimum: 0 } }],
+					paramTypes: ["(\\d+)"],
+					additionalInfo: "",
+					calcRange: function(iDuration) {
+						const oResultValues = UniversalDateUtils.ranges.nextWeeks(iDuration  - 1);
+						oResultValues[0] = UniversalDate.getInstance(UI5Date.getInstance());
+						return oResultValues;
+					}
+				}),
+				/*
+				 * "Last X Months" operator including current month
+				 */
+				lastMonthsIncluded: new RangeOperator({
+					name: OperatorName.LASTMONTHSINCLUDED,
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_LASTMONTHSINCLUDED_FORMAT", undefined, true),
+					valueTypes: [{ name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null }, constraints: { minimum: 0 } }],
+					paramTypes: ["(\\d+)"],
+					additionalInfo: "",
+					calcRange: function(iDuration) {
+						const oResultValues = UniversalDateUtils.ranges.lastMonths(iDuration - 1);
+						oResultValues[1] = UniversalDate.getInstance(UI5Date.getInstance());
+						return oResultValues;
+					}
+				}),
+				/*
+				 * "Next X Months" operator including current month
+				 */
+				nextMonthsIncluded: new RangeOperator({
+					name: OperatorName.NEXTMONTHSINCLUDED,
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_NEXTMONTHSINCLUDED_FORMAT", undefined, true),
+					valueTypes: [{ name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null }, constraints: { minimum: 0 } }],
+					paramTypes: ["(\\d+)"],
+					additionalInfo: "",
+					calcRange: function(iDuration) {
+						const oResultValues = UniversalDateUtils.ranges.nextMonths(iDuration - 1);
+						oResultValues[0] = UniversalDate.getInstance(UI5Date.getInstance());
+						return oResultValues;
+					}
+				}),
+				/*
+				 * "Last X Quarters" operator including current quarter
+				 */
+				lastQuartersIncluded: new RangeOperator({
+					name: OperatorName.LASTQUARTERSINCLUDED,
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_LASTQUARTERSINCLUDED_FORMAT", undefined, true),
+					valueTypes: [{ name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null }, constraints: { minimum: 0 } }],
+					paramTypes: ["(\\d+)"],
+					additionalInfo: "",
+					calcRange: function(iDuration) {
+						const oResultValues = UniversalDateUtils.ranges.lastQuarters(iDuration - 1);
+						oResultValues[1] = UniversalDate.getInstance(UI5Date.getInstance());
+						return oResultValues;
+					}
+				}),
+				/*
+				 * "Next X Quarters" operator including current quarter
+				 */
+				nextQuartersIncluded: new RangeOperator({
+					name: OperatorName.NEXTQUARTERSINCLUDED,
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_NEXTQUARTERSINCLUDED_FORMAT", undefined, true),
+					valueTypes: [{ name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null }, constraints: { minimum: 0 } }],
+					paramTypes: ["(\\d+)"],
+					additionalInfo: "",
+					calcRange: function(iDuration) {
+						const oResultValues = UniversalDateUtils.ranges.nextQuarters(iDuration - 1);
+						oResultValues[0] = UniversalDate.getInstance(UI5Date.getInstance());
+						return oResultValues;
+					}
+				}),
+				/*
+				 * "Last X Years" operator including current year
+				 */
+				lastYearsIncluded: new RangeOperator({
+					name: OperatorName.LASTYEARSINCLUDED,
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_LASTYEARSINCLUDED_FORMAT", undefined, true),
+					valueTypes: [{ name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null }, constraints: { minimum: 0 } }],
+					paramTypes: ["(\\d+)"],
+					additionalInfo: "",
+					calcRange: function(iDuration) {
+						const oResultValues = UniversalDateUtils.ranges.lastYears(iDuration - 1);
+						oResultValues[1] = UniversalDate.getInstance(UI5Date.getInstance());
+						return oResultValues;
+					}
+				}),
+				/*
+				 * "Next X Years" operator including current year
+				 */
+				nextYearsIncluded: new RangeOperator({
+					name: OperatorName.NEXTYEARSINCLUDED,
+					tokenText: oMessageBundleM.getText("DYNAMIC_DATE_NEXTYEARSINCLUDED_FORMAT", undefined, true),
+					valueTypes: [{ name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null }, constraints: { minimum: 0 } }],
+					paramTypes: ["(\\d+)"],
+					additionalInfo: "",
+					calcRange: function(iDuration) {
+						const oResultValues = UniversalDateUtils.ranges.nextYears(iDuration - 1);
+						oResultValues[0] = UniversalDate.getInstance(UI5Date.getInstance());
+						return oResultValues;
+					}
 				})
 
 			},
@@ -1931,27 +2207,35 @@ sap.ui.define([
 				FilterOperatorUtil._mOperators.lastDayYear,
 				FilterOperatorUtil._mOperators.todayFromTo,
 				FilterOperatorUtil._mOperators.lastDays,
+				FilterOperatorUtil._mOperators.lastDaysIncluded,
 				FilterOperatorUtil._mOperators.nextDays,
+				FilterOperatorUtil._mOperators.nextDaysIncluded,
 
 				FilterOperatorUtil._mOperators.thisWeek,
 				FilterOperatorUtil._mOperators.lastWeek,
 				FilterOperatorUtil._mOperators.lastWeeks,
+				FilterOperatorUtil._mOperators.lastWeeksIncluded,
 				FilterOperatorUtil._mOperators.nextWeek,
 				FilterOperatorUtil._mOperators.nextWeeks,
+				FilterOperatorUtil._mOperators.nextWeeksIncluded,
 
 				FilterOperatorUtil._mOperators.specificMonth,
 				FilterOperatorUtil._mOperators.specificMonthInYear,
 				FilterOperatorUtil._mOperators.thisMonth,
 				FilterOperatorUtil._mOperators.lastMonth,
 				FilterOperatorUtil._mOperators.lastMonths,
+				FilterOperatorUtil._mOperators.lastMonthsIncluded,
 				FilterOperatorUtil._mOperators.nextMonth,
 				FilterOperatorUtil._mOperators.nextMonths,
+				FilterOperatorUtil._mOperators.nextMonthsIncluded,
 
 				FilterOperatorUtil._mOperators.thisQuarter,
 				FilterOperatorUtil._mOperators.lastQuarter,
 				FilterOperatorUtil._mOperators.lastQuarters,
+				FilterOperatorUtil._mOperators.lastQuartersIncluded,
 				FilterOperatorUtil._mOperators.nextQuarter,
 				FilterOperatorUtil._mOperators.nextQuarters,
+				FilterOperatorUtil._mOperators.nextQuartersIncluded,
 
 				FilterOperatorUtil._mOperators.quarter1,
 				FilterOperatorUtil._mOperators.quarter2,
@@ -1961,8 +2245,10 @@ sap.ui.define([
 				FilterOperatorUtil._mOperators.thisYear,
 				FilterOperatorUtil._mOperators.lastYear,
 				FilterOperatorUtil._mOperators.lastYears,
+				FilterOperatorUtil._mOperators.lastYearsIncluded,
 				FilterOperatorUtil._mOperators.nextYear,
 				FilterOperatorUtil._mOperators.nextYears,
+				FilterOperatorUtil._mOperators.nextYearsIncluded,
 
 				FilterOperatorUtil._mOperators.yearToDate,
 				FilterOperatorUtil._mOperators.dateToYear
@@ -1986,9 +2272,13 @@ sap.ui.define([
 				FilterOperatorUtil._mOperators.notGreaterEqual,
 
 				FilterOperatorUtil._mOperators.lastMinutes,
+				FilterOperatorUtil._mOperators.lastMinutesIncluded,
 				FilterOperatorUtil._mOperators.nextMinutes,
+				FilterOperatorUtil._mOperators.nextMinutesIncluded,
 				FilterOperatorUtil._mOperators.lastHours,
+				FilterOperatorUtil._mOperators.lastHoursIncluded,
 				FilterOperatorUtil._mOperators.nextHours,
+				FilterOperatorUtil._mOperators.nextHoursIncluded,
 
 				FilterOperatorUtil._mOperators.today,
 				FilterOperatorUtil._mOperators.yesterday,
@@ -2003,27 +2293,35 @@ sap.ui.define([
 				FilterOperatorUtil._mOperators.lastDayYear,
 				FilterOperatorUtil._mOperators.todayFromTo,
 				FilterOperatorUtil._mOperators.lastDays,
+				FilterOperatorUtil._mOperators.lastDaysIncluded,
 				FilterOperatorUtil._mOperators.nextDays,
+				FilterOperatorUtil._mOperators.nextDaysIncluded,
 
 				FilterOperatorUtil._mOperators.thisWeek,
 				FilterOperatorUtil._mOperators.lastWeek,
 				FilterOperatorUtil._mOperators.lastWeeks,
+				FilterOperatorUtil._mOperators.lastWeeksIncluded,
 				FilterOperatorUtil._mOperators.nextWeek,
 				FilterOperatorUtil._mOperators.nextWeeks,
+				FilterOperatorUtil._mOperators.nextWeeksIncluded,
 
 				FilterOperatorUtil._mOperators.specificMonth,
 				FilterOperatorUtil._mOperators.specificMonthInYear,
 				FilterOperatorUtil._mOperators.thisMonth,
 				FilterOperatorUtil._mOperators.lastMonth,
 				FilterOperatorUtil._mOperators.lastMonths,
+				FilterOperatorUtil._mOperators.lastMonthsIncluded,
 				FilterOperatorUtil._mOperators.nextMonth,
 				FilterOperatorUtil._mOperators.nextMonths,
+				FilterOperatorUtil._mOperators.nextMonthsIncluded,
 
 				FilterOperatorUtil._mOperators.thisQuarter,
 				FilterOperatorUtil._mOperators.lastQuarter,
 				FilterOperatorUtil._mOperators.lastQuarters,
+				FilterOperatorUtil._mOperators.lastQuartersIncluded,
 				FilterOperatorUtil._mOperators.nextQuarter,
 				FilterOperatorUtil._mOperators.nextQuarters,
+				FilterOperatorUtil._mOperators.nextQuartersIncluded,
 
 				FilterOperatorUtil._mOperators.quarter1,
 				FilterOperatorUtil._mOperators.quarter2,
@@ -2033,8 +2331,10 @@ sap.ui.define([
 				FilterOperatorUtil._mOperators.thisYear,
 				FilterOperatorUtil._mOperators.lastYear,
 				FilterOperatorUtil._mOperators.lastYears,
+				FilterOperatorUtil._mOperators.lastYearsIncluded,
 				FilterOperatorUtil._mOperators.nextYear,
 				FilterOperatorUtil._mOperators.nextYears,
+				FilterOperatorUtil._mOperators.nextYearsIncluded,
 
 				FilterOperatorUtil._mOperators.yearToDate,
 				FilterOperatorUtil._mOperators.dateToYear
@@ -2150,6 +2450,13 @@ sap.ui.define([
 			return iIndex;
 		}
 
+		function _getMonthRegExp() {
+			if (!this._sMonthRegExp) {
+				const aMonths = _getMonths.apply(this);
+				this._sMonthRegExp = "(" + aMonths.join("|") + "|[1-9]|1[0-2])";
+			}
+			return this._sMonthRegExp;
+		}
 
 		let bCreatingMonthValueHelp = false;