From 355325e95615cd6cb57073408062c0e300acb37a Mon Sep 17 00:00:00 2001 From: IvayloG Date: Thu, 13 Dec 2018 14:16:39 +0200 Subject: [PATCH 1/4] fix: Fix CustomDateSummary result #424 --- .../files/src/app/__path__/__name__.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/angular/igx-ts/grid/grid-summaries/files/src/app/__path__/__name__.component.ts b/templates/angular/igx-ts/grid/grid-summaries/files/src/app/__path__/__name__.component.ts index 7284d1cd5..664488285 100644 --- a/templates/angular/igx-ts/grid/grid-summaries/files/src/app/__path__/__name__.component.ts +++ b/templates/angular/igx-ts/grid/grid-summaries/files/src/app/__path__/__name__.component.ts @@ -47,12 +47,12 @@ class CustomDateSummary extends IgxDateSummaryOperand { result.push({ key: 'earliest', label: 'Earliest Date', - summaryResult: (IgxDateSummaryOperand.earliest(data)).toLocaleDateString() + summaryResult: data.length ? (IgxDateSummaryOperand.earliest(data)).toLocaleDateString() : null }); result.push({ key: 'latest', label: 'Latest Date', - summaryResult: (IgxDateSummaryOperand.latest(data)).toLocaleDateString() + summaryResult: data.length ? ( IgxDateSummaryOperand.latest(data)).toLocaleDateString() : null }); return result; From 188441aae402638973d706bb5f112a0a1f2479f5 Mon Sep 17 00:00:00 2001 From: IvayloG Date: Thu, 13 Dec 2018 14:19:03 +0200 Subject: [PATCH 2/4] Update __name__.component.ts --- .../grid-summaries/files/src/app/__path__/__name__.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/angular/igx-ts/grid/grid-summaries/files/src/app/__path__/__name__.component.ts b/templates/angular/igx-ts/grid/grid-summaries/files/src/app/__path__/__name__.component.ts index 664488285..7ba9ad260 100644 --- a/templates/angular/igx-ts/grid/grid-summaries/files/src/app/__path__/__name__.component.ts +++ b/templates/angular/igx-ts/grid/grid-summaries/files/src/app/__path__/__name__.component.ts @@ -52,7 +52,7 @@ class CustomDateSummary extends IgxDateSummaryOperand { result.push({ key: 'latest', label: 'Latest Date', - summaryResult: data.length ? ( IgxDateSummaryOperand.latest(data)).toLocaleDateString() : null + summaryResult: data.length ? (IgxDateSummaryOperand.latest(data)).toLocaleDateString() : null }); return result; From 82f1a3c1450b589f7e5f83bb98e17d18b32f9ccc Mon Sep 17 00:00:00 2001 From: IvayloG Date: Thu, 13 Dec 2018 16:48:58 +0200 Subject: [PATCH 3/4] fix: Update toggle function that enables summaries. #425 --- .../files/src/app/__path__/__name__.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/angular/igx-ts/grid/grid-summaries/files/src/app/__path__/__name__.component.ts b/templates/angular/igx-ts/grid/grid-summaries/files/src/app/__path__/__name__.component.ts index 7ba9ad260..3f64b3d05 100644 --- a/templates/angular/igx-ts/grid/grid-summaries/files/src/app/__path__/__name__.component.ts +++ b/templates/angular/igx-ts/grid/grid-summaries/files/src/app/__path__/__name__.component.ts @@ -13,7 +13,7 @@ import { employeesData } from './localData'; export class GridSummariesComponent implements OnInit { @ViewChild('sampleGrid', { read: IgxGridComponent }) public sampleGrid: IgxGridComponent; - customDateSummary = CustomDateSummary; + public customDateSummary = CustomDateSummary; public localData: any[]; title = 'Grid Summaries'; @@ -32,7 +32,7 @@ export class GridSummariesComponent implements OnInit { if (this.sampleGrid.getColumnByName(name).hasSummary) { this.sampleGrid.disableSummaries(name); } else { - this.sampleGrid.enableSummaries(name, this.customDateSummary); + this.sampleGrid.enableSummaries(name); } } } From 4d052b2676a8cef0558134a245798e0cf6e940ad Mon Sep 17 00:00:00 2001 From: IvayloG Date: Thu, 13 Dec 2018 17:32:56 +0200 Subject: [PATCH 4/4] fix: FIx adding more than one component. #425 --- .../files/src/app/__path__/__name__.component.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/templates/angular/igx-ts/grid/grid-summaries/files/src/app/__path__/__name__.component.ts b/templates/angular/igx-ts/grid/grid-summaries/files/src/app/__path__/__name__.component.ts index 3f64b3d05..75b0295cf 100644 --- a/templates/angular/igx-ts/grid/grid-summaries/files/src/app/__path__/__name__.component.ts +++ b/templates/angular/igx-ts/grid/grid-summaries/files/src/app/__path__/__name__.component.ts @@ -6,11 +6,13 @@ import { employeesData } from './localData'; @Component({ encapsulation: ViewEncapsulation.None, - selector: 'app-grid-summaries', - templateUrl: './grid-summaries.component.html', - styleUrls: ['./grid-summaries.component.scss'] + selector: 'app-$(filePrefix)', + templateUrl: './$(filePrefix).component.html', + styleUrls: ['./$(filePrefix).component.scss'] }) -export class GridSummariesComponent implements OnInit { + + +export class $(ClassName)Component implements OnInit { @ViewChild('sampleGrid', { read: IgxGridComponent }) public sampleGrid: IgxGridComponent; public customDateSummary = CustomDateSummary;