Merge branch 'master' of gitlab.artweb.com.ua:root/maps-admin

Administrator
2 parents adf1208b ad296a58
Showing 21 changed files with 484 additions and 16 deletions Show diff stats
src/app/app.module.ts
src/app/app.routes.ts
src/app/data/cross-section/cross-section.component.html
src/app/data/data.component.html
src/app/data/flow-intensity/flow-intensity.component.html
src/app/data/flow-intensity/flow-intensity.component.ts
src/app/data/flow-intensity/flow-intensity.scss
src/app/data/road-surface/road-surface.component.html
src/app/data/road-width/road-width.component.html
src/app/data/road/road.component.html
src/app/data/road/road.component.ts
src/app/data/road/road.scss
src/app/data/service-object/service-object.component.html
src/models/flow-intensity.ts
src/models/road-type-select-list.ts
src/models/road.ts
src/models/statement.base.ts
src/services/flow-intensity-create.service.ts
src/services/flow-intensity.service.ts
src/services/road-create.service.ts
@@ -27,6 +27,8 @@ import { RoadWidthComponent } from &#39;./data/road-width/road-width.component&#39;;
 import { CrossSectionComponent } from './data/cross-section/cross-section.component';
 import { EditorComponent } from '../helpers/editor.component';
 import { RendererComponent } from '../helpers/renderer.component';
+import { FlowIntensityComponent } from './data/flow-intensity/flow-intensity.component';
+import { RoadComponent } from './data/road/road.component';
 // Services
 import { BusStopCreateService } from '../services/bus-stop-create.service';
@@ -40,6 +42,10 @@ import { RoadWidthCreateService } from &#39;../services/road-width-create.service&#39;;
 import { CrossSectionService } from '../services/cross-section.service';
 import { CrossSectionCreateService } from '../services/cross-section-create.service';
 import { BooleanSelectListService } from '../services/boolean-select-list.service';
+import { FlowIntensityCreateService } from '../services/flow-intensity-create.service';
+import { FlowIntensityService } from '../services/flow-intensity.service';
+import { RoadCreateService } from '../services/road-create.service';
+import { RoadService } from '../services/road.service';
 const httpInterceptorProviders: Type<any>[] = [
   RequestInterceptor,
@@ -59,6 +65,8 @@ const httpInterceptorProviders: Type&lt;any&gt;[] = [
     EditorComponent,
     RendererComponent,
     RoadWidthComponent,
+    FlowIntensityComponent,
+    RoadComponent,
     CrossSectionComponent,
   ], // directives, components, and pipes owned by this NgModule
   imports: [
@@ -70,6 +78,8 @@ const httpInterceptorProviders: Type&lt;any&gt;[] = [
       RendererComponent,
       RoadSurfaceComponent,
       RoadWidthComponent,
+      FlowIntensityComponent,
+      RoadComponent,
       CrossSectionComponent,
     ]),
     CovalentCoreModule.forRoot(),
@@ -98,6 +108,10 @@ const httpInterceptorProviders: Type&lt;any&gt;[] = [
     RoadSurfaceService,
     RoadWidthCreateService,
     RoadWidthService,
+    FlowIntensityCreateService,
+    FlowIntensityService,
+    RoadCreateService,
+    RoadService,
     CrossSectionCreateService,
     CrossSectionService,
   ], // additional providers needed for this module
@@ -9,6 +9,8 @@ import { RoadSurfaceComponent } from &#39;./data/road-surface/road-surface.component
 import { RoadWidthComponent } from './data/road-width/road-width.component';
 import { CrossSectionComponent } from './data/cross-section/cross-section.component';
 import { ServiceObjectComponent } from './data/service-object/service-object.component';
+import { FlowIntensityComponent } from './data/flow-intensity/flow-intensity.component';
+import { RoadComponent } from './data/road/road.component';
 const routes: Routes = [
   {path: 'login', component: LoginComponent},
@@ -19,7 +21,9 @@ const routes: Routes = [
         {path: 'service-object', component: ServiceObjectComponent},
         {path: 'road-surface', component: RoadSurfaceComponent},
         {path: 'road-width', component: RoadWidthComponent},
-        {path: 'cross-section', component: CrossSectionComponent}
+        {path: 'flow-intensity', component: FlowIntensityComponent},
+        {path: 'cross-section', component: CrossSectionComponent},
+        {path: 'road', component: RoadComponent},
       ]},
   ]},
 ];
