Updated logic to show and hide dimensions

rileymd88 · Apr 3, 2020 · f4e11cc · f4e11cc
1 parent edbe50e
commit f4e11cc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -11,6 +11,9 @@ If you want to do code changes to the extension follow these simple steps to get
 3. Run `npm install`
 4. Run `npm run build` - to build a dev-version to the /dist folder.
 
+## Release Notes v0.5
+* Updated logic to show and hide dimensions
+
 ## Release Notes v0.4.1
 * Updated node packages
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "qwik-table",
-  "version": "0.0.1",
-  "description": "An easy way to create a standard customised table in Qlik Sense",
+  "version": "0.5",
+  "description": "An easy way to create a standard customized table in Qlik Sense",
   "homepage": "https://github.com/rileymd88/qwik-table",
   "repository": "https://github.com/rileymd88/qwik-table",
   "author": "Riley MacDonald",

diff --git a/src/controller.js b/src/controller.js
@@ -376,13 +376,13 @@ export default ['$scope', '$element', function ($scope, $element) {
       // Transform table props into new flexible table
       let newTableProps = JSON.parse(JSON.stringify(tableProps));
       for (let dc = 0; dc < newTableProps.qHyperCubeDef.qDimensions.length; dc++) {
-        newTableProps.qHyperCubeDef.qDimensions[dc].qCalcCondition.qCond.qv = `=SubStringCount(Concat([${$scope.dimName}ID], '|'), '${dimensionLabels[dc].id}')`;
+        newTableProps.qHyperCubeDef.qDimensions[dc].qCalcCondition.qCond.qv = `=SubStringCount(Concat([${$scope.dimName}ID], '|'), '${dimensionLabels[dc].id}') and GetSelectedCount([${$scope.dimName}]) > 0`;
       }
       for (let mc = 0; mc < newTableProps.qHyperCubeDef.qMeasures.length; mc++) {
-        newTableProps.qHyperCubeDef.qMeasures[mc].qCalcCondition.qCond.qv = `=SubStringCount(Concat([${$scope.mesName}ID], '|'), '${measureLabels[mc].id}')`;
+        newTableProps.qHyperCubeDef.qMeasures[mc].qCalcCondition.qCond.qv = `=SubStringCount(Concat([${$scope.mesName}ID], '|'), '${measureLabels[mc].id}') and GetSelectedCount([${$scope.mesName}]) > 0`;
       }
-      newTableProps.qHyperCubeDef.qCalcCond = `GetSelectedCount([${$scope.dimName}]) > 0 and GetSelectedCount([${$scope.mesName}]) > 0`;
-      newTableProps.qHyperCubeDef.qCalcCondition.qCond.qv = `GetSelectedCount([${$scope.dimName}]) > 0 and GetSelectedCount([${$scope.mesName}]) > 0`;
+      newTableProps.qHyperCubeDef.qCalcCond = `GetSelectedCount([${$scope.dimName}]) > 0 or GetSelectedCount([${$scope.mesName}]) > 0`;
+      newTableProps.qHyperCubeDef.qCalcCondition.qCond.qv = `GetSelectedCount([${$scope.dimName}]) > 0 or GetSelectedCount([${$scope.mesName}]) > 0`;
       newTableProps.qHyperCubeDef.qCalcCondition.qMsg.qv = "Please select your dimensions and measures";
       newTableProps.qInfo.qId = $scope.layoutId;
       newTableProps.qInfo.qType = 'table';