Add support for multiple measures.

Author: MKirova

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.component.ts

@@ -260,13 +260,16 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
         let columns = [];
         fields.forEach((value, key) => {
             if (value.children == null || value.children.length === 0 || value.children.size === 0) {
-                const ref = factoryColumn.create(this.viewRef.injector);
+                const ref = factoryColumnGroup.create(this.viewRef.injector);
                 ref.instance.header = parent != null ? key.split(parent.header + '-')[1] : key;
                 ref.instance.field = key;
-                ref.instance.dataType = this.resolveDataTypes(data[0][key]);
                 ref.instance.parent = parent;
                 ref.changeDetectorRef.detectChanges();
+
+                const children = this.getMeasureChildren(factoryColumn, data , ref.instance);
+                ref.instance.children.reset(children);
                 columns.push(ref.instance);
+                columns = columns.concat(children);
             } else {
                 const ref = factoryColumnGroup.create(this.viewRef.injector);
                 ref.instance.parent = parent;
@@ -295,5 +298,19 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
         return columns;
     }
 
+    protected getMeasureChildren(colFactory, data, parent){
+        const cols = [];
+        this.pivotConfiguration.values.forEach(val => {
+            const ref = colFactory.create(this.viewRef.injector);
+            ref.instance.header = val.member;
+            ref.instance.field = parent.field + '-' + val.member;
+            ref.instance.parent = parent;
+            ref.instance.dataType = this.resolveDataTypes(data[0][val.member]);
+            ref.changeDetectorRef.detectChanges();
+            cols.push(ref.instance);
+        });
+        return cols;
+    }
+
 
 }

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-util.ts

@@ -110,7 +110,7 @@ export class PivotUtil {
             const obj = {};
             for (const value of values) {
                 if(h[pivotKeys.aggregations]) {
-                    obj[key] = h[pivotKeys.aggregations][value.member];
+                    obj[key + '-' + value.member] = h[pivotKeys.aggregations][value.member];
                 }
                 obj[pivotKeys.records] = h[pivotKeys.records];
                 flatData.push(obj);

src/app/pivot-grid/pivot-grid.sample.ts

@@ -47,24 +47,8 @@ export class PivotGridSampleComponent {
         columns: [{
             member: 'Country',
             enabled: true,
-            childLevels: [{
-                member: 'SellerName',
-                enabled: true,
-                childLevels: [
-                    {
-                        member: 'Date',
-                        enabled: true,
-                        childLevels: []
-                    },
-                    ]
-            }]
-        },
-
-        {
-            member: 'ProductCategory',
-            enabled: true,
             childLevels: []
-        }
+        },
         ]
 ,
         rows: [{
@@ -84,6 +68,11 @@ export class PivotGridSampleComponent {
                 member: 'UnitsSold',
                 aggregate: IgxNumberSummaryOperand.sum,
                 enabled: true
+            },
+            {
+                member: 'UnitPrice',
+                aggregate: IgxNumberSummaryOperand.sum,
+                enabled: true
             }
         ],
         filters: null