@@ -2,11 +2,11 @@
     <ag-grid-ng2 #agGrid style="width: 100%; height: 100%;" class="ag-blue" [gridOptions]="gridOptions" [columnDefs]="columnDefs" [rowData]="rowData" enableColResize enableSorting enableFilter groupHeaders suppressRowClickSelection toolPanelSuppressGroups
         toolPanelSuppressValues debug rowHeight="22" rowSelection="multiple" (cellClicked)="onCellClicked($event)" (cellDoubleClicked)="onCellDoubleClicked($event)" (cellContextMenu)="onCellContextMenu($event)" (cellValueChanged)="onCellValueChanged($event)"
         (cellFocused)="onCellFocused($event)" (rowSelected)="onRowSelected($event)" (selectionChanged)="onSelectionChanged()" (beforeFilterChanged)="onBeforeFilterChanged()" (afterFilterChanged)="onAfterFilterChanged()" (filterModified)="onFilterModified()"
-        (beforeSortChanged)="onBeforeSortChanged()" (afterSortChanged)="onAfterSortChanged()" (virtualRowRemoved)="onVirtualRowRemoved($event)" (rowClicked)="onRowClicked($event)">
+        (beforeSortChanged)="onBeforeSortChanged()" (afterSortChanged)="onAfterSortChanged($event)" (virtualRowRemoved)="onVirtualRowRemoved($event)" (rowClicked)="onRowClicked($event)">
     </ag-grid-ng2>
     <div class="control_button">
         <div *tdLoading="'loading'; mode:'indeterminate'; type:'circle'; strategy:'replace'; color:'accent'"></div>
-        <button md-fab color="accent" (click)="addNewRow()" type="button"><md-icon>add</md-icon></button>
-        <button md-fab color="warn" (click)="deleteRows()" type="button"><md-icon>delete</md-icon></button>
+        <button md-fab color="accent" [disabled]="isNew || isSelected" (click)="addNewRow()" type="button"><md-icon>add</md-icon></button>
+        <button md-fab color="warn" [disabled]="!isSelected" (click)="deleteRows()" type="button"><md-icon>delete</md-icon></button>
     </div>
 </div>
 \ No newline at end of file
@@ -14,7 +14,7 @@
             <span>Відомості</span>
         </md-toolbar>
         <md-nav-list td-sidenav-content>
-            <a md-list-item md-ripple class="block relative" (click)="!media.query('gt-sm') && manageList.close()" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}" [routerLink]="['/product']">
+            <a md-list-item md-ripple class="block relative" (click)="!media.query('gt-sm') && manageList.close()" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}" [routerLink]="['road']">
                 <md-icon md-list-icon>dashboard</md-icon>
                 Автомобільні дороги
             </a>
