From ea8b62d57383741ba732812424e5a97c6eb098d1 Mon Sep 17 00:00:00 2001 From: Stefano Scalzo Date: Fri, 14 Feb 2020 11:26:04 -0500 Subject: [PATCH 1/6] fix checkboxes --- .../examples/table-checkboxes-example.component.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.html b/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.html index 6ca2599e0da..9fa3bd5c8f0 100644 --- a/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.html +++ b/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.html @@ -1,7 +1,7 @@ - + @@ -12,12 +12,12 @@ - - - - + + + + From 6f657ea38933ab85b69becb91b2652c892f84ff3 Mon Sep 17 00:00:00 2001 From: Stefano Scalzo Date: Fri, 14 Feb 2020 11:34:09 -0500 Subject: [PATCH 2/6] add select all --- .../table/examples/table-checkboxes-example.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.html b/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.html index 9fa3bd5c8f0..8e45f3c1090 100644 --- a/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.html +++ b/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.html @@ -1,7 +1,7 @@
Column 1 Column 2 Column 3
- + {{row.column1}}{{row.column2}}{{row.column3}}{{row.date}}{{ row.column1 }}{{ row.column2 }}{{ row.column3 }}{{ row.date }}
- + @@ -12,7 +12,7 @@ From 5d255904165b0b38993c603f4cac2764063f1a65 Mon Sep 17 00:00:00 2001 From: Stefano Scalzo Date: Fri, 14 Feb 2020 13:22:56 -0500 Subject: [PATCH 3/6] add compact --- .../examples/table-checkboxes-example.component.html | 11 +++++++++-- .../examples/table-checkboxes-example.component.ts | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.html b/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.html index 8e45f3c1090..c498c4f0a7c 100644 --- a/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.html +++ b/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.html @@ -1,7 +1,14 @@
Column 1 Column 2 Column 3
- + {{ row.column1 }} {{ row.column2 }}
- + @@ -12,7 +19,7 @@ diff --git a/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.ts b/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.ts index 21d9422d1e1..21adbbeb958 100644 --- a/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.ts +++ b/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.ts @@ -7,7 +7,7 @@ import { Component } from '@angular/core'; export class TableCheckboxesExampleComponent { selectedRows = []; - + selectMasterModel = false; allSelected = false; tableRows = [ From 1ef1cf26ba6ed7548945d6443111a256664548c9 Mon Sep 17 00:00:00 2001 From: Stefano Scalzo Date: Fri, 14 Feb 2020 14:26:51 -0500 Subject: [PATCH 4/6] work with ngModel --- .../table/examples/table-checkboxes-example.component.html | 7 ++++++- .../table/examples/table-checkboxes-example.component.ts | 5 +++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.html b/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.html index c498c4f0a7c..8362f18d6c6 100644 --- a/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.html +++ b/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.html @@ -19,7 +19,12 @@ diff --git a/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.ts b/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.ts index 21adbbeb958..e8e31b1a61b 100644 --- a/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.ts +++ b/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.ts @@ -53,9 +53,10 @@ export class TableCheckboxesExampleComponent { } ]; - select(event: any, row: number): void { - if (event.srcElement.checked) { + select(row: number): void { + if (this.tableRows[row].checked === false) { this.selectedRows.push(row); + console.log(this.tableRows); this.tableRows[row].checked = true; } else { this.selectedRows.splice(this.selectedRows.indexOf(row), 1); From 140d88f9da1e06dd2dda3e4eb2cbab2ef9d4daf7 Mon Sep 17 00:00:00 2001 From: deno Date: Sun, 16 Feb 2020 16:31:39 -0500 Subject: [PATCH 5/6] update the PR reflecting the comments skip ci skip --- .../table-checkboxes-example.component.html | 28 ++++++++----------- .../table-checkboxes-example.component.ts | 1 - 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.html b/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.html index 8362f18d6c6..3c71b9af28e 100644 --- a/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.html +++ b/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.html @@ -2,12 +2,10 @@ @@ -19,17 +17,15 @@ - - - - + + + + diff --git a/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.ts b/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.ts index e8e31b1a61b..35b301d618e 100644 --- a/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.ts +++ b/apps/docs/src/app/core/component-docs/table/examples/table-checkboxes-example.component.ts @@ -56,7 +56,6 @@ export class TableCheckboxesExampleComponent { select(row: number): void { if (this.tableRows[row].checked === false) { this.selectedRows.push(row); - console.log(this.tableRows); this.tableRows[row].checked = true; } else { this.selectedRows.splice(this.selectedRows.indexOf(row), 1); From 967e35d645e47dbfe496f712f40a29abf9325b9c Mon Sep 17 00:00:00 2001 From: deno Date: Sun, 16 Feb 2020 22:46:45 -0500 Subject: [PATCH 6/6] empty
+ + Column 1 Column 2 Column 3
- + {{ row.column1 }} {{ row.column2 }}
- + {{ row.column1 }} {{ row.column2 }}
- + Column 1 Column 2
- + {{ row.column1 }}{{ row.column2 }}{{ row.column3 }}{{ row.date }}{{row.column1}}{{row.column2}}{{row.column3}}{{row.date}}