Skip to content

Fix styles in the TreeGrid Child Summaries sample #1338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 24, 2019
Merged

Fix styles in the TreeGrid Child Summaries sample #1338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2962ab
samples(treeGrid): clean up TreeGrid child summaries sample #1328
DiyanDimitrov Jul 23, 2019
692e341
Merge branch 'master' into ddimitrov/fix-1328
rmkrmk Jul 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 18 additions & 43 deletions src/app/tree-grid/tree-grid-summary2-sample/tree-grid-summary2-sample.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,46 +6,21 @@
<igx-buttongroup [values]="summaryPositions" (onSelect)="selectSummaryPosition($event)"></igx-buttongroup>
</div>

<div class="grid__wrapper">
<igx-tree-grid #treegrid1 [data]="data" [autoGenerate]="false" height="600px" width="100%"
primaryKey="ID" foreignKey="ParentID">
<igx-column #col field="ID" header="Product ID" [sortable]="true">
</igx-column>
<igx-column #col field="Name" header="Product Name" [hasSummary]="true">
<ng-template igxCell let-cell="cell" let-val>
{{ val }}
</ng-template>
<ng-template igxHeader let-col>
<div class="text">{{col.field}}</div>
<igx-icon class="header-icon" color="{{ col.hasSummary ? '#e41c77' : '' }}" (click)="toggleSummary(col)">functions</igx-icon>
</ng-template>
</igx-column>
<igx-column #col field="UnitPrice" header="Price" [filterable]="false" editable="true" dataType="number"
[hasSummary]="true" [summaries]="priceSummary">
<ng-template igxCell let-cell="cell" let-val let-row>
${{ val }}
</ng-template>
<ng-template igxHeader let-col>
<div class="text">Price</div>
<igx-icon class="header-icon" color="{{ col.hasSummary ? '#e41c77' : '' }}" (click)="toggleSummary(col)">functions</igx-icon>
</ng-template>
</igx-column>
<igx-column #col field="Discontinued" header="Discontinued" [dataType]="'boolean'">
<ng-template igxCell let-cell="cell" let-val>
<img *ngIf="val" src="assets/images/grid/active.png" title="Continued" alt="Continued" />
<img *ngIf="!val" src="assets/images/grid/expired.png" title="Discontinued" alt="Discontinued" />
</ng-template>
<ng-template igxHeader let-col>
<div class="text">{{ col.field }}</div>
</ng-template>
</igx-column>
<igx-column #col field="AddedDate" header="Added Date" [dataType]="'date'">
<ng-template igxCell let-cell="cell" let-val let-row>
{{ val | date: 'MMM d, yyyy' }}
</ng-template>
<ng-template igxHeader let-col>
<div class="text">Added Date</div>
</ng-template>
</igx-column>
</igx-tree-grid>
</div>
<igx-tree-grid #treegrid1 [data]="data" [autoGenerate]="false" height="600px" width="100%"
primaryKey="ID" foreignKey="ParentID">
<igx-column #col field="ID" header="Product ID" [sortable]="true">
</igx-column>
<igx-column #col field="Name" header="Product Name" [hasSummary]="true">
</igx-column>
<igx-column #col field="UnitPrice" header="Price" [formatter]="formatCurrency" [filterable]="false" editable="true" dataType="number"
[hasSummary]="true" [summaries]="avgSummary">
</igx-column>
<igx-column #col field="Discontinued" header="Discontinued" [dataType]="'boolean'">
<ng-template igxCell let-cell="cell" let-val>
<img *ngIf="val" src="assets/images/grid/active.png" title="Continued" alt="Continued" />
<img *ngIf="!val" src="assets/images/grid/expired.png" title="Discontinued" alt="Discontinued" />
</ng-template>
</igx-column>
<igx-column #col field="AddedDate" header="Added Date" [dataType]="'date'">
</igx-column>
</igx-tree-grid>
83 changes: 0 additions & 83 deletions src/app/tree-grid/tree-grid-summary2-sample/tree-grid-summary2-sample.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,86 +1,3 @@
.grid-controls {
display: flex;
flex-flow: column nowrap;
justify-content: space-between;
margin: 0 16px 24px;

igx-switch {
margin-top: 24px;
}

}

.grid__wrapper {
margin: 0 16px;
}

.header {
height: 100%;
}

.igx-grid__th .title{
width: 100%;
cursor: auto;
}

@media screen and (max-width: 677px){

[class*=header-icon]{
padding-bottom: 17px;
padding-top: 17px;
font-size: 1.4em;
width: 1.1em;
height: 1.1em;
float: right;
}
[class*=text]{
float:left;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
width: 50%;
}
}

@media screen and (min-width: 677px){

[class*=header-icon]{
padding-top: 17px;
font-size: 1.4em;
width: 1.1em;
height: 1.1em;
float: right;
}

[class*=text] {
float:left;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
width: 50%;
}
}

@media screen and (min-width: 992px){

[class*=header-icon] {
padding-top: 17px;
font-size: 1.4em;
width: 1.1em;
height: 1.1em;
float: right;
margin-right: 10px;
cursor: pointer;
}

[class*=text] {
float:left;
white-space: nowrap;
width: 50%;
cursor: auto;
}
}

:host {
display: block;
padding: 8px;
Expand Down
44 changes: 2 additions & 42 deletions src/app/tree-grid/tree-grid-summary2-sample/tree-grid-summary2-sample.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,25 +31,7 @@ class AvgSummary extends IgxSummaryOperand {
}
}

class SumSummary extends IgxSummaryOperand {

constructor() {
super();
}

public operate(data?: any[]): IgxSummaryResult[] {
const result = [];
result.push({
key: "sum",
label: "Sum",
summaryResult: IgxNumberSummaryOperand.sum(data)
});
return result;
}
}

@Component({
encapsulation: ViewEncapsulation.None,
selector: "app-tree-grid-summary2-sample",
styleUrls: ["./tree-grid-summary2-sample.component.scss"],
templateUrl: "./tree-grid-summary2-sample.component.html"
Expand All @@ -62,14 +44,11 @@ export class TreeGridSummary2SampleComponent implements OnInit {

public expr: ISortingExpression[];
public avgSummary = AvgSummary;
public sumSummary = SumSummary;
public summaryPositions;
public summaryPosition = GridSummaryPosition.bottom;
public summaryCalcModes;
public summaryCalculationMode = GridSummaryCalculationMode.rootAndChildLevels;

public priceSummary = CustomPriceSummary;

constructor() {
this.data = FOODS_DATA();
this.expr = [
Expand Down Expand Up @@ -133,26 +112,7 @@ export class TreeGridSummary2SampleComponent implements OnInit {
this.grid1.summaryCalculationMode = this.summaryCalculationMode;
}

public toggleSummary(column: IgxColumnComponent) {
column.hasSummary = !column.hasSummary;
}
}

export class CustomPriceSummary extends IgxNumberSummaryOperand {

constructor() {
super();
}

public operate(data?: any[]): IgxSummaryResult[] {
const result = [];
result.push(
{
key: "average",
label: "average",
summaryResult: data.length ? IgxNumberSummaryOperand.average(data).toFixed(2) : null
}
);
return result;
public formatCurrency(value: number) {
return "$" + value.toFixed(2);
}
}