@sapui5/sap.rules.ui 1.110.1 → 1.111.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.rules.ui",
-  "version": "1.110.1",
+  "version": "1.111.0",
   "description": "SAPUI5 Library sap.rules.ui",
   "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
   "author": "SAP SE (https://www.sap.com)",

package/src/sap/rules/ui/.library

@@ -7,7 +7,7 @@
 
 		(c) Copyright 2009-2016 SAP SE. All rights reserved
 	</copyright>
-	<version>1.110.1</version>
+	<version>1.111.0</version>
 
 	<documentation>UI5 library: sap.rules.ui</documentation>
 

package/src/sap/rules/ui/AstExpressionBasic.js

@@ -1073,6 +1073,10 @@ sap.ui.define([
 				}
 
 				if (currentText !== lastText) {
+					if(lastText? lastText.trim() == "" : true && currentText.trim() == ""){
+						this.textContent = "";
+						return;
+					}
 					that.bTypingFlow = true;
 					//needed when shift and some key has been keyed up at same time
 					if (((event.keyCode !== 8 && event.keyCode !== 46) && keyCodes.indexOf(event.keyCode) === -1) || (event.key === "Shift" && that
@@ -2799,7 +2803,9 @@ sap.ui.define([
 							Log.error("Error in parsing string to JSON: " + e.message);
 						}
 					}
-					this._uiModel.push(item);
+					if(!(this.getDomRef("input").children && this.getDomRef("input").children.length == 1 && this.getDomRef("input").children[0].outerHTML == "<br>")){
+						this._uiModel.push(item);
+					}
 				}
 				that._uiModeltoString();
 			}

package/src/sap/rules/ui/BindingSpy.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends  ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.110.1
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/rules/ui/Constants.js

@@ -37,6 +37,46 @@ sap.ui.define(function() {
 	Constants.UP = "UP";
 	Constants.DOWN = "DOWN";
 	Constants.CONDITION = "CONDITION";
+	Constants.OPERATOR_MAPPING = [{valueHelpType:"U",operator:"EQ",exclude:false,supported:true,message:"equal to"},
+		{valueHelpType:"O",operator:"EQ",exclude:false,supported:true,message:"equal to"},
+		{valueHelpType:"U",operator:"Contains",exclude:false,supported:true,message:"contains"},
+		{valueHelpType:"O",operator:"Contains",exclude:false,supported:true,message:"contains"},
+		{valueHelpType:"U",operator:"EQ",exclude:true,supported:true,message:"equal to"},
+		{valueHelpType:"O",operator:"EQ",exclude:true,supported:true,message:"equal to"},
+		{valueHelpType:"U",operator:"Contains",exclude:true,supported:false,message:"does not contain"},
+		{valueHelpType:"O",operator:"Contains",exclude:true,supported:false,message:"does not contain"},
+		{valueHelpType:"U",operator:"BT",exclude:false,supported:true,message:"between"},
+		{valueHelpType:"O",operator:"BT",exclude:false,supported:false,message:"between"},
+		{valueHelpType:"U",operator:"BT",exclude:true,supported:false,message:"not between"},
+		{valueHelpType:"O",operator:"BT",exclude:true,supported:false,message:"not between"},
+		{valueHelpType:"U",operator:"StartsWith",exclude:false,supported:false,message:"starts with"},
+		{valueHelpType:"O",operator:"StartsWith",exclude:false,supported:false,message:"starts with"},
+		{valueHelpType:"U",operator:"StartsWith",exclude:true,supported:false,message:"does not start with"},
+		{valueHelpType:"O",operator:"StartsWith",exclude:true,supported:false,message:"does not start with"},
+		{valueHelpType:"U",operator:"EndsWith",exclude:false,supported:false,message:"ends with"},
+		{valueHelpType:"O",operator:"EndsWith",exclude:false,supported:false,message:"ends with"},
+		{valueHelpType:"U",operator:"EndsWith",exclude:true,supported:false,message:"does not end with"},
+		{valueHelpType:"O",operator:"EndsWith",exclude:true,supported:false,message:"does not end with"},
+		{valueHelpType:"U",operator:"LT",exclude:false,supported:true,message:"less than"},
+		{valueHelpType:"O",operator:"LT",exclude:false,supported:false,message:"less than"},
+		{valueHelpType:"U",operator:"LT",exclude:true,supported:true,message:"not less than"},
+		{valueHelpType:"O",operator:"LT",exclude:true,supported:false,message:"not less than"},
+		{valueHelpType:"U",operator:"LE",exclude:false,supported:true,message:"less than equal to"},
+		{valueHelpType:"O",operator:"LE",exclude:false,supported:false,message:"less than equal to"},
+		{valueHelpType:"U",operator:"LE",exclude:true,supported:true,message:"not less than equal to"},
+		{valueHelpType:"O",operator:"LE",exclude:true,supported:false,message:"not less than equal to"},
+		{valueHelpType:"U",operator:"GT",exclude:false,supported:true,message:"greater than"},
+		{valueHelpType:"O",operator:"GT",exclude:false,supported:false,message:"greater than"},
+		{valueHelpType:"U",operator:"GT",exclude:true,supported:true,message:"not greater than"},
+		{valueHelpType:"O",operator:"GT",exclude:true,supported:false,message:"not greater than"},
+		{valueHelpType:"U",operator:"GE",exclude:false,supported:true,message:"greater than equal to"},
+		{valueHelpType:"O",operator:"GE",exclude:false,supported:false,message:"greater than equal to"},
+		{valueHelpType:"U",operator:"GE",exclude:true,supported:true,message:"not greater than equal to"},
+		{valueHelpType:"O",operator:"GE",exclude:true,supported:false,message:"not greater than equal to"},
+		{valueHelpType:"U",operator:"Empty",exclude:false,supported:false,message:"empty"},
+		{valueHelpType:"O",operator:"Empty",exclude:false,supported:false,message:"empty"},
+		{valueHelpType:"U",operator:"Empty",exclude:true,supported:false,message:"not empty"},
+		{valueHelpType:"O",operator:"Empty",exclude:true,supported:false,message:"not empty"}];
 	return Constants;
 	
 }, true);

package/src/sap/rules/ui/DecisionTable.js

@@ -58,7 +58,7 @@ sap.ui.define([
      * @extends  Control
      *
      * @author SAP SE
-     * @version 1.110.1
+     * @version 1.111.0
      *
      * @constructor
      * @private

package/src/sap/rules/ui/DecisionTableCell.js

@@ -35,7 +35,7 @@ sap.ui.define([
          * @extends  sap.ui.core.Control
          *
          * @author SAP SE
-         * @version 1.110.1
+         * @version 1.111.0
          *
          * @constructor
          * @public

package/src/sap/rules/ui/DecisionTableCellAstExpressionBasic.js

@@ -27,7 +27,7 @@ sap.ui.define([
      * @extends  sap.rules.ui.AstExpressionBasic
      *
      * @author SAP SE
-     * @version 1.110.1
+     * @version 1.111.0
      *
      * @constructor
      * @private
@@ -128,7 +128,7 @@ sap.ui.define([
 
     };
 
-    DecisionTableCellAstExpressionBasic.prototype._updateModelAstNodes = function (oModel, oColumnData) {
+    DecisionTableCellAstExpressionBasic.prototype._updateModelAstNodes = function (oModel, oColumnData, sGroupId) {
         if (this.oDecisionTableCell) {
             var astNodes = oColumnData.ASTNodes;
             for (var node in astNodes) {
@@ -163,13 +163,13 @@ sap.ui.define([
 
                 var mParameters = {};
                 mParameters.properties = updatedAstNode;
-                mParameters.groupId = "changes";
+                mParameters.groupId = sGroupId;
                 oModel.createEntry("/DecisionTableRowCellASTs", mParameters);
             }
         }
     };
 
-    DecisionTableCellAstExpressionBasic.prototype._removeExistingAstNodes = function (oModel, oColumnData, sPath, astNodes) {
+    DecisionTableCellAstExpressionBasic.prototype._removeExistingAstNodes = function (oModel, oColumnData, sPath, astNodes, sGroupId) {
 		if (this.oDecisionTableCell) {
 			var mParameters = {};
 			mParameters.ColId = oColumnData.ColId;
@@ -199,7 +199,7 @@ sap.ui.define([
 
 			oModel.callFunction("/DeleteDTRowCellASTDraft", {
 				method: "POST",
-				groupId: "changes",
+				groupId: sGroupId,
 				urlParameters: mParameters
 			});
 
@@ -222,22 +222,23 @@ sap.ui.define([
     };
 
     DecisionTableCellAstExpressionBasic.prototype._removeAndUpdateExisitingNodes = function (oModel, oData, sPath, astNodes,sCellContentPath) {
-		oModel.setDeferredGroups(["changes"]);
+	    	var sGroupId = oData.RowId + "," + oData.ColId;
+		oModel.setDeferredGroups([sGroupId]);
 		var oEventBus = sap.ui.getCore().getEventBus();
 		oModel.update(sPath, {
 			"Content": oModel.getProperty(sCellContentPath)
 		}, {
-			groupId: "changes",
+			groupId: sGroupId,
 			success: function (oData) {
                 oEventBus.publish("sap.ui.rules", "astCreated");
             }
 		});
-		this._removeExistingAstNodes(oModel, oData, sPath, astNodes);
+		this._removeExistingAstNodes(oModel, oData, sPath, astNodes, sGroupId);
 		if (this._checkEmptyMarkerNode(astNodes)) {
-			this._updateModelAstNodes(oModel, oData);
+			this._updateModelAstNodes(oModel, oData, sGroupId);
 		}
 		oModel.submitChanges({
-			groupId: "changes"
+			groupId: sGroupId
 		});
 	};
 
@@ -266,9 +267,8 @@ sap.ui.define([
 			var sCellContentPath = this.oDecisionTableCell.getValuePath();
 			var sPath = "/" + sCellContentPath.split("/")[1];
 			oEventBus.publish("sap.ui.rules", "astCreating");
-			if (!oModel.hasPendingChanges()) {
-				this._removeAndUpdateExisitingNodes(oModel, oData, sPath, astNodes,sCellContentPath);
-			}
+			this._removeAndUpdateExisitingNodes(oModel, oData, sPath, astNodes,sCellContentPath);
+			
 		}
 	};
 

package/src/sap/rules/ui/DecisionTableCellExpressionAdvanced.js

@@ -27,7 +27,7 @@ sap.ui.define([
 		 * @extends  sap.rules.ui.ExpressionAdvanced
 		 *
 		 * @author SAP SE
-		 * @version 1.110.1
+		 * @version 1.111.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/rules/ui/DecisionTableCellExpressionBasic.js

@@ -26,7 +26,7 @@ sap.ui.define([
      * @extends  sap.rules.ui.ExpressionBasic
      *
      * @author SAP SE
-     * @version 1.110.1
+     * @version 1.111.0
      *
      * @constructor
      * @private

package/src/sap/rules/ui/DecisionTableConfiguration.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.110.1
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/rules/ui/DecisionTableSettings.js

@@ -44,7 +44,7 @@ sap.ui.define([
          * @extends  Control
          *
          * @author SAP SE
-         * @version 1.110.1
+         * @version 1.111.0
          *
          * @constructor
          * @private

package/src/sap/rules/ui/DecisionTableSettingsOld.js

@@ -38,7 +38,7 @@ sap.ui.define([
          * @extends  Control
          *
          * @author SAP SE
-         * @version 1.110.1
+         * @version 1.111.0
          *
          * @constructor
          * @private

package/src/sap/rules/ui/ExpressionBase.js

@@ -22,7 +22,7 @@ sap.ui.define([
     * @extends sap.ui.core.Control
     *
     * @author SAP SE
-    * @version 1.110.1
+    * @version 1.111.0
     *
     * @constructor
     * @private

package/src/sap/rules/ui/ExpressionBasic.js

@@ -26,7 +26,7 @@ sap.ui.define([
      * @extends  Control
      *
      * @author SAP SE
-     * @version 1.110.1
+     * @version 1.111.0
      *
      * @constructor
      * @private

package/src/sap/rules/ui/RuleBase.js

@@ -24,7 +24,7 @@ sap.ui.define([
      * @extends  Control
      *
      * @author SAP SE
-     * @version 1.110.1
+     * @version 1.111.0
      *
      * @constructor
      * @private

package/src/sap/rules/ui/RuleBuilder.js

@@ -34,7 +34,7 @@ sap.ui.define([
      * @extends sap.ui.core.Control
      *
      * @author SAP SE
-     * @version 1.110.1
+     * @version 1.111.0
      *
      * @constructor
      * @public

package/src/sap/rules/ui/TextRule.js

@@ -47,7 +47,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 		 * @extends  Control
 		 *
 		 * @author SAP SE
-		 * @version 1.110.1
+		 * @version 1.111.0
 		 *
 		 * @constructor
 		 * @private
@@ -162,6 +162,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 			_addConditionSuccess: function (newCondition, that, data) {
 				var sNumbering;
 				var nNewIndex;
+				var bConditionCreated = false;
 				var sConditionId = newCondition.Id;
 				var oDataModel = that._getModel();
 				var oHeaderKey = {
@@ -190,6 +191,18 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 							var oElsePanel = that._createElseFormLayout(oContext, that.oBundle.getText("titleElse"), true);
 							oVerticalLayout.removeContent(data.nIndex);
 							oVerticalLayout.insertContent(oElsePanel, data.nIndex);
+							oElsePanel.addEventDelegate({
+							    onAfterRendering: function(){
+							    	if (data && data.bfirst && !bConditionCreated && oElsePanel.getContent().length > 0 && oElsePanel.getContent()[0].getFormContainers() && 
+							    			oElsePanel.getContent()[0].getFormContainers().length > 0 && oElsePanel.getContent()[0].getFormContainers()[0].getFormElements() &&
+							    			oElsePanel.getContent()[0].getFormContainers()[0].getFormElements().length > 0 && oElsePanel.getContent()[0].getFormContainers()[0].getFormElements()[0].getFields() &&
+							    			oElsePanel.getContent()[0].getFormContainers()[0].getFormElements()[0].getFields().length > 0 && 
+							    			oElsePanel.getContent()[0].getFormContainers()[0].getFormElements()[0].getFields()[0]._input) {
+							    		oElsePanel.getContent()[0].getFormContainers()[0].getFormElements()[0].getFields()[0]._input.focus();
+										bConditionCreated = true;
+									}
+							    }
+							});
 						} else if (response.Type === that.typeElseIf) {
 							that.getModel("displayModel").getProperty("/textRuleConditions/ElseIf").push(response);
 							if (data.bfirst) {
@@ -202,6 +215,18 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 							var oElseIfPanel = that._createFormLayout(oContext, that.oBundle.getText("titleElseIf") + sNumbering, true);
 							oVerticalLayout.insertContent(oElseIfPanel, nNewIndex);
 							that._adjustElseIfTitle(data.verticalLayout, nNewIndex, true);
+							oElseIfPanel.addEventDelegate({
+							    onAfterRendering: function(){
+							    	if (data && data.bfirst && !bConditionCreated && oElseIfPanel.getContent().length > 0 && oElseIfPanel.getContent()[0].getFormContainers() && 
+							    			oElseIfPanel.getContent()[0].getFormContainers().length > 0 && oElseIfPanel.getContent()[0].getFormContainers()[0].getFormElements() &&
+							    			oElseIfPanel.getContent()[0].getFormContainers()[0].getFormElements().length > 0 && oElseIfPanel.getContent()[0].getFormContainers()[0].getFormElements()[0].getFields() &&
+							    			oElseIfPanel.getContent()[0].getFormContainers()[0].getFormElements()[0].getFields().length > 0 && 
+							    			oElseIfPanel.getContent()[0].getFormContainers()[0].getFormElements()[0].getFields()[0]._input) {
+							    		oElseIfPanel.getContent()[0].getFormContainers()[0].getFormElements()[0].getFields()[0]._input.focus();
+										bConditionCreated = true;
+									}
+							    }
+							});
 						}
 						that._isAddCallInProgress = false;
 						that._updateBusyState(false);
@@ -437,7 +462,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 						tooltip: this.oBundle.getText("deleteElseIf"),
 						visible: "{TextRuleModel>/editable}",
 						press: function (oEvent) {
-							that._deleteConditionBlock(oEvent);
+							that.showDeleteConfirmationDialogMessage(oEvent.getSource());
 						}
 					}).setBindingContext(oContext);
 
@@ -472,7 +497,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 					tooltip: this.oBundle.getText("deleteElse"),
 					visible: "{TextRuleModel>/editable}",
 					press: function (oEvent) {
-						that._deleteConditionBlock(oEvent);
+						that.showDeleteConfirmationDialogMessage(oEvent.getSource());
 					}
 				}).setBindingContext(oContext);
 
@@ -511,6 +536,35 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 				return oPanel;
 			},
 
+			showDeleteConfirmationDialogMessage: function(oSource) {
+				var that = this;
+				var oDialog = new Dialog({	
+					title: this.oBundle.getText("warning_title"),	
+					type: sap.m.DialogType.Message,	
+					state: sap.ui.core.ValueState.Warning,	
+					content: new Text({	
+						text: this.oBundle.getText("condition_delete_confirmation_message")	
+					}),	
+					afterClose: function() {	
+						oDialog.destroy();	
+					}	
+				});	
+				oDialog.setBeginButton(new Button({	
+					text: this.oBundle.getText("textrule_confirmation_dialog_delete"),
+					press: function() {	
+						that._deleteConditionBlock(oSource)	
+						oDialog.close();
+					}
+				}));	
+				oDialog.setEndButton(new Button({	
+					text: this.oBundle.getText("textrule_confirmation_dialog_cancel"),	
+					press: function() {
+						oDialog.close();
+					}
+				}));	
+				oDialog.open();	
+			},
+
 			/*
 			 * Returns If form container
 			 */
@@ -633,10 +687,9 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 			 * Deletes based on Binding path
 			 * Vertical layout content deleted based on its index
 			 */
-			_deleteConditionBlock: function (oEvent) {
+			_deleteConditionBlock: function (oSource) {
 				var that = this;
 				var oDataModel = this._getModel();
-				var oSource = oEvent.getSource();
 				var oPanel = oSource.getParent().getParent();
 				var oVerticalLayout = oPanel.getParent();
 				var nIndex = oVerticalLayout.indexOfContent(oPanel);
@@ -644,6 +697,8 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 				var sConditionId = oBindingContext.getProperty("Id");
 				var sType = oBindingContext.getProperty("Type");
 				var sKeyText;
+				var initialConditionCount = oVerticalLayout.getContent().length;
+				var bConditionDeleted = false;
 				if (sType === that.typeElse) {
 					sKeyText = "/TextRuleDefaultBranches";
 				} else if (sType === that.typeElseIf) {
@@ -682,6 +737,23 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 						that._adjustElseIfTitle(oVerticalLayout, nIndex, false);
 					} /* eslint-enable */
 					that._updateBusyState(false);
+					oVerticalLayout.addEventDelegate({
+					    onAfterRendering: function(){
+					    	if(!bConditionDeleted) {
+					    		if (initialConditionCount === 3 && (nIndex === 1 || nIndex === 2)){
+					    			oVerticalLayout.getContent()[nIndex].getContent()[0].focus();
+					    		} else if(nIndex === initialConditionCount-2 && oVerticalLayout.getContent().length > 0 && oVerticalLayout.getContent()[nIndex] && 
+					    				oVerticalLayout.getContent()[nIndex].getContent().length > 0 && oVerticalLayout.getContent()[nIndex].getContent()[0].getMetadata().getName() 
+					    				=== "sap.m.Button") {
+					    			oVerticalLayout.getContent()[initialConditionCount-2].getContent()[0].focus()
+					    		} else if(oVerticalLayout.getContent().length > 0 && oVerticalLayout.getContent()[nIndex] && 
+					    				oVerticalLayout.getContent()[nIndex].getContent().length > 0 && oVerticalLayout.getContent()[nIndex].getContent()[0].getFormContainers().length > 0) {
+					    			oVerticalLayout.getContent()[nIndex].getContent()[0].getFormContainers()[0].getFormElements()[0].getFields()[0]._input.focus();
+					    		}
+					    		bConditionDeleted = true;
+					    	}
+					    }
+					});
 					sap.m.MessageToast.show(that.oBundle.getText("branchDeletedSuccess"));
 				};
 

package/src/sap/rules/ui/TextRuleConfiguration.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.110.1
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/rules/ui/TextRuleSettings.js

@@ -45,7 +45,7 @@ sap.ui.define([
          * @extends  Control
          *
          * @author SAP SE
-         * @version 1.110.1
+         * @version 1.111.0
          *
          * @constructor
          * @private

package/src/sap/rules/ui/ast/autoCompleteContent/AutoSuggestionFixedValuePanel.js

@@ -331,8 +331,7 @@ sap.ui.define([
             }
             if (this._dateBusinessDataType === "D") {
                 formatter = sap.ui.core.format.DateFormat.getDateInstance({
-                    pattern: "yyyy-MM-dd",
-                    UTC:true
+                    pattern: "yyyy-MM-dd"
                 });
                 sDateFormatted = formatter.format(date);
             } else if (this._dateBusinessDataType === "U") {
@@ -363,7 +362,7 @@ sap.ui.define([
 
 				},
 				filterChange: function (oEvent) {
-					that.setValueStateFilter(oEvent);
+					that.setValueStateFilter(oEvent, valueHelpInfo);
 				},
 				controlConfiguration: [that._createControlConfiguration()]
 			});
@@ -657,18 +656,56 @@ sap.ui.define([
 			});
 		},
 
-		setValueStateFilter: function (oEvent) {
-			var sId = oEvent.getSource().sId;
-			this._valueFieldValue = sap.ui.getCore().byId(sId + "-filterItemControlA_-Value");
-			if (this._valueFieldValue) {
-				this._valueFieldValue.setValueState("None");
-				this._valueFieldValue.setValueStateText("");
+		setValueStateFilter: function (oEvent, valueHelpInfo) {
+			var aFilterFields = oEvent.getSource().getAllFilterItems();
+			var aFilterValues = oEvent.getSource().getFilterData();
+			
+			for (var i=0;i<aFilterFields.length; i++){
+				if(aFilterFields[i].getName() === "Value" && aFilterValues && aFilterValues.Value && aFilterValues.Value.ranges) {
+					var unsupportedOperatorsValueError = this.filterUnSupportedOperator(aFilterValues.Value.ranges, valueHelpInfo);
+					if (unsupportedOperatorsValueError) {
+						aFilterFields[i].getControl().setValueState("Error");
+						aFilterFields[i].getControl().setValueStateText(unsupportedOperatorsValueError);
+					} else {
+						aFilterFields[i].getControl().setValueState("None");
+						aFilterFields[i].getControl().setValueStateText("");
+					}
+				} else if(aFilterFields[i].getName() === "Description" && aFilterValues && aFilterValues.Description && aFilterValues.Description.ranges) {
+					var unsupportedOperatorsDescriptionError = this.filterUnSupportedOperator(aFilterValues.Description.ranges, valueHelpInfo);
+					if (unsupportedOperatorsDescriptionError) {
+						aFilterFields[i].getControl().setValueState("Error");
+						aFilterFields[i].getControl().setValueStateText(unsupportedOperatorsDescriptionError);
+					} else {
+						aFilterFields[i].getControl().setValueState("None");
+						aFilterFields[i].getControl().setValueStateText("");
+					}
+				} else if(aFilterFields[i].getName() === "Value") {
+						aFilterFields[i].getControl().setValueState("None");
+						aFilterFields[i].getControl().setValueStateText("");
+				} else if(aFilterFields[i].getName() === "Description") {
+						aFilterFields[i].getControl().setValueState("None");
+						aFilterFields[i].getControl().setValueStateText("");
+				}
 			}
-			this._valueFieldDescription = sap.ui.getCore().byId(sId + "-filterItemControlA_-Description");
-			if (this._valueFieldDescription) {
-				this._valueFieldDescription.setValueState("None");
-				this._valueFieldDescription.setValueStateText("");
+		},
+		
+		filterUnSupportedOperator: function(aRanges, valueHelpInfo) {
+			var aUnSupportedOperator = [];
+			var sUnSupportedOperatorError = "";
+			for(var i=0;i<aRanges.length;i++) {
+				var currentMapping = Constants.OPERATOR_MAPPING.find(function(oItem){
+					return aRanges[i].operation === oItem.operator && aRanges[i].exclude === oItem.exclude && valueHelpInfo.sourceType === oItem.valueHelpType
+				})
+				if (!currentMapping.supported && aUnSupportedOperator.indexOf("'" + currentMapping.message + "'") === -1) {
+					aUnSupportedOperator.push("'" + currentMapping.message + "'");
+				}
 			}
+			if (aUnSupportedOperator.length > 1) {
+				sUnSupportedOperatorError = aUnSupportedOperator.join(",") + " are not supported";
+			} else if (aUnSupportedOperator.length === 1) {
+				sUnSupportedOperatorError = aUnSupportedOperator.join(",") + " is not supported";
+			}
+			return sUnSupportedOperatorError;
 		},
 
 		_formatText: function (oEvent) {
@@ -793,8 +830,7 @@ sap.ui.define([
             }
             if (this._dateBusinessDataType === "D") {
                 formatter = sap.ui.core.format.DateFormat.getDateInstance({
-                    pattern: "yyyy-MM-dd",
-                    UTC:true
+                    pattern: "yyyy-MM-dd"
                 });
                 sDateFormatted = formatter.format(date);
             } else if (this._dateBusinessDataType === "U") {

package/src/sap/rules/ui/ast/parser/bundle.js

@@ -10788,7 +10788,7 @@ var ASTUtil = (function () {
 			for (var node in jsonObjects) {
 				var businessDataType = jsonObjects[node].Output ? jsonObjects[node].Output.BusinessDataType : null;
 			    if(businessDataType === "D"){
-					jsonObjects[node].formattedValue = "'" + dateFormat.format(new Date(jsonObjects[node].Value.replace(/\'/g, "")), false) + "'";
+					jsonObjects[node].formattedValue = "'" + dateFormat.format(new Date(jsonObjects[node].Value.replace(/\'/g, "")), true) + "'";
 						}
 			    if(businessDataType === "U"){
 					jsonObjects[node].formattedValue = "'" + timeFormat.format(new Date(jsonObjects[node].Value.replace(/\'/g, "")), false) + "'";

package/src/sap/rules/ui/i18n/messagebundle.properties

@@ -603,3 +603,11 @@ quarter=quarter
 value=Value
 # XFLD: Text for ValueHelp column Description
 description=Description
+# XBUT: Yes Button text for Delete confirmation.
+textrule_confirmation_dialog_delete=Delete
+# XBUT: NO button text for Delete confirmation close.
+textrule_confirmation_dialog_cancel=Cancel
+# XFLD: Text for time and Duration Dialog
+condition_delete_confirmation_message=Delete this condition?
+# XFLD: Dialog title
+warning_title=Delete

package/src/sap/rules/ui/i18n/messagebundle_ar.properties

@@ -295,3 +295,7 @@ week=\u0623\u0633\u0628\u0648\u0639
 quarter=\u0631\u0628\u0639 \u0633\u0646\u0629
 value=\u0627\u0644\u0642\u064A\u0645\u0629
 description=\u0627\u0644\u0648\u0635\u0641
+textrule_confirmation_dialog_delete=\u062D\u0630\u0641
+textrule_confirmation_dialog_cancel=\u0625\u0644\u063A\u0627\u0621
+condition_delete_confirmation_message=\u0647\u0644 \u062A\u0631\u064A\u062F \u062D\u0630\u0641 \u0647\u0630\u0627 \u0627\u0644\u0634\u0631\u0637\u061F
+warning_title=\u062D\u0630\u0641

package/src/sap/rules/ui/i18n/messagebundle_bg.properties

@@ -295,3 +295,7 @@ week=\u0441\u0435\u0434\u043C\u0438\u0446\u0430
 quarter=\u0442\u0440\u0438\u043C\u0435\u0441\u0435\u0447\u0438\u0435
 value=\u0421\u0442\u043E\u0439\u043D\u043E\u0441\u0442
 description=\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435
+textrule_confirmation_dialog_delete=\u0418\u0437\u0442\u0440\u0438\u0432\u0430\u043D\u0435
+textrule_confirmation_dialog_cancel=\u041E\u0442\u043A\u0430\u0437
+condition_delete_confirmation_message=\u0418\u0437\u0442\u0440\u0438\u0432\u0430\u043D\u0435 \u043D\u0430 \u0442\u043E\u0432\u0430 \u0443\u0441\u043B\u043E\u0432\u0438\u0435?
+warning_title=\u0418\u0437\u0442\u0440\u0438\u0432\u0430\u043D\u0435

package/src/sap/rules/ui/i18n/messagebundle_ca.properties

@@ -295,3 +295,7 @@ week=setmana
 quarter=trimestre
 value=Valor
 description=Descripci\u00F3
+textrule_confirmation_dialog_delete=Suprimir
+textrule_confirmation_dialog_cancel=Cancel\u00B7lar
+condition_delete_confirmation_message=Voleu suprimir aquesta condici\u00F3?
+warning_title=Suprimir

package/src/sap/rules/ui/i18n/messagebundle_cs.properties

@@ -147,7 +147,7 @@ invalidExpression=Ne\u00FApln\u00FD nebo neplatn\u00FD v\u00FDraz.
 invalidAttribute=Zadan\u00FD atribut je neplatn\u00FD.
 duplicateAttribute=Atribut je ji\u017E vybr\u00E1n.
 ctrlSpaceCue=Pro vyvol\u00E1n\u00ED n\u00E1vrh\u016F pou\u017Eijte Ctrl+Space
-optionSpaceCue=Use Option+Space to get suggestions
+optionSpaceCue=Pro vyvol\u00E1n\u00ED n\u00E1vrh\u016F pou\u017Eijte Option+Space
 StructureElementNotSupported=Agrega\u010Dn\u00ED funkce nejsou podporov\u00E1ny u datov\u00FDch objekt\u016F typu struktura, geometrie, prvek a pravidla s prvkem jako v\u00FDsledn\u00FDm datov\u00FDm objektem.
 errorCreating=Chyba vytv\u00E1\u0159en\u00ED.
 errorDeleting=Chyba odstra\u0148ov\u00E1n\u00ED.
@@ -295,3 +295,7 @@ week=t\u00FDden
 quarter=\u010Dtvrtlet\u00ED
 value=Hodnota
 description=Popis
+textrule_confirmation_dialog_delete=Odstranit
+textrule_confirmation_dialog_cancel=Zru\u0161it
+condition_delete_confirmation_message=Odstranit tuto podm\u00EDnku?
+warning_title=Odstranit

package/src/sap/rules/ui/i18n/messagebundle_cy.properties

@@ -295,3 +295,7 @@ week=wythnos
 quarter=chwarter
 value=Gwerth
 description=Disgrifiad
+textrule_confirmation_dialog_delete=Dileu
+textrule_confirmation_dialog_cancel=Canslo
+condition_delete_confirmation_message=Dileu'r amod hwn?
+warning_title=Dileu

package/src/sap/rules/ui/i18n/messagebundle_da.properties

@@ -295,3 +295,7 @@ week=uge
 quarter=kvartal
 value=V\u00E6rdi
 description=Beskrivelse
+textrule_confirmation_dialog_delete=Slet
+textrule_confirmation_dialog_cancel=Afbryd
+condition_delete_confirmation_message=Slet denne betingelse
+warning_title=Slet

package/src/sap/rules/ui/i18n/messagebundle_de.properties

@@ -147,7 +147,7 @@ invalidExpression=Unvollst\u00E4ndiger oder ung\u00FCltiger Ausdruck.
 invalidAttribute=Eingegebenes Attribut ist ung\u00FCltig.
 duplicateAttribute=Attribut ist bereits ausgew\u00E4hlt.
 ctrlSpaceCue=W\u00E4hlen Sie Strg+Leertaste f\u00FCr die Anzeige von Vorschl\u00E4gen.
-optionSpaceCue=Use Option+Space to get suggestions
+optionSpaceCue=W\u00E4hlen Sie Option+Leertaste f\u00FCr die Anzeige von Vorschl\u00E4gen.
 StructureElementNotSupported=Aggregationsfunktionen werden f\u00FCr Datenobjekte des Typs Struktur, Geometrie, Element und Regeln mit Element als Ergebnisdatenobjekt nicht unterst\u00FCtzt.
 errorCreating=Fehler beim Anlegen.
 errorDeleting=Fehler beim L\u00F6schen.
@@ -295,3 +295,7 @@ week=Woche
 quarter=Quartal
 value=Wert
 description=Beschreibung
+textrule_confirmation_dialog_delete=L\u00F6schen
+textrule_confirmation_dialog_cancel=Abbrechen
+condition_delete_confirmation_message=Diese Bedingung l\u00F6schen?
+warning_title=L\u00F6schen

package/src/sap/rules/ui/i18n/messagebundle_el.properties

@@ -295,3 +295,7 @@ week=\u03B2\u03B4\u03BF\u03BC\u03AC\u03B4\u03B1
 quarter=\u03C4\u03C1\u03AF\u03BC\u03B7\u03BD\u03BF
 value=\u03A4\u03B9\u03BC\u03AE
 description=\u03A0\u03B5\u03C1\u03B9\u03B3\u03C1\u03B1\u03C6\u03AE
+textrule_confirmation_dialog_delete=\u0394\u03B9\u03B1\u03B3\u03C1\u03B1\u03C6\u03AE
+textrule_confirmation_dialog_cancel=\u0391\u03BA\u03CD\u03C1\u03C9\u03C3\u03B7
+condition_delete_confirmation_message=\u0394\u03B9\u03B1\u03B3\u03C1\u03B1\u03C6\u03AE \u03B1\u03C5\u03C4\u03AE\u03C2 \u03C4\u03B7\u03C2 \u03C3\u03C5\u03BD\u03B8\u03AE\u03BA\u03B7\u03C2;
+warning_title=\u0394\u03B9\u03B1\u03B3\u03C1\u03B1\u03C6\u03AE

package/src/sap/rules/ui/i18n/messagebundle_en.properties

@@ -295,3 +295,7 @@ week=week
 quarter=quarter
 value=Value
 description=Description
+textrule_confirmation_dialog_delete=Delete
+textrule_confirmation_dialog_cancel=Cancel
+condition_delete_confirmation_message=Delete this condition?
+warning_title=Delete

package/src/sap/rules/ui/i18n/messagebundle_en_GB.properties

@@ -295,3 +295,7 @@ week=week
 quarter=quarter
 value=Value
 description=Description
+textrule_confirmation_dialog_delete=Delete
+textrule_confirmation_dialog_cancel=Cancel
+condition_delete_confirmation_message=Delete this condition?
+warning_title=Delete

package/src/sap/rules/ui/i18n/messagebundle_en_US_sappsd.properties

@@ -295,3 +295,7 @@ week=[[[\u0175\u0113\u0113\u0137]]]
 quarter=[[[\u01A3\u0171\u0105\u0157\u0163\u0113\u0157\u2219\u2219\u2219\u2219\u2219\u2219\u2219]]]
 value=[[[\u01B2\u0105\u013A\u0171\u0113\u2219\u2219\u2219\u2219\u2219\u2219\u2219\u2219\u2219]]]
 description=[[[\u010E\u0113\u015F\u010B\u0157\u012F\u03C1\u0163\u012F\u014F\u014B\u2219\u2219\u2219\u2219\u2219\u2219\u2219\u2219]]]
+textrule_confirmation_dialog_delete=[[[\u010E\u0113\u013A\u0113\u0163\u0113\u2219\u2219\u2219\u2219\u2219\u2219\u2219\u2219]]]
+textrule_confirmation_dialog_cancel=[[[\u0108\u0105\u014B\u010B\u0113\u013A\u2219\u2219\u2219\u2219\u2219\u2219\u2219\u2219]]]
+condition_delete_confirmation_message=[[[\u010E\u0113\u013A\u0113\u0163\u0113 \u0163\u0125\u012F\u015F \u010B\u014F\u014B\u018C\u012F\u0163\u012F\u014F\u014B?\u2219\u2219\u2219\u2219\u2219]]]
+warning_title=[[[\u010E\u0113\u013A\u0113\u0163\u0113\u2219\u2219\u2219\u2219\u2219\u2219\u2219\u2219]]]

package/src/sap/rules/ui/i18n/messagebundle_en_US_saprigi.properties

@@ -295,3 +295,7 @@ week=\u206A\u206A\u206A\u200C\u200C\u200B\u200B\u200D\u200C\u200C\u200D\u200B\u2
 quarter=\u206A\u206A\u206A\u200C\u200B\u200B\u200B\u200C\u200D\u200B\u200B\u200D\u200B\u200C\u200B\u200B\u200B\u200B\u200B\u200D\u200D\u200C\u200B\u200C\u200D\u200B\u200D\u200C\u200C\u200D\u200B\u200B\u200D\u200C\u200B\u200D\u200C\u200D\u200C\u200C\u200C\u200D\u200D\u200C\u206Aquarter\u206A\u206A
 value=\u206A\u206A\u206A\u200D\u200B\u200B\u200C\u200D\u200B\u200D\u200D\u200B\u200C\u200B\u200B\u200D\u200B\u200B\u200C\u200B\u200C\u200D\u200D\u200B\u200C\u200C\u200C\u200B\u200B\u200B\u200B\u200B\u200C\u200D\u200B\u200B\u200B\u200D\u200D\u200B\u200C\u200C\u206AValue\u206A\u206A
 description=\u206A\u206A\u206A\u200D\u200D\u200B\u200D\u200D\u200D\u200B\u200B\u200C\u200D\u200B\u200D\u200B\u200C\u200B\u200B\u200D\u200B\u200B\u200C\u200C\u200B\u200C\u200D\u200C\u200C\u200C\u200B\u200D\u200C\u200C\u200C\u200D\u200D\u200B\u200B\u200B\u200B\u200B\u206ADescription\u206A\u206A
+textrule_confirmation_dialog_delete=\u206A\u206A\u206A\u200C\u200B\u200C\u200B\u200B\u200D\u200B\u200B\u200B\u200D\u200B\u200C\u200C\u200B\u200B\u200C\u200C\u200D\u200B\u200B\u200D\u200C\u200B\u200C\u200B\u200D\u200D\u200C\u200B\u200D\u200C\u200B\u200D\u200D\u200C\u200C\u200B\u200B\u200D\u200B\u200B\u206ADelete\u206A\u206A
+textrule_confirmation_dialog_cancel=\u206A\u206A\u206A\u200C\u200B\u200C\u200D\u200B\u200D\u200B\u200C\u200D\u200B\u200B\u200B\u200D\u200C\u200B\u200B\u200C\u200D\u200C\u200B\u200B\u200C\u200D\u200C\u200B\u200D\u200C\u200D\u200D\u200C\u200C\u200B\u200C\u200D\u200D\u200C\u200B\u200D\u200C\u200B\u200B\u206ACancel\u206A\u206A
+condition_delete_confirmation_message=\u206A\u206A\u206A\u200C\u200B\u200D\u200D\u200C\u200B\u200D\u200D\u200C\u200D\u200C\u200B\u200B\u200C\u200C\u200D\u200C\u200C\u200D\u200B\u200D\u200D\u200D\u200B\u200D\u200B\u200B\u200D\u200C\u200B\u200B\u200D\u200B\u200B\u200C\u200C\u200B\u200C\u200C\u200D\u200C\u206ADelete this condition?\u206A\u206A
+warning_title=\u206A\u206A\u206A\u200D\u200B\u200C\u200D\u200B\u200C\u200D\u200C\u200C\u200C\u200C\u200D\u200B\u200C\u200C\u200D\u200D\u200B\u200C\u200C\u200C\u200D\u200C\u200C\u200D\u200D\u200D\u200D\u200C\u200C\u200B\u200D\u200C\u200C\u200B\u200D\u200D\u200D\u200B\u206ADelete\u206A\u206A

package/src/sap/rules/ui/i18n/messagebundle_en_US_saptrc.properties

@@ -295,3 +295,7 @@ week=nXOngPcvHMXM94HFmG9YQQ_week
 quarter=e7YuvLGdkwxXR6k63salSQ_quarter
 value=4WkIZtyqJGayx8mmw7TrXw_Value
 description=MeYOt274eW74YDxTI5bluQ_Description
+textrule_confirmation_dialog_delete=1JiL3b51FxLe5i6qEe74+w_Delete
+textrule_confirmation_dialog_cancel=R/4rSE56hfnyvUHucsK9xA_Cancel
+condition_delete_confirmation_message=eisdL77Z7BH33NvHz5V4Aw_Delete this condition?
+warning_title=FMZ+KMt94CTDt7SxXrNpVA_Delete

package/src/sap/rules/ui/i18n/messagebundle_es.properties

@@ -295,3 +295,7 @@ week=semana
 quarter=trimestre
 value=Valor
 description=Descripci\u00F3n
+textrule_confirmation_dialog_delete=Borrar
+textrule_confirmation_dialog_cancel=Cancelar
+condition_delete_confirmation_message=\u00BFBorrar esta condici\u00F3n?
+warning_title=Borrar

package/src/sap/rules/ui/i18n/messagebundle_es_MX.properties

@@ -295,3 +295,7 @@ week=semana
 quarter=trimestre
 value=Valor
 description=Descripci\u00F3n
+textrule_confirmation_dialog_delete=Eliminar
+textrule_confirmation_dialog_cancel=Cancelar
+condition_delete_confirmation_message=\u00BFEliminar esta condici\u00F3n?
+warning_title=Eliminar

package/src/sap/rules/ui/i18n/messagebundle_et.properties

@@ -295,3 +295,7 @@ week=n\u00E4dal
 quarter=kvartal
 value=V\u00E4\u00E4rtus
 description=Kirjeldus
+textrule_confirmation_dialog_delete=Kustuta
+textrule_confirmation_dialog_cancel=T\u00FChista
+condition_delete_confirmation_message=Kas kustutada see tingimus?
+warning_title=Kustutamine

package/src/sap/rules/ui/i18n/messagebundle_fi.properties

@@ -295,3 +295,7 @@ week=viikko
 quarter=vuosinelj\u00E4nnes
 value=Arvo
 description=Kuvaus
+textrule_confirmation_dialog_delete=Poista
+textrule_confirmation_dialog_cancel=Peruuta
+condition_delete_confirmation_message=Poistetaanko ehto?
+warning_title=Poista

package/src/sap/rules/ui/i18n/messagebundle_fr.properties

@@ -295,3 +295,7 @@ week=semaine
 quarter=trimestre
 value=Valeur
 description=Description
+textrule_confirmation_dialog_delete=Supprimer
+textrule_confirmation_dialog_cancel=Annuler
+condition_delete_confirmation_message=Supprimer cette condition\u00A0?
+warning_title=Supprimer

package/src/sap/rules/ui/i18n/messagebundle_fr_CA.properties

@@ -295,3 +295,7 @@ week=semaine
 quarter=trimestre
 value=Valeur
 description=Description
+textrule_confirmation_dialog_delete=Supprimer
+textrule_confirmation_dialog_cancel=Annuler
+condition_delete_confirmation_message=Supprimer cette condition?
+warning_title=Supprimer

package/src/sap/rules/ui/i18n/messagebundle_hi.properties

@@ -295,3 +295,7 @@ week=\u0938\u092A\u094D\u0924\u093E\u0939
 quarter=\u0924\u093F\u092E\u093E\u0939\u0940
 value=\u092E\u093E\u0928
 description=\u0935\u0930\u094D\u0923\u0928
+textrule_confirmation_dialog_delete=\u0939\u091F\u093E\u090F\u0902
+textrule_confirmation_dialog_cancel=\u0930\u0926\u094D\u0926 \u0915\u0930\u0947\u0902
+condition_delete_confirmation_message=\u092F\u0939 \u0936\u0930\u094D\u0924 \u0939\u091F\u093E\u090F\u0902
+warning_title=\u0939\u091F\u093E\u090F\u0902

package/src/sap/rules/ui/i18n/messagebundle_hr.properties

@@ -147,7 +147,7 @@ invalidExpression=Nepotpun ili neva\u017Ee\u0107i izraz.
 invalidAttribute=Uneseni atribut nije neva\u017Ee\u0107i.
 duplicateAttribute=Atribut je ve\u0107 odabran.
 ctrlSpaceCue=Upotrijebite Ctrl + razmaknicu za dobivanje prijedloga.
-optionSpaceCue=Use Option+Space to get suggestions
+optionSpaceCue=Upotrijebite Option + razmaknicu za dobivanje prijedloga
 StructureElementNotSupported=Funkcije agregiranja nisu podr\u017Eane u objektima podataka tipa Struktura, Geometrija, Element i Pravila s Elementom kao Objekt podataka rezultata.
 errorCreating=Gre\u0161ka pri kreiranju.
 errorDeleting=Gre\u0161ka pri brisanju.
@@ -295,3 +295,7 @@ week=tjedan
 quarter=tromjese\u010Dje
 value=Vrijednost
 description=Opis
+textrule_confirmation_dialog_delete=Izbri\u0161i
+textrule_confirmation_dialog_cancel=Otka\u017Ei
+condition_delete_confirmation_message=Izbrisati ovaj uvjet?
+warning_title=Izbri\u0161i

package/src/sap/rules/ui/i18n/messagebundle_hu.properties

@@ -295,3 +295,7 @@ week=h\u00E9t
 quarter=negyed\u00E9v
 value=\u00C9rt\u00E9k
 description=Le\u00EDr\u00E1s
+textrule_confirmation_dialog_delete=T\u00F6rl\u00E9s
+textrule_confirmation_dialog_cancel=M\u00E9gse
+condition_delete_confirmation_message=Kond\u00EDci\u00F3 t\u00F6rl\u00E9se?
+warning_title=T\u00F6rl\u00E9s

package/src/sap/rules/ui/i18n/messagebundle_id.properties

@@ -104,7 +104,7 @@ titleElseIf=Else If
 titleElse=Else
 then=Then
 addButton=Tambahkan
-deleteButton=Hapus
+deleteButton=Hapus Permanen
 addElseIf=Tambahkan Else If
 addElse=Tambahkan Else
 addNewElseIf=Tambahkan Else If Baru
@@ -295,3 +295,7 @@ week=minggu
 quarter=triwulan
 value=Nilai
 description=Deskripsi
+textrule_confirmation_dialog_delete=Hapus permanen
+textrule_confirmation_dialog_cancel=Batalkan
+condition_delete_confirmation_message=Hapus permanen kondisi ini?
+warning_title=Hapus permanen

package/src/sap/rules/ui/i18n/messagebundle_it.properties

@@ -295,3 +295,7 @@ week=settimana
 quarter=trimestre
 value=Valore
 description=Descrizione
+textrule_confirmation_dialog_delete=Elimina
+textrule_confirmation_dialog_cancel=Annulla
+condition_delete_confirmation_message=Eliminare questa condizione?
+warning_title=Elimina

package/src/sap/rules/ui/i18n/messagebundle_iw.properties

@@ -295,3 +295,7 @@ week=\u05E9\u05D1\u05D5\u05E2
 quarter=\u05E8\u05D1\u05E2\u05D5\u05DF
 value=\u05E2\u05E8\u05DA
 description=\u05EA\u05D9\u05D0\u05D5\u05E8
+textrule_confirmation_dialog_delete=\u05DE\u05D7\u05E7
+textrule_confirmation_dialog_cancel=\u05D1\u05D8\u05DC
+condition_delete_confirmation_message=\u05D4\u05D0\u05DD \u05DC\u05DE\u05D7\u05D5\u05E7 \u05D0\u05EA \u05D4\u05EA\u05E0\u05D0\u05D9 \u05D4\u05D6\u05D4?
+warning_title=\u05DE\u05D7\u05E7

package/src/sap/rules/ui/i18n/messagebundle_ja.properties

@@ -295,3 +295,7 @@ week=\u9031
 quarter=\u56DB\u534A\u671F
 value=\u5024
 description=\u8AAC\u660E
+textrule_confirmation_dialog_delete=\u524A\u9664
+textrule_confirmation_dialog_cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
+condition_delete_confirmation_message=\u3053\u306E\u6761\u4EF6\u3092\u524A\u9664\u3057\u307E\u3059\u304B?
+warning_title=\u524A\u9664

package/src/sap/rules/ui/i18n/messagebundle_kk.properties

@@ -295,3 +295,7 @@ week=\u0430\u043F\u0442\u0430
 quarter=\u0442\u043E\u049B\u0441\u0430\u043D
 value=\u041C\u04D9\u043D
 description=\u0421\u0438\u043F\u0430\u0442\u0442\u0430\u043C\u0430
+textrule_confirmation_dialog_delete=\u0416\u043E\u044E
+textrule_confirmation_dialog_cancel=\u0411\u043E\u043B\u0434\u044B\u0440\u043C\u0430\u0443
+condition_delete_confirmation_message=\u0411\u04B1\u043B \u0448\u0430\u0440\u0442\u0442\u044B \u0436\u043E\u044E \u043A\u0435\u0440\u0435\u043A \u043F\u0435?
+warning_title=\u0416\u043E\u044E

package/src/sap/rules/ui/i18n/messagebundle_ko.properties

@@ -295,3 +295,7 @@ week=\uC8FC
 quarter=\uBD84\uAE30
 value=\uAC12
 description=\uB0B4\uC5ED
+textrule_confirmation_dialog_delete=\uC0AD\uC81C
+textrule_confirmation_dialog_cancel=\uCDE8\uC18C
+condition_delete_confirmation_message=\uC774 \uC870\uAC74\uC744 \uC0AD\uC81C\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?
+warning_title=\uC0AD\uC81C

package/src/sap/rules/ui/i18n/messagebundle_lt.properties

@@ -295,3 +295,7 @@ week=savait\u0117
 quarter=ketvirtis
 value=Reik\u0161m\u0117
 description=Apra\u0161as
+textrule_confirmation_dialog_delete=Naikinti
+textrule_confirmation_dialog_cancel=At\u0161aukti
+condition_delete_confirmation_message=Naikinti \u0161i\u0105 s\u0105lyg\u0105?
+warning_title=Naikinti

package/src/sap/rules/ui/i18n/messagebundle_lv.properties

@@ -295,3 +295,7 @@ week=ned\u0113\u013Ca
 quarter=ceturksnis
 value=V\u0113rt\u012Bba
 description=Apraksts
+textrule_confirmation_dialog_delete=Dz\u0113st
+textrule_confirmation_dialog_cancel=Atcelt
+condition_delete_confirmation_message=Vai izdz\u0113st \u0161o nosac\u012Bjumu?
+warning_title=Dz\u0113st

package/src/sap/rules/ui/i18n/messagebundle_ms.properties

@@ -295,3 +295,7 @@ week=minggu
 quarter=suku
 value=Nilai
 description=Perihalan
+textrule_confirmation_dialog_delete=Padam
+textrule_confirmation_dialog_cancel=Batal
+condition_delete_confirmation_message=Padam syarat ini?
+warning_title=Padam

package/src/sap/rules/ui/i18n/messagebundle_nl.properties

@@ -295,3 +295,7 @@ week=week
 quarter=kwartaal
 value=Waarde
 description=Omschrijving
+textrule_confirmation_dialog_delete=Verwijderen
+textrule_confirmation_dialog_cancel=Annuleren
+condition_delete_confirmation_message=Deze conditie verwijderen?
+warning_title=Verwijderen

package/src/sap/rules/ui/i18n/messagebundle_no.properties

@@ -147,7 +147,7 @@ invalidExpression=Ufullstendig eller ugyldig uttrykk.
 invalidAttribute=Oppgitt attributt er ugyldig.
 duplicateAttribute=Attributtet er allerede valgt.
 ctrlSpaceCue=Bruk Ctrl+Mellomrom for \u00E5 f\u00E5 opp forslag
-optionSpaceCue=Use Option+Space to get suggestions
+optionSpaceCue=Bruk Option+Mellomrom for \u00E5 f\u00E5 opp forslag
 StructureElementNotSupported=Aggregeringsfunksjoner st\u00F8ttes ikke for dataobjekter av typen struktur, geometri, element og regler med element som resultatdataobjekt.
 errorCreating=Feil ved oppretting.
 errorDeleting=Feil ved sletting.
@@ -295,3 +295,7 @@ week=uke
 quarter=kvartal
 value=Verdi
 description=Beskrivelse
+textrule_confirmation_dialog_delete=Slett
+textrule_confirmation_dialog_cancel=Avbryt
+condition_delete_confirmation_message=Slette denne betingelsen?
+warning_title=Slett

package/src/sap/rules/ui/i18n/messagebundle_pl.properties

@@ -146,8 +146,8 @@ sort_attributes_tooltip=Wybierz kolejno\u015B\u0107 sortowania dla atrybutu
 invalidExpression=Niekompletne lub nieprawid\u0142owe wyra\u017Cenie.
 invalidAttribute=Wprowadzony atrybut jest nieprawid\u0142owy.
 duplicateAttribute=Ju\u017C wybrano atrybut.
-ctrlSpaceCue=U\u017Cyj klawiszy Ctrl + spacja, aby otrzyma\u0107 sugestie.
-optionSpaceCue=Use Option+Space to get suggestions
+ctrlSpaceCue=U\u017Cyj klawiszy Ctrl + Spacja, aby otrzyma\u0107 sugestie.
+optionSpaceCue=U\u017Cyj klawiszy Opcja + Spacja, aby otrzyma\u0107 sugestie.
 StructureElementNotSupported=Funkcje agregacji nie s\u0105 obs\u0142ugiwane w obiektach danych typu Struktura, Geometria, Element i Regu\u0142y z elementem jako obiektem danych wynik\u00F3w.
 errorCreating=B\u0142\u0105d podczas tworzenia.
 errorDeleting=B\u0142\u0105d podczas usuwania.
@@ -295,3 +295,7 @@ week=tydzie\u0144
 quarter=kwarta\u0142
 value=Warto\u015B\u0107
 description=Opis
+textrule_confirmation_dialog_delete=Usu\u0144
+textrule_confirmation_dialog_cancel=Anuluj
+condition_delete_confirmation_message=Usun\u0105\u0107 ten warunek?
+warning_title=Usuwanie

package/src/sap/rules/ui/i18n/messagebundle_pt.properties

@@ -295,3 +295,7 @@ week=semana
 quarter=trimestre
 value=Valor
 description=Descri\u00E7\u00E3o
+textrule_confirmation_dialog_delete=Eliminar
+textrule_confirmation_dialog_cancel=Cancelar
+condition_delete_confirmation_message=Eliminar esta condi\u00E7\u00E3o?
+warning_title=Eliminar

package/src/sap/rules/ui/i18n/messagebundle_pt_PT.properties

@@ -295,3 +295,7 @@ week=semana
 quarter=trimestre
 value=Valor
 description=Descri\u00E7\u00E3o
+textrule_confirmation_dialog_delete=Eliminar
+textrule_confirmation_dialog_cancel=Cancelar
+condition_delete_confirmation_message=Eliminar esta condi\u00E7\u00E3o?
+warning_title=Eliminar

package/src/sap/rules/ui/i18n/messagebundle_ro.properties

@@ -147,7 +147,7 @@ invalidExpression=Expresie incomplet\u0103 sau nevalabil\u0103.
 invalidAttribute=Atributul introdus nu este valabil.
 duplicateAttribute=Atributul este deja selectat.
 ctrlSpaceCue=Utiliza\u021Bi Ctrl+Space pentru a ob\u021Bine sugestii.
-optionSpaceCue=Use Option+Space to get suggestions
+optionSpaceCue=Utiliza\u021Bi Option+Space pentru a ob\u021Bine sugestii
 StructureElementNotSupported=Func\u021Biile de agregare nu sunt suportate \u00EEn obiectele de date de tip structur\u0103, geometrie, element \u0219i reguli cu element ca obiect de date rezultat.
 errorCreating=Eroare la creare.
 errorDeleting=Eroare la \u0219tergere.
@@ -295,3 +295,7 @@ week=s\u0103pt\u0103m\u00E2n\u0103
 quarter=trimestru
 value=Valoare
 description=Descriere
+textrule_confirmation_dialog_delete=\u0218tergere
+textrule_confirmation_dialog_cancel=Anulare
+condition_delete_confirmation_message=\u0218terge\u021Bi aceast\u0103 condi\u021Bie?
+warning_title=\u0218tergere

package/src/sap/rules/ui/i18n/messagebundle_ru.properties

@@ -295,3 +295,7 @@ week=\u043D\u0435\u0434\u0435\u043B\u044F
 quarter=\u043A\u0432\u0430\u0440\u0442\u0430\u043B
 value=\u0417\u043D\u0430\u0447\u0435\u043D\u0438\u0435
 description=\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435
+textrule_confirmation_dialog_delete=\u0423\u0434\u0430\u043B\u0438\u0442\u044C
+textrule_confirmation_dialog_cancel=\u041E\u0442\u043C\u0435\u043D\u0438\u0442\u044C
+condition_delete_confirmation_message=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u044D\u0442\u043E \u0443\u0441\u043B\u043E\u0432\u0438\u0435?
+warning_title=\u0423\u0434\u0430\u043B\u0438\u0442\u044C

package/src/sap/rules/ui/i18n/messagebundle_sh.properties

@@ -295,3 +295,7 @@ week=nedelja
 quarter=kvartal
 value=Vrednost
 description=Opis
+textrule_confirmation_dialog_delete=Izbri\u0161i
+textrule_confirmation_dialog_cancel=Odustani
+condition_delete_confirmation_message=Izbrisati ovaj uslov?
+warning_title=Izbri\u0161i

package/src/sap/rules/ui/i18n/messagebundle_sk.properties

@@ -295,3 +295,7 @@ week=t\u00FD\u017Ede\u0148
 quarter=\u0161tvr\u0165rok
 value=Hodnota
 description=Popis
+textrule_confirmation_dialog_delete=Odstr\u00E1ni\u0165
+textrule_confirmation_dialog_cancel=Zru\u0161i\u0165
+condition_delete_confirmation_message=Odstr\u00E1ni\u0165 t\u00FAto podmienku?
+warning_title=Odstr\u00E1ni\u0165

package/src/sap/rules/ui/i18n/messagebundle_sl.properties

@@ -295,3 +295,7 @@ week=teden
 quarter=\u010Detrtletje
 value=Vrednost
 description=Opis
+textrule_confirmation_dialog_delete=Izbri\u0161i
+textrule_confirmation_dialog_cancel=Prekli\u010Di
+condition_delete_confirmation_message=\u017Delite izbrisati ta pogoj?
+warning_title=Izbri\u0161i

package/src/sap/rules/ui/i18n/messagebundle_sv.properties

@@ -295,3 +295,7 @@ week=vecka
 quarter=kvartal
 value=V\u00E4rde
 description=Beskrivning
+textrule_confirmation_dialog_delete=Radera
+textrule_confirmation_dialog_cancel=Avbryt
+condition_delete_confirmation_message=Radera detta villkor?
+warning_title=Radera

package/src/sap/rules/ui/i18n/messagebundle_th.properties

@@ -295,3 +295,7 @@ week=\u0E2A\u0E31\u0E1B\u0E14\u0E32\u0E2B\u0E4C
 quarter=\u0E44\u0E15\u0E23\u0E21\u0E32\u0E2A
 value=\u0E04\u0E48\u0E32
 description=\u0E04\u0E33\u0E2D\u0E18\u0E34\u0E1A\u0E32\u0E22
+textrule_confirmation_dialog_delete=\u0E25\u0E1A
+textrule_confirmation_dialog_cancel=\u0E22\u0E01\u0E40\u0E25\u0E34\u0E01
+condition_delete_confirmation_message=\u0E25\u0E1A\u0E40\u0E07\u0E37\u0E48\u0E2D\u0E19\u0E44\u0E02\u0E19\u0E35\u0E49?
+warning_title=\u0E25\u0E1A

package/src/sap/rules/ui/i18n/messagebundle_tr.properties

@@ -295,3 +295,7 @@ week=hafta
 quarter=\u00FC\u00E7 ayl\u0131k d\u00F6nem
 value=De\u011Fer
 description=Tan\u0131m
+textrule_confirmation_dialog_delete=Sil
+textrule_confirmation_dialog_cancel=\u0130ptal et
+condition_delete_confirmation_message=Bu ko\u015Ful silinsin mi?
+warning_title=Sil

package/src/sap/rules/ui/i18n/messagebundle_uk.properties

@@ -295,3 +295,7 @@ week=\u0442\u0438\u0436\u0434\u0435\u043D\u044C
 quarter=\u043A\u0432\u0430\u0440\u0442\u0430\u043B
 value=\u0417\u043D\u0430\u0447\u0435\u043D\u043D\u044F
 description=\u041E\u043F\u0438\u0441
+textrule_confirmation_dialog_delete=\u0412\u0438\u0434\u0430\u043B\u0438\u0442\u0438
+textrule_confirmation_dialog_cancel=\u0421\u043A\u0430\u0441\u0443\u0432\u0430\u0442\u0438
+condition_delete_confirmation_message=\u0412\u0438\u0434\u0430\u043B\u0438\u0442\u0438 \u0446\u044E \u0443\u043C\u043E\u0432\u0443?
+warning_title=\u0412\u0438\u0434\u0430\u043B\u0438\u0442\u0438

package/src/sap/rules/ui/i18n/messagebundle_vi.properties

@@ -295,3 +295,7 @@ week=tu\u00E2\u0300n
 quarter=quy\u0301
 value=Gia\u0301 tri\u0323
 description=M\u00F4 ta\u0309
+textrule_confirmation_dialog_delete=Xo\u0301a
+textrule_confirmation_dialog_cancel=Hu\u0309y
+condition_delete_confirmation_message=Xo\u0301a \u0111i\u00EA\u0300u ki\u00EA\u0323n?
+warning_title=Xo\u0301a

package/src/sap/rules/ui/i18n/messagebundle_zh_CN.properties

@@ -295,3 +295,7 @@ week=\u5468
 quarter=\u5B63\u5EA6
 value=\u503C
 description=\u63CF\u8FF0
+textrule_confirmation_dialog_delete=\u5220\u9664
+textrule_confirmation_dialog_cancel=\u53D6\u6D88
+condition_delete_confirmation_message=\u662F\u5426\u5220\u9664\u6B64\u6761\u4EF6\uFF1F
+warning_title=\u5220\u9664

package/src/sap/rules/ui/i18n/messagebundle_zh_TW.properties

@@ -295,3 +295,7 @@ week=\u9031
 quarter=\u5B63
 value=\u503C
 description=\u8AAA\u660E
+textrule_confirmation_dialog_delete=\u522A\u9664
+textrule_confirmation_dialog_cancel=\u53D6\u6D88
+condition_delete_confirmation_message=\u522A\u9664\u6B64\u689D\u4EF6\uFF1F
+warning_title=\u522A\u9664

package/src/sap/rules/ui/library.js

@@ -85,7 +85,7 @@ sap.ui.define([
 			"sap.rules.ui.type.Expression"
 		],
 		noLibraryCSS: false,
-		version: "1.110.1"
+		version: "1.111.0"
 	});
 
 	// sap.rules.ui library contants

package/src/sap/rules/ui/services/AstExpressionLanguage.js

@@ -3104,7 +3104,7 @@ sap.ui.define(['jquery.sap.global',
 				}
 				if (newtoken.tokenType === "D") {
 					newtoken.reference = newtoken.text;
-					newtoken.text = "'" + this._getDateFormatter().format(new Date(newtoken.reference.replace(/\'/g, "")), false) + "'";
+					newtoken.text = "'" + this._getDateFormatter().format(new Date(newtoken.reference.replace(/\'/g, "")), true) + "'";
 				}
 				if (newtoken.tokenType === "T") {
 					newtoken.reference = newtoken.text;
@@ -3152,7 +3152,7 @@ sap.ui.define(['jquery.sap.global',
 				}
 			} else if (newtoken.tokenType === "D") {
 					newtoken.reference = newtoken.text;
-					newtoken.text = "'" + this._getDateFormatter().format(new Date(newtoken.reference.replace(/\'/g, "")), false) + "'";
+					newtoken.text = "'" + this._getDateFormatter().format(new Date(newtoken.reference.replace(/\'/g, "")), true) + "'";
 				}
 			  else if (newtoken.tokenType === "T") {
 					newtoken.reference = newtoken.text;

package/src/sap/rules/ui/type/ExpressionAbs.js

@@ -18,7 +18,7 @@ sap.ui.define(["jquery.sap.global"], function(jQuery) {
 		 * @extends  sap.ui.model.CompositeType
 		 *
 		 * @author SAP SE
-		 * @version 1.110.1
+		 * @version 1.111.0
 		 *
 		 * @constructor
 		 * @private