+<div class="grid_containert" *ngIf="showGrid">
+    <ag-grid-ng2 #agGrid style="width: 100%; height: 100%;" class="ag-blue" [gridOptions]="gridOptions" [columnDefs]="columnDefs" [rowData]="rowData" enableColResize enableSorting enableFilter groupHeaders suppressRowClickSelection toolPanelSuppressGroups
+        toolPanelSuppressValues debug rowHeight="22" rowSelection="multiple" (cellClicked)="onCellClicked($event)" (cellDoubleClicked)="onCellDoubleClicked($event)" (cellContextMenu)="onCellContextMenu($event)" (cellValueChanged)="onCellValueChanged($event)"
+        (cellFocused)="onCellFocused($event)" (rowSelected)="onRowSelected($event)" (selectionChanged)="onSelectionChanged()" (beforeFilterChanged)="onBeforeFilterChanged()" (afterFilterChanged)="onAfterFilterChanged()" (filterModified)="onFilterModified()"
+        (beforeSortChanged)="onBeforeSortChanged()" (afterSortChanged)="onAfterSortChanged($event)" (virtualRowRemoved)="onVirtualRowRemoved($event)" (rowClicked)="onRowClicked($event)">
+    </ag-grid-ng2>
+    <div class="control_button">
+        <div *tdLoading="'loading'; mode:'indeterminate'; type:'circle'; strategy:'replace'; color:'accent'"></div>
+        <button md-fab color="accent" [disabled]="isNew || isSelected" (click)="addNewRow()" type="button"><md-icon>add</md-icon></button>
+        <button md-fab color="warn" [disabled]="!isSelected" (click)="deleteRows()" type="button"><md-icon>delete</md-icon></button>
+    </div>
+</div>
 \ No newline at end of file
