Administrator / maps-admin

Commit a990077befce48f3ff45c2116a6c18720106f5c6

Authored by Yarik
1 parent feb1ac37

IsNew fix

Showing 5 changed files with 13 additions and 14 deletions   Show diff stats
Inline Side-by-side
src/app/data/cross-section/cross-section.component.html
  Show/Hide comments   View file @a990077
... ... @@ -2,11 +2,11 @@
2 2 <ag-grid-ng2 #agGrid style="width: 100%; height: 100%;" class="ag-blue" [gridOptions]="gridOptions" [columnDefs]="columnDefs" [rowData]="rowData" enableColResize enableSorting enableFilter groupHeaders suppressRowClickSelection toolPanelSuppressGroups
3 3 toolPanelSuppressValues debug rowHeight="22" rowSelection="multiple" (cellClicked)="onCellClicked($event)" (cellDoubleClicked)="onCellDoubleClicked($event)" (cellContextMenu)="onCellContextMenu($event)" (cellValueChanged)="onCellValueChanged($event)"
4 4 (cellFocused)="onCellFocused($event)" (rowSelected)="onRowSelected($event)" (selectionChanged)="onSelectionChanged()" (beforeFilterChanged)="onBeforeFilterChanged()" (afterFilterChanged)="onAfterFilterChanged()" (filterModified)="onFilterModified()"
5   - (beforeSortChanged)="onBeforeSortChanged()" (afterSortChanged)="onAfterSortChanged()" (virtualRowRemoved)="onVirtualRowRemoved($event)" (rowClicked)="onRowClicked($event)">
  5 + (beforeSortChanged)="onBeforeSortChanged()" (afterSortChanged)="onAfterSortChanged($event)" (virtualRowRemoved)="onVirtualRowRemoved($event)" (rowClicked)="onRowClicked($event)">
6 6 </ag-grid-ng2>
7 7 <div class="control_button">
8 8 <div *tdLoading="'loading'; mode:'indeterminate'; type:'circle'; strategy:'replace'; color:'accent'"></div>
9   - <button md-fab color="accent" (click)="addNewRow()" type="button"><md-icon>add</md-icon></button>
10   - <button md-fab color="warn" (click)="deleteRows()" type="button"><md-icon>delete</md-icon></button>
  9 + <button md-fab color="accent" [disabled]="isNew || isSelected" (click)="addNewRow()" type="button"><md-icon>add</md-icon></button>
  10 + <button md-fab color="warn" [disabled]="!isSelected" (click)="deleteRows()" type="button"><md-icon>delete</md-icon></button>
11 11 </div>
12 12 </div>
13 13 \ No newline at end of file
... ...
src/app/data/road-surface/road-surface.component.html
  Show/Hide comments   View file @a990077
... ... @@ -2,11 +2,11 @@
2 2 <ag-grid-ng2 #agGrid style="width: 100%; height: 100%;" class="ag-blue" [gridOptions]="gridOptions" [columnDefs]="columnDefs" [rowData]="rowData" enableColResize enableSorting enableFilter groupHeaders suppressRowClickSelection toolPanelSuppressGroups
3 3 toolPanelSuppressValues debug rowHeight="22" rowSelection="multiple" (cellClicked)="onCellClicked($event)" (cellDoubleClicked)="onCellDoubleClicked($event)" (cellContextMenu)="onCellContextMenu($event)" (cellValueChanged)="onCellValueChanged($event)"
4 4 (cellFocused)="onCellFocused($event)" (rowSelected)="onRowSelected($event)" (selectionChanged)="onSelectionChanged()" (beforeFilterChanged)="onBeforeFilterChanged()" (afterFilterChanged)="onAfterFilterChanged()" (filterModified)="onFilterModified()"
5   - (beforeSortChanged)="onBeforeSortChanged()" (afterSortChanged)="onAfterSortChanged()" (virtualRowRemoved)="onVirtualRowRemoved($event)" (rowClicked)="onRowClicked($event)">
  5 + (beforeSortChanged)="onBeforeSortChanged()" (afterSortChanged)="onAfterSortChanged($event)" (virtualRowRemoved)="onVirtualRowRemoved($event)" (rowClicked)="onRowClicked($event)">
6 6 </ag-grid-ng2>
7 7 <div class="control_button">
8 8 <div *tdLoading="'loading'; mode:'indeterminate'; type:'circle'; strategy:'replace'; color:'accent'"></div>
9   - <button md-fab color="accent" (click)="addNewRow()" type="button"><md-icon>add</md-icon></button>
10   - <button md-fab color="warn" (click)="deleteRows()" type="button"><md-icon>delete</md-icon></button>
  9 + <button md-fab color="accent" [disabled]="isNew || isSelected" (click)="addNewRow()" type="button"><md-icon>add</md-icon></button>
  10 + <button md-fab color="warn" [disabled]="!isSelected" (click)="deleteRows()" type="button"><md-icon>delete</md-icon></button>
11 11 </div>
12 12 </div>
13 13 \ No newline at end of file
... ...
src/app/data/road-width/road-width.component.html
  Show/Hide comments   View file @a990077
