@sapui5/sap.zen.dsh 1.108.19 → 1.108.22

package/package.json

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

package/src/sap/zen/dsh/.library

@@ -7,7 +7,7 @@
   <vendor>SAP SE</vendor>
   <copyright>SAPUI5
   (c) Copyright 2009-2021 SAP SE. All rights reserved</copyright>
-  <version>1.108.19</version>
+  <version>1.108.22</version>
   <documentation>Design Studio Runtime Library.  Intended only to be used within S/4 HANA Fiori applications.</documentation>
   <appData>
     <jsdoc xmlns="http://www.sap.com/ui5/buildext/jsdoc" >

package/src/sap/zen/dsh/AnalyticGrid.js

@@ -104,8 +104,8 @@ sap.ui.define(
     AnalyticGrid.prototype.init = function() {
       this.parameters = {};
 
-      this.dshBaseUrl = URI(sap.ui.resource("sap.zen.dsh", "rt/")).relativeTo(document.baseURI).toString();
-      this.repositoryUrl = URI(sap.ui.resource("sap.zen.dsh", "applications/")).relativeTo(document.baseURI).toString();
+      this.dshBaseUrl = URI(sap.ui.resource("sap.zen.dsh", "rt/")).absoluteTo(document.baseURI).toString();
+      this.repositoryUrl = URI(sap.ui.resource("sap.zen.dsh", "applications/")).absoluteTo(document.baseURI).toString();
 
       sap.zen.dsh.sapbi_page.staticMimeUrlPrefix = this.dshBaseUrl;
     };

package/src/sap/zen/dsh/Dsh.js

@@ -198,7 +198,7 @@ sap.ui.define( "sap/zen/dsh/Dsh",
       this.parameters = {};
 
       this.dshBaseAppUrlBW = "/sap/bw/Mime";
-      this.dshBaseUrl = URI(sap.ui.resource("sap.zen.dsh", "widgets/")).relativeTo(document.baseURI).toString();
+      this.dshBaseUrl = URI(sap.ui.resource("sap.zen.dsh", "widgets/")).absoluteTo(document.baseURI).toString();
     };
 
     /**
@@ -214,7 +214,7 @@ sap.ui.define( "sap/zen/dsh/Dsh",
     Dsh.prototype.doInit = function() {
       //0ANALYSIS will always come from our library for now.  This will be cleaned up later.
       if (this.getDshAppName() === "0ANALYSIS" || this.getDshAppName() === "0ANALYTIC_GRID") {
-        this.setRepoPath(URI(sap.ui.resource("sap.zen.dsh", "applications/")).relativeTo(document.baseURI).toString());
+        this.setRepoPath(URI(sap.ui.resource("sap.zen.dsh", "applications/")).absoluteTo(document.baseURI).toString());
       }
 
       if (this.getRepoPath() !== "") {

package/src/sap/zen/dsh/firefly/ff8310.zen.buddha.js

@@ -11664,24 +11664,24 @@ sap.zen.CharacteristicWrapper.prototype.getMemberFromListByFieldValue = function
 			{
 				continue;
 			}
-			if (oFF.XString.isEqual(loInternalFieldValue.getString(), value))
-			{
+			if (oFF.XString.isEqual(loInternalFieldValue.getString(), value)) {
 				lFound = true;
 				break;
 			}
-			var lValueRespectingCase = value;
-			if (!loInternalDimension.supportsLowerCase() || loInternalFieldValue.getValueType() === oFF.XValueType.UPPER_CASE_STRING) {
-				lValueRespectingCase = oFF.XString.toUpperCase(value);
-			}
-			else if (loInternalFieldValue.getValueType() === oFF.XValueType.LOWER_CASE_STRING) {
-				lValueRespectingCase = oFF.XString.toLowerCase(value);
-			}
-			if (oFF.XString.isEqual(loInternalFieldValue.getString(), lValueRespectingCase)) {
-				lFound = true;
-				break;
+			if (!oFF.isNull(loInternalFieldValue)) {
+				var lValueRespectingCase = value;
+				if (!loInternalDimension.supportsLowerCase() || loInternalFieldValue.getValueType() === oFF.XValueType.UPPER_CASE_STRING) {
+					lValueRespectingCase = oFF.XString.toUpperCase(value);
+				}
+				else if (loInternalFieldValue.getValueType() === oFF.XValueType.LOWER_CASE_STRING) {
+					lValueRespectingCase = oFF.XString.toLowerCase(value);
+				}
+				if (oFF.XString.isEqual(loInternalFieldValue.getString(), lValueRespectingCase)) {
+					lFound = true;
+					break;
+				}
 			}
-			if (oFF.XString.containsString(loInternalFieldValue.getString(), value))
-			{
+			if (oFF.XString.containsString(loInternalFieldValue.getString(), value)) {
 				ltMatchingDimensionMembers.add(loInternalDimensionMember);
 			}
 		}
@@ -35786,10 +35786,12 @@ sap.zen.Page.prototype.doExport = function(exportType, exportVersion)
 			ltAxesProperties.put(loAxisPaging.getAxis(), ltAxisProperties);
 		}
 		ltResultSetPagingInfo.put(loResultSet, ltAxesProperties);
+		// activate paging on row axis using defaultSize for package retrieval
 		loAxisPaging = ltAxisPaging.getByKey(oFF.AxisType.ROWS.getName());
 		loAxisPaging.setPagingMode(sap.zen.CResultSetPagingMode.ACTIVATE_PAGING.getBinaryValue(), sap.zen.ResultSetAxisPaging.OFFSET_DEFAULT, sap.zen.ResultSetAxisPaging.SIZE_DEFAULT);
+		// need to Export all columns since column paging not supported by InA
 		loAxisPaging = ltAxisPaging.getByKey(oFF.AxisType.COLUMNS.getName());
-		loAxisPaging.setPagingMode(0, sap.zen.ResultSetAxisPaging.OFFSET_DEFAULT, sap.zen.ResultSetAxisPaging.SIZE_DEFAULT);
+		loAxisPaging.setPagingMode(0, sap.zen.ResultSetAxisPaging.OFFSET_DEFAULT, sap.zen.ResultSetAxisPaging.SIZE_ALL);
 		if (!loResultSet.getServerPaging().getState().isTypeOf(oFF.SyncState.IN_SYNC))
 		{
 			loResultSet.synchronize(null, null, false);

package/src/sap/zen/dsh/library.js

@@ -31,7 +31,7 @@ sap.ui.define(
      * @alias sap.zen.dsh
      * @public
      * @author SAP SE
-     * @version 1.108.19
+     * @version 1.108.22
      */
     var thisLib = sap.ui.getCore().initLibrary(
       {
@@ -56,7 +56,7 @@ sap.ui.define(
         ],
         elements: [],
         noLibraryCSS: true,
-        version: "1.108.19"
+        version: "1.108.22"
       }
     );
    

package/src/sap/zen/dsh/widgets/filterpanel_m_handler.js

@@ -26,21 +26,21 @@ sap.ui.define(
     "sap/ui/comp/util/FormatUtil",
     "sap/ui/core/format/DateFormat"
   ],
-  function(
+  function (
     jQuery, JSONModel, VBox, Label, Token, Tokenizer, Button,
     Toolbar, SearchField, StandardListItem, SelectDialog, BusyIndicator,
     Sorter, Filter, BaseHandler, ValueHelpDialog, Empty, ValueHelpRangeOperation
   ) {
     "use strict";
     var dispatcher = BaseHandler.dispatcher;
-    var FilterPanelHandler = function() {
+    var FilterPanelHandler = function () {
       BaseHandler.apply(this, arguments);
       var that = this;
       this.oClipboard = {};
       /**
        * Create the Control
        */
-      this.create = function(oChainedControl, oControlProperties) {
+      this.create = function (oChainedControl, oControlProperties) {
         var lControlId = that.createUI5Identifier(oControlProperties["id"]);
         var loControl;
         var loJsonModel = new JSONModel();
@@ -48,7 +48,7 @@ sap.ui.define(
         var lIsMemberSelector = loJsonModel.getProperty("/property/memberselector") || loJsonModel.getProperty("/property/popupreference");
         if (lIsMemberSelector) {
           loControl = oChainedControl ? oChainedControl : new Empty(lControlId);
-          loControl.onAfterRendering = function() {
+          loControl.onAfterRendering = function () {
             new Function(that.prepareCommand(loControl.getModel().getProperty("/command/showfilterdialog"), "__STRING__", loControl.getModel().getProperty("/characteristics/0/characteristic/name")))();
             loControl.onAfterRendering = undefined;
           };
@@ -72,13 +72,13 @@ sap.ui.define(
           loControl.ZEN_submit = this.submitExternal(loJsonModel, true);
           loControl.ZEN_submit_with_apply = this.submitExternal(loJsonModel, true, true);
           loControl.ZEN_check = this.submitExternal(loJsonModel, false);
-          loControl.ZEN_cancel = function() {
+          loControl.ZEN_cancel = function () {
             new Function(loJsonModel.getProperty("/command/cancelonlyfilter"))();
           };
         }
 
         var loSuperExit = loControl.exit;
-        loControl.exit = function() {
+        loControl.exit = function () {
           if (loSuperExit) {
             loSuperExit.apply(loControl, arguments);
           }
@@ -101,7 +101,7 @@ sap.ui.define(
       /**
        * Update the Control
        */
-      this.update = function(oControl, oControlProperties, oComponentProperties) {
+      this.update = function (oControl, oControlProperties, oComponentProperties) {
         if (oControl && oControlProperties) {
           var lView = oControlProperties.view;
           if (this.isDesignModeD4LIncluded() || oControlProperties.newds) {
@@ -219,8 +219,8 @@ sap.ui.define(
             if (lHierarchical) {
               var ltMembers = loDialogProperties.members;
               if (ltMembers) {
-                for (var i = 0; i === lMaxChildIndex+1; i++) {
-                  var loChild = ltMembers[""+i];
+                for (var i = 0; i === lMaxChildIndex + 1; i++) {
+                  var loChild = ltMembers["" + i];
                   if (!loChild) {
                     continue;
                   }
@@ -253,13 +253,13 @@ sap.ui.define(
             var loMember = oControlProperties.member;
             loMember.level = lParentLevel;
 
-            for (i = 0; i === lMaxChildIndex+1; i++) {
-              loChild = loMember[""+i];
+            for (i = 0; i === lMaxChildIndex + 1; i++) {
+              loChild = loMember["" + i];
               if (!loChild) {
                 continue;
               }
 
-              loChild.level = lParentLevel+1;
+              loChild.level = lParentLevel + 1;
               lMaxChildIndex = i;
             }
             loModel.setProperty(oControlProperties.path, oControlProperties.member);
@@ -285,7 +285,7 @@ sap.ui.define(
       /**
        * Add Items
        */
-      this.addItems = function(oControl) {
+      this.addItems = function (oControl) {
         //if "/property/showembedded" is true, render as filter panel
         //if false as dimension filter
         var loModel = oControl.getModel();
@@ -296,10 +296,10 @@ sap.ui.define(
 
           var loSearchField = new SearchField(
             {
-              liveChange: function(oEvent) {
+              liveChange: function (oEvent) {
                 var lValue = oEvent.getParameter("newValue");
                 var loFilter = new Filter(lNavigationMode ? "entry/text" : "characteristic/text", sap.ui.model.FilterOperator.Contains, lValue);
-                var ltFilters = [ loFilter ];
+                var ltFilters = [loFilter];
                 var ltVisiblePrompts = loModel.getProperty("/visibleprompts");
                 if (ltVisiblePrompts) {
                   ltFilters.push(getFilterForVisibleVariables(ltVisiblePrompts));
@@ -314,7 +314,7 @@ sap.ui.define(
           );
           var loSubHeader = new Toolbar(
             {
-              content: [null,loSearchField]
+              content: [null, loSearchField]
             }
           );
           if (loModel.getProperty("/property/variablescreen") && loModel.getProperty("/visibleprompts")) {
@@ -328,7 +328,7 @@ sap.ui.define(
       /**
        * Get Main Item
        */
-      this.getMainItem = function(oControl) {
+      this.getMainItem = function (oControl) {
         var loForm = new sap.ui.layout.form.Form({
           editable: true,
           formContainers: [this.getMainContent(oControl)],
@@ -347,7 +347,7 @@ sap.ui.define(
       /**
        * Get Main Content
        */
-      this.getMainContent = function(oControl) {
+      this.getMainContent = function (oControl) {
         var loContent;
 
         var loModel = oControl.getModel();
@@ -366,10 +366,10 @@ sap.ui.define(
       /**
        * Get Form Container
        */
-      this.getFormContainer = function(oControl, tFilters, axis) {
+      this.getFormContainer = function (oControl, tFilters, axis) {
         var loFormContainer = new sap.ui.layout.form.FormContainer({
           formElements: {
-            path : "/characteristics",
+            path: "/characteristics",
             factory: this.getFromElementsFactory(oControl, axis),
             filters: tFilters
           }
@@ -381,8 +381,8 @@ sap.ui.define(
       /**
        * Get From Elements Factory
        */
-      this.getFromElementsFactory = function(oControl, axis) {
-        return function(sId, oContext) {
+      this.getFromElementsFactory = function (oControl, axis) {
+        return function (sId, oContext) {
           var loModel = oContext.getModel();
           var lCharName = loModel.getProperty(axis ? oContext.getPath("entry/name") : oContext.getPath("characteristic/name"));
           var lCharPath = axis ? getPathForCharName(loModel, lCharName) : oContext.getPath("characteristic");
@@ -402,26 +402,26 @@ sap.ui.define(
           var lsFormElementId;
           var lsFormElementIdLabel;
           if (loModel.getProperty("/property/variablescreen")) {
-            lsFormElementId = oControl.getId() + "-" +  that.createUI5Identifier(lCharName);
+            lsFormElementId = oControl.getId() + "-" + that.createUI5Identifier(lCharName);
             lsFormElementIdLabel = lsFormElementId + "-label";
           }
 
-          if(loModel.getProperty("/property/label")) { //DimensionName
+          if (loModel.getProperty("/property/label")) { //DimensionName
             var loLabel = new Label(lsFormElementIdLabel).bindProperty("text", {
               path: lCharPath,
-              formatter : function(oCharacteristic) {
+              formatter: function (oCharacteristic) {
                 return oCharacteristic.text;
               }
             });
             loLabel.bindProperty("tooltip", {
               path: lCharPath,
-              formatter : function(oCharacteristic) {
+              formatter: function (oCharacteristic) {
                 return oCharacteristic.text;
               }
             });
             loLabel.bindProperty("required", {
               path: lCharPath,
-              formatter : function(oCharacteristic) {
+              formatter: function (oCharacteristic) {
                 return oCharacteristic.mandatory;
               }
             });
@@ -443,16 +443,16 @@ sap.ui.define(
       /**
        * Get Input Control
        */
-      this.getInput = function(oModel, charName, charPath, oControl) {
+      this.getInput = function (oModel, charName, charPath, oControl) {
         var loChar = this.getCharacteristicByName(oModel, charName);
 
         // supported operations (not overridden)
         var lType = oModel.getProperty(charPath + "/type");
-        var lHierarchical = oModel.getProperty(charPath +"/hierarchical");
-        var lSupportsMultiSelection = oModel.getProperty(charPath +"/supportsMultiSelection");
+        var lHierarchical = oModel.getProperty(charPath + "/hierarchical");
+        var lSupportsMultiSelection = oModel.getProperty(charPath + "/supportsMultiSelection");
         var lSupportsInterval = oModel.getProperty(charPath + "/supportsInterval");
         var lSupportsRange = oModel.getProperty(charPath + "/supportsRange");
-        var lSupportsExcluding = oModel.getProperty(charPath +"/supportsExcluding");
+        var lSupportsExcluding = oModel.getProperty(charPath + "/supportsExcluding");
         // display behavior (overridden for special cases)
         var lShowValueHelp = oModel.getProperty(charPath + "/showValueHelp");
         // required behavior (overrides support behavior)
@@ -460,7 +460,7 @@ sap.ui.define(
         var loInput, lInputId;
 
         if (oModel.getProperty("/property/variablescreen")) {
-          lInputId = oControl.getId() + "-" +  that.createUI5Identifier(charName) + "-input";
+          lInputId = oControl.getId() + "-" + that.createUI5Identifier(charName) + "-input";
         }
 
         if ((lType === "DATE" && !lSupportsMultiSelection && !lSupportsExcluding && !lSupportsRange && !lHierarchical) || (lType === "TIME" && !lSupportsMultiSelection && !lSupportsInterval)) {
@@ -468,12 +468,12 @@ sap.ui.define(
             loInput = new sap.m.DateRangeSelection(lInputId, {
               dateValue: {
                 path: "/filters",
-                mode : sap.ui.model.BindingMode.OneWay,
+                mode: sap.ui.model.BindingMode.OneWay,
                 formatter: this.getFilterFormatter(charName, lType, oModel, "from")
               },
               secondDateValue: {
                 path: "/filters",
-                mode : sap.ui.model.BindingMode.OneWay,
+                mode: sap.ui.model.BindingMode.OneWay,
                 formatter: this.getFilterFormatter(charName, lType, oModel, "to")
               },
               change: function (e) {
@@ -504,7 +504,7 @@ sap.ui.define(
                 valueFormat: "yyyyMMdd",
                 dateValue: {
                   path: "/filters",
-                  mode : sap.ui.model.BindingMode.OneWay,
+                  mode: sap.ui.model.BindingMode.OneWay,
                   formatter: this.getFilterFormatter(charName, lType, oModel, "from")
                 },
                 change: function (e) {
@@ -528,12 +528,12 @@ sap.ui.define(
                   }
                 }
               });
-            } else if (lType === "TIME"){
+            } else if (lType === "TIME") {
               loInput = new sap.m.TimePicker(lInputId, {
                 valueFormat: "HH:mm:ss",
                 dateValue: {
                   path: "/filters",
-                  mode : sap.ui.model.BindingMode.OneWay,
+                  mode: sap.ui.model.BindingMode.OneWay,
                   formatter: this.getFilterFormatter(charName, lType, oModel, "from")
                 },
                 change: function (e) {
@@ -564,20 +564,20 @@ sap.ui.define(
             showValueHelp: lShowValueHelp ? true : false,
             enableMultiLineMode: {
               path: "/filters",
-              mode : sap.ui.model.BindingMode.OneWay,
+              mode: sap.ui.model.BindingMode.OneWay,
               formatter: this.applyFilterToTokens(oControl, oModel, charName)
             },
 
             // apply Token to Model
-            tokenUpdate: function(e) {
+            tokenUpdate: function (e) {
               if (e.getParameter("type") === sap.m.MultiInput.TokenChangeType.Removed) {
                 var ltRemovedTokens = e.getParameter("removedTokens");
 
                 // remove Removed Tokens from Token List
                 var ltTokens = loInput.getTokens().filter(
-                  function(loInputToken) {
+                  function (loInputToken) {
                     return ltRemovedTokens.every(
-                      function(oRemovedToken) {
+                      function (oRemovedToken) {
                         return oRemovedToken !== loInputToken;
                       });
                   });
@@ -616,9 +616,9 @@ sap.ui.define(
                 that.clearClipboard(charName);
                 // remove Added Tokens from Token List
                 ltTokens = loInput.getTokens().filter(
-                  function(loInputToken) {
+                  function (loInputToken) {
                     return ltAddedTokens.every(
-                      function(oAddedToken) {
+                      function (oAddedToken) {
                         return oAddedToken !== loInputToken;
                       });
                   });
@@ -634,7 +634,7 @@ sap.ui.define(
 
           // validate input
           loInput.addValidator(
-            function(e) {
+            function (e) {
               // create Dummy Token for validation confirmation
               var loToken = new Token(
                 {
@@ -648,7 +648,7 @@ sap.ui.define(
           );
           var loTokenizer = loInput.getAggregation("tokenizer");
           // overwrite copy
-          loTokenizer._copy = function() {
+          loTokenizer._copy = function () {
             if (Tokenizer.prototype._copy) {
               Tokenizer.prototype._copy.apply(this, arguments);
             }
@@ -656,7 +656,7 @@ sap.ui.define(
           };
         }
         if (lShowValueHelp && loInput.attachValueHelpRequest) {
-          var loFunctionValueHelp = function() {
+          var loFunctionValueHelp = function () {
             BusyIndicator.show(0);
             new Function(that.prepareCommand(oModel.getProperty("/command/showfilterdialog"), "__STRING__", charName))();
           };
@@ -664,13 +664,13 @@ sap.ui.define(
         }
 
         loInput.addEventDelegate({
-          onfocusin:function() {
+          onfocusin: function () {
             oControl.$().css("z-index", "1");
           },
-          onfocusout:function() {
+          onfocusout: function () {
             oControl.$().css("z-index", "");
           },
-          oncopy: function() {
+          oncopy: function () {
 
           }
         });
@@ -683,7 +683,7 @@ sap.ui.define(
       /**
        * Add Tokens to Clipboard
        */
-      this.addTokensToClipboard = function(charName, tTokens) {
+      this.addTokensToClipboard = function (charName, tTokens) {
         if (!this.oClipboard[charName]) {
           this.oClipboard[charName] = [];
         }
@@ -702,22 +702,22 @@ sap.ui.define(
       /**
        * Get Tokens from Clipboard
        */
-      this.getTokensFromClipboard = function(charName) {
+      this.getTokensFromClipboard = function (charName) {
         return this.oClipboard[charName];
       };
 
       /**
        * Clear Clipboard
        */
-      this.clearClipboard = function(charName) {
+      this.clearClipboard = function (charName) {
         this.oClipboard[charName] = [];
       };
 
       /**
        * Get Filter Formatter (handling of Date and Time)
        */
-      this.getFilterFormatter = function(charName, type, oModel, fromTo) {
-        return function(oFilters) {
+      this.getFilterFormatter = function (charName, type, oModel, fromTo) {
+        return function (oFilters) {
           if (oFilters && charName && oFilters[charName]) {
             var loCharFilter = oFilters[charName];
             if (loCharFilter.ranges) {
@@ -741,22 +741,22 @@ sap.ui.define(
       /**
        * Get Data Format Instance
        */
-      this.getDateFormat = function() {
-        return sap.ui.core.format.DateFormat.getInstance({pattern: "yyyyMMdd", strictParsing: true});
+      this.getDateFormat = function () {
+        return sap.ui.core.format.DateFormat.getInstance({ pattern: "yyyyMMdd", strictParsing: true });
       };
 
       /**
        * Get Time Format Instance
        */
-      this.getTimeFormat = function() {
-        return sap.ui.core.format.DateFormat.getTimeInstance({pattern: "HH:mm:ss", strictParsing: true});
+      this.getTimeFormat = function () {
+        return sap.ui.core.format.DateFormat.getTimeInstance({ pattern: "HH:mm:ss", strictParsing: true });
       };
 
       /**
        * Transfer Filter to Tokens
        */
-      this.applyFilterToTokens = function(oControl, oModel, charName) {
-        return function(oAllFilters) {
+      this.applyFilterToTokens = function (oControl, oModel, charName) {
+        return function (oAllFilters) {
           // Handle Filter Dialog Destroy for FilterBar
           if (oControl.ZEN_multiInput[0].getId() !== this.getId()) {
             oControl.ZEN_multiInput[0] = this;
@@ -795,7 +795,7 @@ sap.ui.define(
       /**
        * Transfer Tokens to Filter
        */
-      this.applyTokensToFilter = function(oModel, charName, tTokens, displayKey) {
+      this.applyTokensToFilter = function (oModel, charName, tTokens, displayKey) {
         var loChar = this.getCharacteristicByName(oModel, charName);
 
         var ltAllFilters = oModel.getProperty("/filters");
@@ -845,7 +845,7 @@ sap.ui.define(
       /**
        * Create Token From Range
        */
-      this.createTokenFromRange = function(oModel, charName, oChar, oRange) {
+      this.createTokenFromRange = function (oModel, charName, oChar, oRange) {
         if (!oRange || !oRange.from) {
           return null;
         }
@@ -940,8 +940,8 @@ sap.ui.define(
             lTextTo = lKeyTo;
           }
         } else {
-          lKeyTo = "";
-          lTextTo = "";
+          lKeyTo = undefined;
+          lTextTo = undefined;
         }
 
         // prepare Token
@@ -988,7 +988,7 @@ sap.ui.define(
 
         return loToken;
       };
-      this.copyToken = function(oToken) {
+      this.copyToken = function (oToken) {
         if (!oToken) {
           return null;
         }
@@ -1002,7 +1002,7 @@ sap.ui.define(
         loToken.data(oToken.data());
         return loToken;
       };
-      this.createRangeFromToken = function(oModel, charName, oChar, oToken) {
+      this.createRangeFromToken = function (oModel, charName, oChar, oToken) {
         if (!oToken) {
           return null;
         }
@@ -1048,12 +1048,18 @@ sap.ui.define(
           if (oChar.type === "DATE") {
             // Token has the correct internal value - Backend requires simple formatted value (DisplayKey Backend)
             loFormat = this.getDateFormat();
+            if (!lKeyFrom.getDate) {
+              lKeyFrom = loFormat.parse(lKeyFrom);
+            }
             if (lKeyFrom.getDate) {
               lKeyFrom = loFormat.format(lKeyFrom); // internal > external (DisplayKey Backend)
             }
           } else if (oChar.type === "TIME") {
             // Token has the correct internal value - Backend requires simple formatted value (DisplayKey Backend)
             loFormat = this.getTimeFormat();
+            if (!lKeyFrom.getTime) {
+              lKeyFrom = loFormat.parse(lKeyFrom);
+            }
             if (lKeyFrom.getTime) {
               lKeyFrom = loFormat.format(lKeyFrom); // internal > external (DisplayKey Backend)
             }
@@ -1067,6 +1073,9 @@ sap.ui.define(
             if (!loFormat) {
               loFormat = this.getDateFormat();
             }
+            if (!lKeyTo.getDate) {
+              lKeyTo = loFormat.parse(lKeyTo);
+            }
             if (lKeyTo.getDate) {
               lKeyTo = loFormat.format(lKeyTo); // internal > external (DisplayKey Backend)
             }
@@ -1075,6 +1084,9 @@ sap.ui.define(
             if (!loFormat) {
               loFormat = this.getTimeFormat();
             }
+            if (!lKeyTo.getTime) {
+              lKeyTo = loFormat.parse(lKeyTo);
+            }
             if (lKeyTo.getTime) {
               lKeyTo = loFormat.format(lKeyTo); // internal > external (DisplayKey Backend)
             }
@@ -1088,7 +1100,7 @@ sap.ui.define(
       /**
        * Create Range
        */
-      this.createRange = function(exclude, operation, keyFrom, textFrom, keyTo, textTo) {
+      this.createRange = function (exclude, operation, keyFrom, textFrom, keyTo, textTo) {
         if (keyFrom === null || keyFrom === undefined) {
           return null;
         }
@@ -1125,7 +1137,7 @@ sap.ui.define(
       /**
        * Check if Range is a Range Definition
        */
-      this.isRangeARangeDefinition = function(oRange) {
+      this.isRangeARangeDefinition = function (oRange) {
         var lIsRange = true;
         if (!oRange.exclude && (!oRange.operation || oRange.operation === sap.zen.dsh.ValueHelpRangeOperation.EQ)) {
           lIsRange = false;
@@ -1136,8 +1148,8 @@ sap.ui.define(
       /**
        * Submit Model to Backend
        */
-      this.submitExternal = function(oModel, submit, executeOnApply) {
-        return function(sToReplace, sLongReplaceTarget) {
+      this.submitExternal = function (oModel, submit, executeOnApply) {
+        return function (sToReplace, sLongReplaceTarget) {
           return that.submitAll(oModel, submit, executeOnApply, sToReplace, sLongReplaceTarget);
         };
       };
@@ -1145,7 +1157,7 @@ sap.ui.define(
       /**
        * Submit Model to Backend
        */
-      this.submitAll = function(oModel, submit, executeOnApply, sToReplace, sLongReplaceTarget) {
+      this.submitAll = function (oModel, submit, executeOnApply, sToReplace, sLongReplaceTarget) {
         var ltFilters = [];
 
         var ltModelFilters = oModel.getProperty("/filters");
@@ -1241,8 +1253,8 @@ sap.ui.define(
             }
 
             var loSubmitJson = {
-              filters : ltFilters,
-              axis : loAxis
+              filters: ltFilters,
+              axis: loAxis
             };
 
             if (sToReplace && sLongReplaceTarget) {
@@ -1261,7 +1273,7 @@ sap.ui.define(
       /**
        * Create the ValueHelp Dialog for a Characteristic
        */
-      this.getValueHelpDialog = function(oControl) {
+      this.getValueHelpDialog = function (oControl) {
         var loModel = oControl.getModel();
         var lCharName = loModel.getProperty("/dialog/name");
         var lDestroyFilterDialogCmd = loModel.getProperty("/command/destroyfilterdialog");
@@ -1296,7 +1308,7 @@ sap.ui.define(
           key: "key",
           descriptionKey: lCompound ? "" : "text",
 
-          ok: function(e) {
+          ok: function (e) {
             var ltTokens = e.getParameter("tokens");
             that.applyTokensToFilter(loModel, lCharName, ltTokens, false);
             oControl.zenValueHelpDialog = null;
@@ -1304,13 +1316,13 @@ sap.ui.define(
             loValueHelpDialog.close();
           },
 
-          cancel: function() {
+          cancel: function () {
             oControl.zenValueHelpDialog = null;
             new Function(that.prepareCommand(lDestroyFilterDialogCmd, "__BOOLEAN__", "X"))();
             loValueHelpDialog.close();
           },
 
-          afterClose: function() {
+          afterClose: function () {
             if (oControl.zenValueHelpDialog) {
               oControl.zenValueHelpDialog = null;
               new Function(that.prepareCommand(lDestroyFilterDialogCmd, "__BOOLEAN__", "X"))();
@@ -1327,10 +1339,10 @@ sap.ui.define(
         var getValueHelpMetadata = loValueHelpDialog.getMetadata;
         var loValueHelpDialogPrototype = Object.getPrototypeOf(loValueHelpDialog);
         if (loValueHelpDialogPrototype) {
-          loValueHelpDialogPrototype.getMetadata = function() {
+          loValueHelpDialogPrototype.getMetadata = function () {
             var metadata = getValueHelpMetadata();
-            Object.assign(metadata, {_sClassName: "sap.ui.comp.valuehelpdialog.ValueHelpDialog"});
-            metadata.getName = function() { return "sap.ui.comp.valuehelpdialog.ValueHelpDialog"; };
+            Object.assign(metadata, { _sClassName: "sap.ui.comp.valuehelpdialog.ValueHelpDialog" });
+            metadata.getName = function () { return "sap.ui.comp.valuehelpdialog.ValueHelpDialog"; };
             return metadata;
           };
         }
@@ -1415,7 +1427,7 @@ sap.ui.define(
         var loTable = loValueHelpDialog.getTable();
         if (lHierarchical && loTable.attachToggleOpenState) {
           var lDialogUpdate;
-          loTable.attachToggleOpenState(function(e) {
+          loTable.attachToggleOpenState(function (e) {
             var loParams = e.getParameters();
             loValueHelpDialog._bIgnoreSelectionChange = true;
             if (loParams.expanded) {
@@ -1423,9 +1435,7 @@ sap.ui.define(
               var loModel = loBindingContext.oModel;
               if (loModel.getProperty(loBindingContext.sPath + "/0/node")) {
                 var lMethod = that.prepareCommand(
-                  loModel
-                    .getProperty("/command/expandnode"), "__STRING__", loModel
-                    .getProperty(loBindingContext.sPath + "/key")
+                  loModel.getProperty("/command/expandnode"), "__STRING__", loModel.getProperty(loBindingContext.sPath + "/key")
                 );
                 lMethod = that.prepareCommand(
                   lMethod, "__STRING2__",
@@ -1439,7 +1449,7 @@ sap.ui.define(
           });
 
           var lFuncOnClick = loTable.onclick;
-          loTable.onclick = function() {
+          loTable.onclick = function () {
             if (lFuncOnClick) {
               lFuncOnClick.apply(loTable, arguments);
             }
@@ -1517,7 +1527,7 @@ sap.ui.define(
             }
           });
 
-          loValueHelpDialog.attachSelectionChange(function(e) {
+          loValueHelpDialog.attachSelectionChange(function (e) {
             // collect all the new selected or removed items
             var loRowsBinding = loTable.getBinding("rows");
 
@@ -1571,33 +1581,33 @@ sap.ui.define(
         if (lMemberDisplay === "KEY") {
           loColModel.setData({
             cols: [
-              {label: loModel.getProperty("/text/key"), template: "displaykey"}
+              { label: loModel.getProperty("/text/key"), template: "displaykey" }
             ]
           });
         } else if (lMemberDisplay === "TEXT") {
           loColModel.setData({
             cols: [
-              {label: loModel.getProperty("/text/text"), template: "text"}
+              { label: loModel.getProperty("/text/text"), template: "text" }
             ]
           });
         } else if (lMemberDisplay === "KEY_TEXT") {
           loColModel.setData({
             cols: [
-              {label: loModel.getProperty("/text/key"), template: "displaykey"},
-              {label: loModel.getProperty("/text/text"), template: "text"}
+              { label: loModel.getProperty("/text/key"), template: "displaykey" },
+              { label: loModel.getProperty("/text/text"), template: "text" }
             ]
           });
         } else if (lMemberDisplay === "TEXT_KEY") {
           loColModel.setData({
             cols: [
-              {label: loModel.getProperty("/text/text"), template: "text"},
-              {label: loModel.getProperty("/text/key"), template: "displaykey"}
+              { label: loModel.getProperty("/text/text"), template: "text" },
+              { label: loModel.getProperty("/text/key"), template: "displaykey" }
             ]
           });
         }
         loTable.setModel(loColModel, "columns");
 
-        var loRangeKeyField = {label: loModel.getProperty("/text/key"), key: "key"};
+        var loRangeKeyField = { label: loModel.getProperty("/text/key"), key: "key" };
         if ((lRangesVisible || lSupportsExcluding)) {
           if (lType === "DATE") {
             loRangeKeyField.type = "date";
@@ -1618,15 +1628,16 @@ sap.ui.define(
         var loSearchField = new sap.m.SearchField(
           {
             width: "95%",
-            placeholder:"{/text/search}"}
+            placeholder: "{/text/search}"
+          }
         );
 
         var ltMembers;
         if (lHierarchical) {
           ltMembers = loModel.getProperty("/dialog/members");
           if (ltMembers) {
-            for (var i = 0; i === lMaxChildIndex+1; i++) {
-              var loChild = ltMembers[""+i];
+            for (var i = 0; i === lMaxChildIndex + 1; i++) {
+              var loChild = ltMembers["" + i];
               if (!loChild) {
                 continue;
               }
@@ -1641,7 +1652,7 @@ sap.ui.define(
           loSearchField.setBusyIndicatorDelay(0);
           loValueHelpDialog.TableStateSearchData();
           loSearchField.attachSearch(
-            function(e) {
+            function (e) {
               loSearchField.setBusy(true);
               loValueHelpDialog.TableStateDataSearching();
               var lValue = e.getParameters().query;
@@ -1678,9 +1689,9 @@ sap.ui.define(
           }
 
           loSearchField.setShowSearchButton(false);
-          loSearchField.attachLiveChange(function(e) {
+          loSearchField.attachLiveChange(function (e) {
             var loValue1 = e.getParameters().newValue ? e.getParameters().newValue.toUpperCase() : "";
-            var ltCharsToEscape = [ "\\\\", "\\^", "\\$", "\\+", "\\.", "\\(", "\\)", "\\[", "\\]", "\\{", "\\}" ];
+            var ltCharsToEscape = ["\\\\", "\\^", "\\$", "\\+", "\\.", "\\(", "\\)", "\\[", "\\]", "\\{", "\\}"];
 
             for (var i = 0; i < ltCharsToEscape.length; i++) {
               var lChar = ltCharsToEscape[i];
@@ -1693,13 +1704,13 @@ sap.ui.define(
 
             loValue1 = loValue1.replace(/\?/g, ".").replace(/\*/g, ".*?");
             var loFilter = new sap.ui.model.Filter("searchstring", "Wildcard", loValue1);
-            loFilter.fnTest = function(value) {
+            loFilter.fnTest = function (value) {
               return value.search(new RegExp(loValue1)) !== -1;
             };
             if (!loModel.getProperty("/dialog/selection/maxelements")
-                && !loModel.getProperty("/dialog/hierarchical")) {
+              && !loModel.getProperty("/dialog/hierarchical")) {
               loValueHelpDialog._bIgnoreSelectionChange = true;
-              loValueHelpDialog.getTable().getBinding("rows").filter([ loFilter ]);
+              loValueHelpDialog.getTable().getBinding("rows").filter([loFilter]);
               loValueHelpDialog._bIgnoreSelectionChange = false;
               loValueHelpDialog.update();
             }
@@ -1714,7 +1725,7 @@ sap.ui.define(
       /**
        * Get MemberDispay Mode
        */
-      this.getValueHelpDialogMemberDisplay = function(memberDisplay) {
+      this.getValueHelpDialogMemberDisplay = function (memberDisplay) {
         switch (memberDisplay) {
         case "TEXT_KEY":
           return "descriptionAndId";
@@ -1735,9 +1746,9 @@ sap.ui.define(
       /**
        * get the Technical Name of a Variable
        */
-      this.getVariableTechnicalName = function(varName) {
+      this.getVariableTechnicalName = function (varName) {
         //this technical name recognition works only in S4 mode!!!
-        return varName.substring(varName.indexOf(":")+1, varName.length);
+        return varName.substring(varName.indexOf(":") + 1, varName.length);
       };
       function getSettingsButton(oControl, oSearchField) {
         var loModel = oControl.getModel();
@@ -1747,14 +1758,14 @@ sap.ui.define(
             press: function () {
               var loDialog = new SelectDialog(
                 {
-                  items:{
-                    path:  "/characteristics",
+                  items: {
+                    path: "/characteristics",
                     template: new StandardListItem(
                       {
                         title: "{characteristic/text}",
                         selected: {
                           path: "/visibleprompts",
-                          formatter: function(tVisiblePrompts) {
+                          formatter: function (tVisiblePrompts) {
                             var lVarTechName = that.getVariableTechnicalName(this.getBindingContext().getProperty("characteristic/name"));
                             for (var i = 0; i < tVisiblePrompts.length; i++) {
                               if (tVisiblePrompts[i] === lVarTechName) {
@@ -1776,18 +1787,18 @@ sap.ui.define(
                   //0 === always all of them.
                   growingThreshold: 0,
                   multiSelect: true,
-                  liveChange: function(oEvent) {
+                  liveChange: function (oEvent) {
                     var loFilter = new sap.ui.model.Filter(
                       "characteristic/text",
                       sap.ui.model.FilterOperator.Contains,
                       oEvent.getParameter("value")
                     );
-                    oEvent.getParameter("itemsBinding").filter([ getFilterExcludeMandatory(), loFilter ]);
+                    oEvent.getParameter("itemsBinding").filter([getFilterExcludeMandatory(), loFilter]);
                   },
-                  cancel: function() {
+                  cancel: function () {
                     loDialog.destroy();
                   },
-                  confirm: function(oEvent) {
+                  confirm: function (oEvent) {
                     var ltVisiblePrompts = [];
                     var ltSelectedContexts = oEvent.getParameter("selectedContexts");
                     for (var i = 0; i < ltSelectedContexts.length; i++) {
@@ -1796,7 +1807,7 @@ sap.ui.define(
                         continue;
                       }
                       var lVarName = loSelectedContext.getProperty("characteristic/name");
-                      var lVarTechName = lVarName.substring(lVarName.indexOf(":")+1, lVarName.length);
+                      var lVarTechName = lVarName.substring(lVarName.indexOf(":") + 1, lVarName.length);
                       ltVisiblePrompts.push(lVarTechName);
                     }
                     loModel.setProperty("/visibleprompts", ltVisiblePrompts);
@@ -1814,7 +1825,7 @@ sap.ui.define(
       function getFilterExcludeMandatory() {
         return new sap.ui.model.Filter({
           path: "characteristic",
-          test: function(oVar) {
+          test: function (oVar) {
             return oVar.mandatory ? false : true;
           }
         });
@@ -1822,7 +1833,7 @@ sap.ui.define(
       function getFilterForVisibleVariables(tVisiblePrompts) {
         return new sap.ui.model.Filter({
           path: "characteristic",
-          test: function(oVar) {
+          test: function (oVar) {
             if (oVar.mandatory) {
               return true;
             }
@@ -1846,7 +1857,7 @@ sap.ui.define(
             }
 
             if (loCharacteristic.name === charName) {
-              return "/characteristics/"+i+"/characteristic";
+              return "/characteristics/" + i + "/characteristic";
             }
           }
         }
@@ -1882,18 +1893,18 @@ sap.ui.define(
         }
         return true;
       }
-      this.isDesignModeD4LIncluded = function(){
+      this.isDesignModeD4LIncluded = function () {
         return sap.zen.designmode;
       };
       function forceModelUpdate(oModel, path) {
         var ltBindings = oModel.aBindings.slice(0);
-        jQuery.each(ltBindings, function(index, oBinding) {
+        jQuery.each(ltBindings, function (index, oBinding) {
           if (oBinding.sPath === path) {
             oBinding.checkUpdate(true);
           }
         });
       }
-      this.getCharacteristicByName = function(oModel, charName) {
+      this.getCharacteristicByName = function (oModel, charName) {
         var ltChars = oModel.getProperty("/characteristics");
         for (var i = 0; i < ltChars.length; i++) {
           var loChar = ltChars[i].characteristic;
@@ -1906,7 +1917,7 @@ sap.ui.define(
         }
         return null;
       };
-      this.getContextMenuAction = function(sContextMenuComponentId, oClickedUI5Component, oDomClickedElement) {
+      this.getContextMenuAction = function (sContextMenuComponentId, oClickedUI5Component, oDomClickedElement) {
         var lCommand = oClickedUI5Component.getModel().getProperty("/command/createcontextmenu");
         if (lCommand && oClickedUI5Component.ZEN_IdToDimensionMap) {
           var loListItem = this.getListItemElement(oDomClickedElement);
@@ -1924,17 +1935,17 @@ sap.ui.define(
         }
         return null;
       };
-      this.getListItemElement = function(oDom) {
+      this.getListItemElement = function (oDom) {
         if (oDom.hasClass("sapzenfilterpanelM-ListItem")) {
           return oDom;
         } else {
           return oDom.parents(".sapzenfilterpanelM-ListItem");
         }
       };
-      this.getType = function() {
+      this.getType = function () {
         return "filter";
       };
-      this.getDecorator = function() {
+      this.getDecorator = function () {
         return "DataSourceControlDecorator";
       };
     };