+import { Component, ViewEncapsulation, AfterViewInit } from '@angular/core';
+import { TdLoadingService } from '@covalent/core';
+import { GridOptions, IGetRowsParams, IRowModel } from 'ag-grid/main';
+
+import { StatementBase } from '../../../models/statement.base';
+
+import { FlowIntensityService } from '../../../services/flow-intensity.service';
+import { FlowIntensity } from '../../../models/flow-intensity';
+import { EditorComponent } from '../../../helpers/editor.component';
+import { RendererComponent } from '../../../helpers/renderer.component';
+import { FlowIntensityCreateService } from '../../../services/flow-intensity-create.service';
+import { RegionSelectList } from '../../../models/region-select-list';
+import { RoadDirectionSelectList } from '../../../models/road-direction-select-list';
+import { RoadSelectList } from '../../../models/road-select-list';
+import { SettlementSelectList } from '../../../models/settlement-select-list';
+
+import { routerTransition } from '../../../animations/router.animation';
+
+@Component({
+    // tslint:disable-next-line:component-selector
+    selector: 'flow-grid',
+    templateUrl: 'flow-intensity.component.html',
+    styleUrls: ['flow-intensity.scss'],
+    encapsulation: ViewEncapsulation.None,
+})
+export class FlowIntensityComponent extends StatementBase {
+
+    public regions: RegionSelectList[];
+    public settlements: SettlementSelectList[];
+    public roads: RoadSelectList[];
+    public roadDirections: RoadDirectionSelectList[];
+
+    constructor(
+        protected service: FlowIntensityService,
+        protected dataService: FlowIntensityCreateService,
+        protected loadingService: TdLoadingService,
+    ) {
+        super();
+    }
+
+  protected createColumnDefs(): any[] {
+    return [
+      {
+        headerName: '#',
+        width: 30,
+        checkboxSelection: true,
+        suppressSorting: true,
+        suppressMenu: true,
+        pinned: true,
+      },
+      {
+        headerName: 'ID',
+        field: 'id',
+      },
+      {
+        headerName: 'Назва дороги',
+        field: 'roadId',
+        editable: true,
+        cellEditorFramework: EditorComponent,
+        cellRendererFramework: RendererComponent,
+        cellEditorParams: {
+          data: this.roads,
+          valueCol: 'roadId',
+          labelCol: 'name',
+        },
+      },
+      {
+        headerName: 'Область',
+        field: 'regionId',
+        editable: true,
+        cellEditorFramework: EditorComponent,
+        cellRendererFramework: RendererComponent,
+        cellEditorParams: {
+          data: this.regions,
+          valueCol: 'regionId',
+          labelCol: 'name',
+        },
+      },
+      {
+        headerName: 'Місцезнаходження, км+',
+        field: 'location',
+        editable: true,
+      },
+      {
+        headerName: 'Місцезнаходження ділянки з однорідною інтенсивністю руху, км+, початок',
+        field: 'begin',
+        editable: true,
+      },
+      {
+        headerName: 'Місцезнаходження ділянки з однорідною інтенсивністю руху, км+, кінець',
+        field: 'end',
+        editable: true,
+      },
+      {
+        headerName: 'Напрямок смуги руху',
+        field: 'roadDirectionId',
+        editable: true,
+        cellEditorFramework: EditorComponent,
+        cellRendererFramework: RendererComponent,
+        cellEditorParams: {
+          data: this.roadDirections,
+          valueCol: 'roadDirectionId',
+          labelCol: 'name',
+        },
+      },
+      {
+        headerName: 'Найближчий населений пункт',
+        field: 'settlementId',
+        editable: true,
+        cellEditorFramework: EditorComponent,
+        cellRendererFramework: RendererComponent,
+        cellEditorParams: {
+          data: this.settlements,
+          valueCol: 'settlementId',
+          labelCol: 'name',
+        },
+      },
+      {
+        headerName: 'Інтенсивність руху, авт/добу, всього',
+        field: 'intensityTotal',
+        editable: true,
+      },
+      {
+        headerName: 'Інтенсивність руху, авт/добу, приріст',
+        field: 'intensityIncrease',
+        editable: true,
+      },
+      {
+        headerName: 'Інтенсивність руху, авт/добу, мотоцикл без коляски та мопед',
+        field: 'intensityMoto',
+        editable: true,
+      },
+      {
+        headerName: 'Інтенсивність руху, авт/добу, мотоцикл з коляскою',
+        field: 'intensityMotoSidecar',
+        editable: true,
+      },
+      {
+        headerName: 'Інтенсивність руху, авт/добу, легковий автомобіль',
+        field: 'intensityCar',
+        editable: true,
+      },
+      {
+        headerName: 'Інтенсивність руху, авт/добу, вантажний автомобіль вантажопідйомністю: до 2 т.',
+        field: 'intensityTruckTwo',
+        editable: true,
+      },
+      {
+        headerName: 'Інтенсивність руху, авт/добу, вантажний автомобіль вантажопідйомністю: від 2 т. до 6 т.',
+        field: 'intensityTruckTwoSix',
+        editable: true,
+      },
+      {
+        headerName: 'Інтенсивність руху, авт/добу, вантажний автомобіль вантажопідйомністю: від 6 т. до 8 т.',
+        field: 'intensityTruckSixEight',
+        editable: true,
+      },
+      {
+        headerName: 'Інтенсивність руху, авт/добу, вантажний автомобіль вантажопідйомністю: від 8 т. до 14 т.',
+        field: 'intensityTruckEightFourteen',
+        editable: true,
+      },
+      {
+        headerName: 'Інтенсивність руху, авт/добу, вантажний автомобіль вантажопідйомністю: понад 14 т.',
+        field: 'intensityTruckFourteen',
+        editable: true,
+      },
+      {
+        headerName: 'Інтенсивність руху, авт/добу, автопоїзд вантажопідйомністю: до 12 т.',
+        field: 'intensityLorryTwelve',
+        editable: true,
+      },
+      {
+        headerName: 'Інтенсивність руху, авт/добу, автопоїзд вантажопідйомністю: від 12 т. до 20 т.',
+        field: 'intensityLorryTwelveTwenty',
+        editable: true,
+      },
+      {
+        headerName: 'Інтенсивність руху, авт/добу, автопоїзд вантажопідйомністю: від 20 т. до 30 т.',
+        field: 'intensityLorryTwentyThirty',
+        editable: true,
+      },
+      {
+        headerName: 'Інтенсивність руху, авт/добу, автопоїзд вантажопідйомністю: понад 30 т.',
+        field: 'intensityLorryThirty',
+        editable: true,
+      },
+      {
+        headerName: 'Інтенсивність руху, авт/добу, колісний трактор з причепами до 10 т.',
+        field: 'intensityTractorUnderTen',
+        editable: true,
+      },
+      {
+        headerName: 'Інтенсивність руху, авт/добу, колісний трактор з причепами понад 10 т.',
+        field: 'intensityTractorOverTen',
+        editable: true,
+      },
+      {
+        headerName: 'Інтенсивність руху, авт/добу, автобус, тролейбус',
+        field: 'intensityBus',
+        editable: true,
+      },
+      {
+        headerName: 'Інтенсивність руху, авт/добу, автобус зчеплений (здвоєний)',
+        field: 'intensityBusCoupled',
+        editable: true,
+      },
+    ];
+  }
+
+  protected initFunction(): void {
+    this.dataService.getModels().then((models: any) => {
+            this.regions = models.regionSelectListDsM as RegionSelectList[];
+            this.settlements = models.settlementSelectListDsM as SettlementSelectList[];
+            this.roads = models.roadSelectListDsM as RoadSelectList[];
+            this.roadDirections = models.roadDirectionSelectListDsM as RoadDirectionSelectList[];
+      }).then(() => {
+            this.bootstrapGrid();
+      });
+  }
+}
+.toolbar button {
+    margin: 2px;
+    padding: 0;
+}
 \ No newline at end of file