... ... @@ -2,11 +2,11 @@
2 2 <ag-grid-ng2 #agGrid style="width: 100%; height: 100%;" class="ag-blue" [gridOptions]="gridOptions" [columnDefs]="columnDefs" [rowData]="rowData" enableColResize enableSorting enableFilter groupHeaders suppressRowClickSelection toolPanelSuppressGroups
3 3 toolPanelSuppressValues debug rowHeight="22" rowSelection="multiple" (cellClicked)="onCellClicked($event)" (cellDoubleClicked)="onCellDoubleClicked($event)" (cellContextMenu)="onCellContextMenu($event)" (cellValueChanged)="onCellValueChanged($event)"
4 4 (cellFocused)="onCellFocused($event)" (rowSelected)="onRowSelected($event)" (selectionChanged)="onSelectionChanged()" (beforeFilterChanged)="onBeforeFilterChanged()" (afterFilterChanged)="onAfterFilterChanged()" (filterModified)="onFilterModified()"
5   - (beforeSortChanged)="onBeforeSortChanged()" (afterSortChanged)="onAfterSortChanged()" (virtualRowRemoved)="onVirtualRowRemoved($event)" (rowClicked)="onRowClicked($event)">
  5 + (beforeSortChanged)="onBeforeSortChanged()" (afterSortChanged)="onAfterSortChanged($event)" (virtualRowRemoved)="onVirtualRowRemoved($event)" (rowClicked)="onRowClicked($event)">
6 6 </ag-grid-ng2>
7 7 <div class="control_button">
8 8 <div *tdLoading="'loading'; mode:'indeterminate'; type:'circle'; strategy:'replace'; color:'accent'"></div>
9   - <button md-fab color="accent" (click)="addNewRow()" type="button"><md-icon>add</md-icon></button>
10   - <button md-fab color="warn" (click)="deleteRows()" type="button"><md-icon>delete</md-icon></button>
  9 + <button md-fab color="accent" [disabled]="isNew || isSelected" (click)="addNewRow()" type="button"><md-icon>add</md-icon></button>
  10 + <button md-fab color="warn" [disabled]="!isSelected" (click)="deleteRows()" type="button"><md-icon>delete</md-icon></button>
11 11 </div>
12 12 </div>
13 13 \ No newline at end of file
... ...
src/app/data/service-object/service-object.component.html
  Show/Hide comments   View file @a990077
... ... @@ -2,11 +2,11 @@
2 2 <ag-grid-ng2 #agGrid style="width: 100%; height: 100%;" class="ag-blue" [gridOptions]="gridOptions" [columnDefs]="columnDefs" [rowData]="rowData" enableColResize enableSorting enableFilter groupHeaders suppressRowClickSelection toolPanelSuppressGroups
3 3 toolPanelSuppressValues debug rowHeight="22" rowSelection="multiple" (cellClicked)="onCellClicked($event)" (cellDoubleClicked)="onCellDoubleClicked($event)" (cellContextMenu)="onCellContextMenu($event)" (cellValueChanged)="onCellValueChanged($event)"
4 4 (cellFocused)="onCellFocused($event)" (rowSelected)="onRowSelected($event)" (selectionChanged)="onSelectionChanged()" (beforeFilterChanged)="onBeforeFilterChanged()" (afterFilterChanged)="onAfterFilterChanged()" (filterModified)="onFilterModified()"
5   - (beforeSortChanged)="onBeforeSortChanged()" (afterSortChanged)="onAfterSortChanged()" (virtualRowRemoved)="onVirtualRowRemoved($event)" (rowClicked)="onRowClicked($event)">
  5 + (beforeSortChanged)="onBeforeSortChanged()" (afterSortChanged)="onAfterSortChanged($event)" (virtualRowRemoved)="onVirtualRowRemoved($event)" (rowClicked)="onRowClicked($event)">
6 6 </ag-grid-ng2>
7 7 <div class="control_button">
8 8 <div *tdLoading="'loading'; mode:'indeterminate'; type:'circle'; strategy:'replace'; color:'accent'"></div>
9   - <button md-fab color="accent" (click)="addNewRow()" type="button"><md-icon>add</md-icon></button>
10   - <button md-fab color="warn" (click)="deleteRows()" type="button"><md-icon>delete</md-icon></button>
  9 + <button md-fab color="accent" [disabled]="isNew || isSelected" (click)="addNewRow()" type="button"><md-icon>add</md-icon></button>
  10 + <button md-fab color="warn" [disabled]="!isSelected" (click)="deleteRows()" type="button"><md-icon>delete</md-icon></button>
11 11 </div>
12 12 </div>
13 13 \ No newline at end of file
... ...
src/models/statement.base.ts
  Show/Hide comments   View file @a990077
... ... @@ -28,7 +28,6 @@ export abstract class StatementBase implements AfterViewInit, OnInit {
28 28 ngAfterViewInit(): void {
29 29 this.gridOptions.api.setDatasource(this.setRowData());
30 30 this.data = this.paramsSubject
31   - .distinctUntilChanged()
32 31 .switchMap((params: IGetRowsParams) => {
33 32 return this.service.getData(params);
34 33 }).catch((error: any) => {
... ... @@ -40,7 +39,7 @@ export abstract class StatementBase implements AfterViewInit, OnInit {
40 39 data = [this.createModel()];
41 40 }
42 41 let lastRow: number = -1;
43   - if (data.length <= this.params.endRow) {
  42 + if (data.length <= this.params.endRow && !this.isNew) {
44 43 lastRow = data.length;
45 44 }
46 45 this.params.successCallback(data, lastRow);
... ...