Administrator / maps-admin

Commit d78dcf2bbec4bfa4040982805689e4e9dd817962

Authored by Yarik
2 parents 02166027 f4c3aace

qweqw

Showing 2 changed files with 21 additions and 1 deletions   Show diff stats
Inline Side-by-side
src/app/data/bus-stop/bus-stop.component.html
  Show/Hide comments   View file @d78dcf2
1 1 <md-card tdMediaToggle="gt-xs" [mediaClasses]="['push']">
  2 +<<<<<<< HEAD
2 3 <div>
3 4 <h1>Rich Grid with Pure JavaScript</h1>
4 5 <div style="clear: both;"></div>
... ... @@ -16,7 +17,20 @@
16 17 (cellFocused)="onCellFocused($event)" (rowSelected)="onRowSelected($event)" (selectionChanged)="onSelectionChanged()" (beforeFilterChanged)="onBeforeFilterChanged()" (afterFilterChanged)="onAfterFilterChanged()" (filterModified)="onFilterModified()"
17 18 (beforeSortChanged)="onBeforeSortChanged()" (afterSortChanged)="onAfterSortChanged()" (virtualRowRemoved)="onVirtualRowRemoved($event)" (rowClicked)="onRowClicked($event)">
18 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 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 35 </div>
22 36 </md-card>
23 37 \ No newline at end of file
... ...
src/app/data/bus-stop/bus-stop.scss
  Show/Hide comments   View file @d78dcf2
1 1 .toolbar button {
2 2 margin: 2px;
3 3 padding: 0;
  4 +}
  5 +
  6 +.control_button {
  7 + position: fixed;
  8 + bottom: 10px;
  9 + right: 10px;
4 10 }
5 11 \ No newline at end of file
... ...