@@ -2,11 +2,11 @@
     <ag-grid-ng2 #agGrid style="width: 100%; height: 100%;" class="ag-blue" [gridOptions]="gridOptions" [columnDefs]="columnDefs" [rowData]="rowData" enableColResize enableSorting enableFilter groupHeaders suppressRowClickSelection toolPanelSuppressGroups
         toolPanelSuppressValues debug rowHeight="22" rowSelection="multiple" (cellClicked)="onCellClicked($event)" (cellDoubleClicked)="onCellDoubleClicked($event)" (cellContextMenu)="onCellContextMenu($event)" (cellValueChanged)="onCellValueChanged($event)"
         (cellFocused)="onCellFocused($event)" (rowSelected)="onRowSelected($event)" (selectionChanged)="onSelectionChanged()" (beforeFilterChanged)="onBeforeFilterChanged()" (afterFilterChanged)="onAfterFilterChanged()" (filterModified)="onFilterModified()"
-        (beforeSortChanged)="onBeforeSortChanged()" (afterSortChanged)="onAfterSortChanged()" (virtualRowRemoved)="onVirtualRowRemoved($event)" (rowClicked)="onRowClicked($event)">
+        (beforeSortChanged)="onBeforeSortChanged()" (afterSortChanged)="onAfterSortChanged($event)" (virtualRowRemoved)="onVirtualRowRemoved($event)" (rowClicked)="onRowClicked($event)">
     </ag-grid-ng2>
     <div class="control_button">
         <div *tdLoading="'loading'; mode:'indeterminate'; type:'circle'; strategy:'replace'; color:'accent'"></div>
-        <button md-fab color="accent" (click)="addNewRow()" type="button"><md-icon>add</md-icon></button>
-        <button md-fab color="warn" (click)="deleteRows()" type="button"><md-icon>delete</md-icon></button>
+        <button md-fab color="accent" [disabled]="isNew || isSelected" (click)="addNewRow()" type="button"><md-icon>add</md-icon></button>
+        <button md-fab color="warn" [disabled]="!isSelected" (click)="deleteRows()" type="button"><md-icon>delete</md-icon></button>
     </div>
 </div>
 \ No newline at end of file
@@ -2,11 +2,11 @@
     <ag-grid-ng2 #agGrid style="width: 100%; height: 100%;" class="ag-blue" [gridOptions]="gridOptions" [columnDefs]="columnDefs" [rowData]="rowData" enableColResize enableSorting enableFilter groupHeaders suppressRowClickSelection toolPanelSuppressGroups
         toolPanelSuppressValues debug rowHeight="22" rowSelection="multiple" (cellClicked)="onCellClicked($event)" (cellDoubleClicked)="onCellDoubleClicked($event)" (cellContextMenu)="onCellContextMenu($event)" (cellValueChanged)="onCellValueChanged($event)"
         (cellFocused)="onCellFocused($event)" (rowSelected)="onRowSelected($event)" (selectionChanged)="onSelectionChanged()" (beforeFilterChanged)="onBeforeFilterChanged()" (afterFilterChanged)="onAfterFilterChanged()" (filterModified)="onFilterModified()"
