gamma-app-controller 1.2.7 → 1.2.9

package/fesm2015/gamma-app-controller.mjs

@@ -1030,15 +1030,6 @@ class CommonService {
             return percent * (xMax - xMin) + xMin;
         }
     }
-    ThousandSeparator(value) {
-        if (Number(value)) {
-            if (value > 0 && value < 1) {
-                return value;
-            }
-            return Number(value).toLocaleString();
-        }
-        return value;
-    }
     reformatNumberWithThousandSeparator(value) {
         if (Number(value)) {
             if (value > 0 && value < 1) {
@@ -1991,11 +1982,11 @@ class CommonService {
         return result;
         return result;
     }
-    ThousandSeparatorWithTwoDecimals(value) {
+    formatNumberWithDecimalPlaces(value, numberOfDigits) {
         let val;
         const numericValue = Number(value);
         if (!isNaN(numericValue)) {
-            val = numericValue.toFixed(2);
+            val = numericValue.toFixed(numberOfDigits);
         }
         else {
             if (value == "-") {
@@ -2006,7 +1997,21 @@ class CommonService {
                 return NaN;
             }
         }
-        return Number(val);
+        var parts = val.toString().split(".");
+        parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+        return parts.join(".");
+    }
+    ThousandSeparatorWithTwoDecimals(value) {
+        return this.formatNumberWithDecimalPlaces(value, 2);
+    }
+    ThousandSeparator(value) {
+        if (Number(value)) {
+            if (value > 0 && value < 1) {
+                return value;
+            }
+            return Number(value).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+        }
+        return value;
     }
 }
 CommonService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: CommonService, deps: [{ token: i1.HttpClient }, { token: i3$1.ToastrService }, { token: i3.DomSanitizer }], target: i0.ɵɵFactoryTarget.Injectable });
@@ -8579,7 +8584,6 @@ class GammaAdvanceOperatorTableComponent {
             return;
         }
         else {
-            debugger;
             this.isLoader = true;
             this.page_config = value;
             this.page_parms = value.titleParams;
@@ -18368,9 +18372,9 @@ class KpiWithDataSetTestComponent {
             let apiCalls = [];
             this.allWidgetByDataset.forEach(view => {
                 view.datasetIds.forEach(id => {
-                    let found = this.dataSetModal.find(d => d.datasetId === id);
+                    let found = this.dataSetModal.find(d => d.datasetId === id.datasetId);
                     if (found) {
-                        apiCalls.push(this.datasetService.getDataFromDataSet(found, id, filter));
+                        apiCalls.push(this.datasetService.getDataFromDataSet(found, id.datasetId, filter));
                     }
                 });
             });
@@ -19269,9 +19273,9 @@ class KpiWithDataSetTestComponent {
             let apiCalls = [];
             this.allWidgetByDataset.forEach(view => {
                 view.datasetIds.forEach(id => {
-                    let found = this.dataSetModal.find(d => d.datasetId === id);
+                    let found = this.dataSetModal.find(d => d.datasetId === id.datasetId);
                     if (found) {
-                        apiCalls.push(this.datasetService.getDataFromDataSet(found, id, filter));
+                        apiCalls.push(this.datasetService.getDataFromDataSet(found, id.datasetId, filter));
                     }
                 });
             });
@@ -19302,9 +19306,9 @@ class KpiWithDataSetTestComponent {
             let apiCalls = [];
             this.allWidgetByDataset.forEach(view => {
                 view.datasetIds.forEach(id => {
-                    let found = this.dataSetModal.find(d => d.datasetId === id);
+                    let found = this.dataSetModal.find(d => d.datasetId === id.datasetId);
                     if (found) {
-                        apiCalls.push(this.datasetService.getDataFromDataSet(found, id, filter));
+                        apiCalls.push(this.datasetService.getDataFromDataSet(found, id.datasetId, filter));
                     }
                 });
             });
@@ -19329,6 +19333,7 @@ class KpiWithDataSetTestComponent {
         this.defaultViewIdsOnPageRefresh = [];
         const params = this.activatedRoute.snapshot.queryParams;
         this.defaultViewIdsOnPageRefresh = (params['views'] && params['views'] !== "") ? JSON.parse(decodeURIComponent(params['views'])) : [];
+        debugger;
         all_views.forEach(element => {
             for (let entry of element.widgetNode) {
                 let shouldDisplay = false;
@@ -19376,7 +19381,7 @@ class KpiWithDataSetTestComponent {
             currentViews.push(filterData);
         }
         const encodedViews = encodeURIComponent(JSON.stringify(currentViews));
-        const mergedParams = Object.assign({}, currentParams);
+        const mergedParams = Object.assign(Object.assign({}, currentParams), { views: encodedViews });
         const navigation = {
             queryParams: mergedParams,
             queryParamsHandling: 'merge'