Commit d78dcf2bbec4bfa4040982805689e4e9dd817962
qweqw
Showing
2 changed files
with
21 additions
and
1 deletions
Show diff stats
src/app/data/bus-stop/bus-stop.component.html
1 | <md-card tdMediaToggle="gt-xs" [mediaClasses]="['push']"> | 1 | <md-card tdMediaToggle="gt-xs" [mediaClasses]="['push']"> |
2 | +<<<<<<< HEAD | ||
2 | <div> | 3 | <div> |
3 | <h1>Rich Grid with Pure JavaScript</h1> | 4 | <h1>Rich Grid with Pure JavaScript</h1> |
4 | <div style="clear: both;"></div> | 5 | <div style="clear: both;"></div> |
@@ -16,7 +17,20 @@ | @@ -16,7 +17,20 @@ | ||
16 | (cellFocused)="onCellFocused($event)" (rowSelected)="onRowSelected($event)" (selectionChanged)="onSelectionChanged()" (beforeFilterChanged)="onBeforeFilterChanged()" (afterFilterChanged)="onAfterFilterChanged()" (filterModified)="onFilterModified()" | 17 | (cellFocused)="onCellFocused($event)" (rowSelected)="onRowSelected($event)" (selectionChanged)="onSelectionChanged()" (beforeFilterChanged)="onBeforeFilterChanged()" (afterFilterChanged)="onAfterFilterChanged()" (filterModified)="onFilterModified()" |
17 | (beforeSortChanged)="onBeforeSortChanged()" (afterSortChanged)="onAfterSortChanged()" (virtualRowRemoved)="onVirtualRowRemoved($event)" (rowClicked)="onRowClicked($event)"> | 18 | (beforeSortChanged)="onBeforeSortChanged()" (afterSortChanged)="onAfterSortChanged()" (virtualRowRemoved)="onVirtualRowRemoved($event)" (rowClicked)="onRowClicked($event)"> |
18 | </ag-grid-ng2> | 19 | </ag-grid-ng2> |
20 | +======= | ||
21 | + <div *ngIf="showGrid"> | ||
22 | + <div class="control_button"> | ||
23 | + <button md-fab color="accent" (click)="addNewRow()" type="button"><md-icon>add</md-icon></button> | ||
24 | + <button md-fab color="warn" (click)="deleteRows()" type="button"><md-icon>delete</md-icon></button> | ||
25 | +>>>>>>> f4c3aacea95ba58d99581795e79264058b7dd372 | ||
19 | </div> | 26 | </div> |
20 | - | 27 | + <div *ngIf="isLoading" class=""> |
28 | + ...Loading | ||
29 | + </div> | ||
30 | + <ag-grid-ng2 #agGrid style="width: 100%; height: 350px;" class="ag-dark" [gridOptions]="gridOptions" [columnDefs]="columnDefs" [rowData]="rowData" enableColResize enableSorting enableFilter groupHeaders suppressRowClickSelection toolPanelSuppressGroups | ||
31 | + toolPanelSuppressValues debug rowHeight="22" rowSelection="multiple" (cellClicked)="onCellClicked($event)" (cellDoubleClicked)="onCellDoubleClicked($event)" (cellContextMenu)="onCellContextMenu($event)" (cellValueChanged)="onCellValueChanged($event)" | ||
32 | + (cellFocused)="onCellFocused($event)" (rowSelected)="onRowSelected($event)" (selectionChanged)="onSelectionChanged()" (beforeFilterChanged)="onBeforeFilterChanged()" (afterFilterChanged)="onAfterFilterChanged()" (filterModified)="onFilterModified()" | ||
33 | + (beforeSortChanged)="onBeforeSortChanged()" (afterSortChanged)="onAfterSortChanged()" (virtualRowRemoved)="onVirtualRowRemoved($event)" (rowClicked)="onRowClicked($event)"> | ||
34 | + </ag-grid-ng2> | ||
21 | </div> | 35 | </div> |
22 | </md-card> | 36 | </md-card> |
23 | \ No newline at end of file | 37 | \ No newline at end of file |
src/app/data/bus-stop/bus-stop.scss