-        (beforeSortChanged)="onBeforeSortChanged()" (afterSortChanged)="onAfterSortChanged()" (virtualRowRemoved)="onVirtualRowRemoved($event)" (rowClicked)="onRowClicked($event)">
+        (beforeSortChanged)="onBeforeSortChanged()" (afterSortChanged)="onAfterSortChanged($event)" (virtualRowRemoved)="onVirtualRowRemoved($event)" (rowClicked)="onRowClicked($event)">
     </ag-grid-ng2>
     <div class="control_button">
         <div *tdLoading="'loading'; mode:'indeterminate'; type:'circle'; strategy:'replace'; color:'accent'"></div>
-        <button md-fab color="accent" (click)="addNewRow()" type="button"><md-icon>add</md-icon></button>
-        <button md-fab color="warn" (click)="deleteRows()" type="button"><md-icon>delete</md-icon></button>
+        <button md-fab color="accent" [disabled]="isNew || isSelected" (click)="addNewRow()" type="button"><md-icon>add</md-icon></button>
+        <button md-fab color="warn" [disabled]="!isSelected" (click)="deleteRows()" type="button"><md-icon>delete</md-icon></button>
     </div>
 </div>
 \ No newline at end of file
+<div class="grid_containert" *ngIf="showGrid">
+    <ag-grid-ng2 #agGrid style="width: 100%; height: 100%;" class="ag-blue" [gridOptions]="gridOptions" [columnDefs]="columnDefs" [rowData]="rowData" enableColResize enableSorting enableFilter groupHeaders suppressRowClickSelection toolPanelSuppressGroups
+        toolPanelSuppressValues debug rowHeight="22" rowSelection="multiple" (cellClicked)="onCellClicked($event)" (cellDoubleClicked)="onCellDoubleClicked($event)" (cellContextMenu)="onCellContextMenu($event)" (cellValueChanged)="onCellValueChanged($event)"
+        (cellFocused)="onCellFocused($event)" (rowSelected)="onRowSelected($event)" (selectionChanged)="onSelectionChanged()" (beforeFilterChanged)="onBeforeFilterChanged()" (afterFilterChanged)="onAfterFilterChanged()" (filterModified)="onFilterModified()"
+        (beforeSortChanged)="onBeforeSortChanged()" (afterSortChanged)="onAfterSortChanged($event)" (virtualRowRemoved)="onVirtualRowRemoved($event)" (rowClicked)="onRowClicked($event)">
+    </ag-grid-ng2>
+    <div class="control_button">
+        <div *tdLoading="'loading'; mode:'indeterminate'; type:'circle'; strategy:'replace'; color:'accent'"></div>
+        <button md-fab color="accent" [disabled]="isNew || isSelected" (click)="addNewRow()" type="button"><md-icon>add</md-icon></button>
+        <button md-fab color="warn" [disabled]="!isSelected" (click)="deleteRows()" type="button"><md-icon>delete</md-icon></button>
+    </div>
+</div>
 \ No newline at end of file
