Merge branch 'pivot-grid-master' of https://github.com/IgniteUI/igniteui-angular into mdragnev/pivot-formatting

Author: mddragnev

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

@@ -18,7 +18,7 @@ import { GridType } from '../common/grid.interface';
 import { IgxGridNavigationService } from '../grid-navigation.service';
 import { IgxGridCRUDService } from '../common/crud.service';
 import { IgxGridSummaryService } from '../summaries/grid-summary.service';
-import { IPivotConfiguration, IPivotDimension } from './pivot-grid.interface';
+import { IPivotConfiguration, PivotDimensionType } from './pivot-grid.interface';
 import { IgxPivotHeaderRowComponent } from './pivot-header-row.component';
 import { IgxColumnGroupComponent } from '../columns/column-group.component';
 import { IgxColumnComponent } from '../columns/column.component';
@@ -205,26 +205,44 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
         return MINIMUM_COLUMN_WIDTH * rowDimCount;
     }
 
-    public toggleColumn(col: IgxColumnComponent) {
-        const state = this.columnGroupStates.get(col.field);
-        const newState = !state;
-        this.columnGroupStates.set(col.field, newState);
-        const fieldColumns = col.children.filter(x => !x.columnGroup);
-        const groupColumns = col.children.filter(x => x.columnGroup);
-        groupColumns.forEach(groupColumn => {
+   public toggleColumn(col: IgxColumnComponent) {
+       const state = this.columnGroupStates.get(col.field);
+       const newState = !state;
+       this.columnGroupStates.set(col.field, newState);
+       this.toggleGroup(col, newState);
+       this.reflow();
+   }
+
+   protected toggleGroup(col: IgxColumnComponent, newState: boolean) {
+        if (this.hasMultipleValues) {
+            const fieldColumns =  col.children.filter(x => !x.columnGroup);
+            const groupColumns =  col.children.filter(x => x.columnGroup);
+            groupColumns.forEach(groupColumn => {
+                groupColumn.hidden = newState;
+                this.resolveToggle(groupColumn);
+            });
+            fieldColumns.forEach(fieldColumn => {
+                fieldColumn.hidden = !newState;
+            });
+        } else {
+            const parentCols = col.parent ? col.parent.children : this.columns.filter(x => x.level === 0);
+            const fieldColumn =  parentCols.filter(x => x.header === col.header && !x.columnGroup)[0];
+            const groupColumn =  parentCols.filter(x => x.header === col.header && x.columnGroup)[0];
             groupColumn.hidden = newState;
             this.resolveToggle(groupColumn);
-        });
-        fieldColumns.forEach(fieldColumn => {
             fieldColumn.hidden = !newState;
-        });
-        this.reflow();
-    }
+            if (newState) {
+            fieldColumn.headerTemplate = this.headerTemplate;
+            } else {
+            fieldColumn.headerTemplate = undefined;
+            }
+        }
+   }
 
-    protected resolveToggle(groupColumn: IgxColumnComponent) {
-        const hasChildGroup = groupColumn.children.filter(x => x.columnGroup).length > 0;
-        if (!groupColumn.hidden && hasChildGroup) {
-            const fieldChildren = groupColumn.children.filter(x => !x.columnGroup);
+   protected resolveToggle(groupColumn: IgxColumnComponent) {
+    const hasChildGroup = groupColumn.children.filter(x => x.columnGroup).length > 0;
+        if (!groupColumn.hidden &&  hasChildGroup) {
+            const fieldChildren =  groupColumn.children.filter(x => !x.columnGroup);
             const groupChildren = groupColumn.children.filter(x => x.columnGroup);
             groupChildren.forEach(group => {
                 this.resolveToggle(group);
@@ -242,6 +260,10 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
     protected calcGridHeadRow() {
     }
 
+    protected get hasMultipleValues() {
+        return this.pivotConfiguration.values.length > 1;
+    }
+
     /**
      * @hidden
      */
@@ -250,8 +272,9 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
         const fieldsMap = PivotUtil.getFieldsHierarchy(
             data,
             this.pivotConfiguration.columns,
-            { aggregations: 'aggregations', records: 'records', children: 'children', level: 'level' }
-        );
+            PivotDimensionType.Column,
+            {aggregations: 'aggregations', records: 'records', children: 'children', level: 'level'}
+            );
         const columns = this.generateColumnHierarchy(fieldsMap, data);
         this._autoGeneratedCols = columns;
 
@@ -267,7 +290,9 @@ 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 = factoryColumnGroup.create(this.viewRef.injector);
+                const ref = this.hasMultipleValues ?
+                factoryColumnGroup.create(this.viewRef.injector) :
+                factoryColumn.create(this.viewRef.injector);
                 ref.instance.header = parent != null ? key.split(parent.header + '-')[1] : key;
                 ref.instance.field = key;
                 ref.instance.parent = parent;
@@ -276,7 +301,12 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
                 const measureChildren = this.getMeasureChildren(factoryColumn, data, ref.instance, false);
                 ref.instance.children.reset(measureChildren);
                 columns.push(ref.instance);
-                columns = columns.concat(measureChildren);
+                if (this.hasMultipleValues) {
+                    const measureChildren = this.getMeasureChildren(factoryColumn, data , ref.instance, false);
+                    ref.instance.children.reset(measureChildren);
+                    columns = columns.concat(measureChildren);
+                }
+
             } else {
                 const ref = factoryColumnGroup.create(this.viewRef.injector);
                 ref.instance.parent = parent;
@@ -285,18 +315,29 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
                 if (value.expandable) {
                     ref.instance.headerTemplate = this.headerTemplate;
                 }
+                if(!this.hasMultipleValues) {
+                    const refSibling = factoryColumn.create(this.viewRef.injector);
+                    refSibling.instance.header = parent != null ? key.split(parent.header + '-')[1] : key;
+                    refSibling.instance.field = key;
+                    refSibling.instance.dataType = this.resolveDataTypes(data[0][key]);
+                    refSibling.instance.parent = parent;
+                    refSibling.instance.hidden = true;
+                    columns.push(refSibling.instance);
+                }
                 const children = this.generateColumnHierarchy(value.children, data, ref.instance);
                 const filteredChildren = children.filter(x => x.level === ref.instance.level + 1);
                 ref.changeDetectorRef.detectChanges();
-
-                const measureChildren = this.getMeasureChildren(factoryColumn, data, ref.instance, true);
-                const nestedChildren = filteredChildren.concat(measureChildren);
-
-                const allChildren = children.concat(measureChildren);
-                ref.instance.children.reset(nestedChildren);
-
                 columns.push(ref.instance);
-                columns = columns.concat(allChildren);
+                if (this.hasMultipleValues) {
+                    const measureChildren = this.getMeasureChildren(factoryColumn, data , ref.instance, true);
+                    const nestedChildren = filteredChildren.concat(measureChildren);
+                    const allChildren = children.concat(measureChildren);
+                    ref.instance.children.reset(nestedChildren);
+                    columns = columns.concat(allChildren);
+                } else {
+                    ref.instance.children.reset(filteredChildren);
+                    columns = columns.concat(children);
+                }
             }
         });
         this.reflow();

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

@@ -39,3 +39,8 @@ export interface IPivotKeys {
     aggregations: string;
     level: string;
 }
+
+export enum PivotDimensionType {
+    Row,
+    Column
+}