+import { Component, ViewEncapsulation, AfterViewInit } from '@angular/core';
+import { TdLoadingService } from '@covalent/core';
+import { GridOptions, IGetRowsParams, IRowModel } from 'ag-grid/main';
+
+import { StatementBase } from '../../../models/statement.base';
+
+import { RoadService } from '../../../services/road.service';
+import { RoadCreateService } from '../../../services/road-create.service';
+import { Road } from '../../../models/road';
+import { EditorComponent } from '../../../helpers/editor.component';
+import { RendererComponent } from '../../../helpers/renderer.component';
+import { RoadTypeSelectList } from '../../../models/road-type-select-list';
+
+import { routerTransition } from '../../../animations/router.animation';
+
+@Component({
+    // tslint:disable-next-line:component-selector
+    selector: 'road-grid',
+    templateUrl: 'road.component.html',
+    styleUrls: ['road.scss'],
+    encapsulation: ViewEncapsulation.None,
+})
+export class RoadComponent extends StatementBase {
+
+    public roadTypes: RoadTypeSelectList[];
+
+    constructor(
+        protected service: RoadService,
+        protected dataService: RoadCreateService,
+        protected loadingService: TdLoadingService,
+    ) {
+        super();
+    }
+
+  protected createColumnDefs(): any[] {
+    return [
+      {
+        headerName: '#',
+        width: 30,
+        checkboxSelection: true,
+        suppressSorting: true,
+        suppressMenu: true,
+        pinned: true,
+      },
+      {
+        headerName: 'ID',
+        field: 'id',
+      },
+      {
+        headerName: 'Назва дороги',
+        field: 'name',
+        editable: true,
+      },
+      {
+        headerName: 'Індекс дороги',
+        field: 'index',
+        editable: true,
+      },
+      {
+        headerName: 'Тип дороги',
+        field: 'roadTypeId',
+        editable: true,
+        cellEditorFramework: EditorComponent,
+        cellRendererFramework: RendererComponent,
+        cellEditorParams: {
+          data: this.roadTypes,
+          valueCol: 'roadTypeId',
+          labelCol: 'name',
+        },
+      },
+    ];
+  }
+
+  protected initFunction(): void {
+    this.dataService.getModels().then((models: any) => {
+            this.roadTypes = models.roadTypeSelectListDsM as RoadTypeSelectList[];
+      }).then(() => {
+            this.bootstrapGrid();
+      });
+  }
+}
+.toolbar button {
+    margin: 2px;
+    padding: 0;
+}
 \ No newline at end of file
@@ -2,11 +2,11 @@
     <ag-grid-ng2 #agGrid style="width: 100%; height: 100%;" class="ag-blue" [gridOptions]="gridOptions" [columnDefs]="columnDefs" [rowData]="rowData" enableColResize enableSorting enableFilter groupHeaders suppressRowClickSelection toolPanelSuppressGroups
         toolPanelSuppressValues debug rowHeight="22" rowSelection="multiple" (cellClicked)="onCellClicked($event)" (cellDoubleClicked)="onCellDoubleClicked($event)" (cellContextMenu)="onCellContextMenu($event)" (cellValueChanged)="onCellValueChanged($event)"
         (cellFocused)="onCellFocused($event)" (rowSelected)="onRowSelected($event)" (selectionChanged)="onSelectionChanged()" (beforeFilterChanged)="onBeforeFilterChanged()" (afterFilterChanged)="onAfterFilterChanged()" (filterModified)="onFilterModified()"
-        (beforeSortChanged)="onBeforeSortChanged()" (afterSortChanged)="onAfterSortChanged()" (virtualRowRemoved)="onVirtualRowRemoved($event)" (rowClicked)="onRowClicked($event)">
+        (beforeSortChanged)="onBeforeSortChanged()" (afterSortChanged)="onAfterSortChanged($event)" (virtualRowRemoved)="onVirtualRowRemoved($event)" (rowClicked)="onRowClicked($event)">
     </ag-grid-ng2>
     <div class="control_button">
         <div *tdLoading="'loading'; mode:'indeterminate'; type:'circle'; strategy:'replace'; color:'accent'"></div>
-        <button md-fab color="accent" (click)="addNewRow()" type="button"><md-icon>add</md-icon></button>
-        <button md-fab color="warn" (click)="deleteRows()" type="button"><md-icon>delete</md-icon></button>
+        <button md-fab color="accent" [disabled]="isNew || isSelected" (click)="addNewRow()" type="button"><md-icon>add</md-icon></button>
+        <button md-fab color="warn" [disabled]="!isSelected" (click)="deleteRows()" type="button"><md-icon>delete</md-icon></button>
     </div>
 </div>
 \ No newline at end of file
+export class FlowIntensity {
+    id: number;
+    roadId: number;
+    regionId: number;
+    location: number;
+    begin: number;
+    end: number;
+    roadDirectionId: number;
+    settlementId: number;
+    intensityTotal: number;
+    intensityIncrease: number;
+    intensityMoto: number;
+    intensityMotoSidecar: number;
+    intensityCar: number;
+    intensityTruckTwo: number;
+    intensityTruckTwoSix: number;
+    intensityTruckSixEight: number;
+    intensityTruckEightFourteen: number;
+    intensityTruckFourteen: number;
+    intensityLorryTwelve: number;
+    intensityLorryTwelveTwenty: number;
+    intensityLorryTwentyThirty: number;
+    intensityLorryThirty: number;
+    intensityTractorUnderTen: number;
+    intensityTractorOverTen: number;
+    intensityBus: number;
+    intensityBusCoupled: number;
+    dateAdd: number;
+}
+export class RoadTypeSelectList {
+    roadTypeId: number;
+    name: string;
+ }
+export class Road {
+    id: number;
+    name: string;
+    value: string;
+    length: number;
+    historicalBackground: string;
+    economicValue: string;
+    lawDoc: string;
+    acceptTransferDoc: string;
+    acceptanceDoc: string;
+    authorityAct: string;
+    roadTypeId: number;
+    index: number;
+}
@@ -28,7 +28,6 @@ export abstract class StatementBase implements AfterViewInit, OnInit {
     ngAfterViewInit(): void {
         this.gridOptions.api.setDatasource(this.setRowData());
         this.data = this.paramsSubject
-            .distinctUntilChanged()
             .switchMap((params: IGetRowsParams) => {
                 return this.service.getData(params);
             }).catch((error: any) => {
@@ -40,7 +39,7 @@ export abstract class StatementBase implements AfterViewInit, OnInit {
                       data = [this.createModel()];
                   }
                   let lastRow: number = -1;
-                  if (data.length <= this.params.endRow) {
+                  if (data.length <= this.params.endRow && !this.isNew) {
                       lastRow = data.length;
                   }
                   this.params.successCallback(data, lastRow);
+import { Injectable } from '@angular/core';
+import { Http } from '@angular/http';
+
+import { CreateBaseService } from './create.base.service';
+
+@Injectable()
+export class FlowIntensityCreateService extends CreateBaseService {
+    protected apiUrl: string = 'http://localhost:5000/flowintensity/directory';
+    constructor(protected http: Http) {
+        super(http);
+    }
+}
+import { Injectable } from '@angular/core';
+import { Http } from '@angular/http';
+
+import { StatementBaseService } from './statement.base.service';
+
+import { FlowIntensity } from '../models/flow-intensity';
+
+@Injectable()
+export class FlowIntensityService extends StatementBaseService {
+  protected url: string = 'http://localhost:5000/flowintensity';
+  constructor(protected http: Http) {
+    super(http);
+  }
+  public createModel(): Object {
+    return new FlowIntensity();
+  }
+  protected parseModels(json: any): any[] {
+     return json.flowIntensityEditDsM as FlowIntensity[];
+  };
+  protected parseModel(json: any): any {
+     return json as FlowIntensity;
+  };
+}
+import { Injectable } from '@angular/core';
+import { Http } from '@angular/http';
+
+import { CreateBaseService } from './create.base.service';
+
+@Injectable()
+export class RoadCreateService extends CreateBaseService {
+    protected apiUrl: string = 'http://localhost:5000/road/directory';
+    constructor(protected http: Http) {
+        super(http);
+    }
+}
+import { Injectable } from '@angular/core';
+import { Http } from '@angular/http';
+
+import { StatementBaseService } from './statement.base.service';
+
+import { Road } from '../models/road';
+
+@Injectable()
+export class RoadService extends StatementBaseService {
+  protected url: string = 'http://localhost:5000/road';
+  constructor(protected http: Http) {
+    super(http);
+  }
+  public createModel(): Object {
+    return new Road();
+  }
+  protected parseModels(json: any): any[] {
+     return json.busStopEditDsM as Road[];
+  };
+  protected parseModel(json: any): any {
+     return json as Road;
+  };
+}