add road width

Administrator
1 parent a04ea953
Showing 18 changed files with 463 additions and 4 deletions Show diff stats
src/app/app.module.ts
src/app/app.routes.ts
src/app/data/data.component.html
src/app/data/road-surface/road-surface.component.html
src/app/data/road-surface/road-surface.component.ts
src/app/data/road-surface/road-surface.scss
src/app/data/road-width/road-width.component.html
src/app/data/road-width/road-width.component.ts
src/app/data/road-width/road-width.scss
src/app/data/service-object/service-object.component.ts
src/models/road-direction-select-list.ts
src/models/road-surface.ts
src/models/road-width.ts
src/models/surface-treatment-select-list.ts
src/services/road-surface-create.service.ts
src/services/road-surface.service.ts
src/services/road-width-create.service.ts
src/services/road-width.service.ts
@@ -22,6 +22,8 @@ import { NgxChartsModule } from &#39;@swimlane/ngx-charts&#39;;
 import { BusStopComponent } from './data/bus-stop/bus-stop.component';
 import { ServiceObjectComponent } from './data/service-object/service-object.component';
+import { RoadSurfaceComponent } from './data/road-surface/road-surface.component';
+import { RoadWidthComponent } from './data/road-width/road-width.component';
 import { EditorComponent } from '../helpers/editor.component';
 import { RendererComponent } from '../helpers/renderer.component';
@@ -30,9 +32,12 @@ import { BusStopCreateService } from &#39;../services/bus-stop-create.service&#39;;
 import { BusStopService } from '../services/bus-stop.service';
 import { ServiceObjectCreateService } from '../services/service-object-create.service';
 import { ServiceObjectService } from '../services/service-object.service';
+import { RoadSurfaceService } from '../services/road-surface.service';
+import { RoadSurfaceCreateService } from '../services/road-surface-create.service';
+import { RoadWidthService } from '../services/road-width.service';
+import { RoadWidthCreateService } from '../services/road-width-create.service';
 import { BooleanSelectListService } from '../services/boolean-select-list.service';
-
 const httpInterceptorProviders: Type<any>[] = [
   RequestInterceptor,
 ];
@@ -47,8 +52,10 @@ const httpInterceptorProviders: Type&lt;any&gt;[] = [
     TemplatesComponent,
     BusStopComponent,
     ServiceObjectComponent,
+    RoadSurfaceComponent,
     EditorComponent,
     RendererComponent,
+    RoadWidthComponent,
   ], // directives, components, and pipes owned by this NgModule
   imports: [
     BrowserModule,
@@ -57,6 +64,8 @@ const httpInterceptorProviders: Type&lt;any&gt;[] = [
       ServiceObjectComponent,
       EditorComponent,
       RendererComponent,
+      RoadSurfaceComponent,
+      RoadWidthComponent,
     ]),
     CovalentCoreModule.forRoot(),
     CovalentChartsModule.forRoot(),
@@ -79,7 +88,11 @@ const httpInterceptorProviders: Type&lt;any&gt;[] = [
     BusStopCreateService,
     BusStopService,
     ServiceObjectCreateService,
-    ServiceObjectService
+    ServiceObjectService,
+    RoadSurfaceCreateService,
+    RoadSurfaceService,
+    RoadWidthCreateService,
+    RoadWidthService,
   ], // additional providers needed for this module
   entryComponents: [ ],
   bootstrap: [ AppComponent ],
@@ -5,6 +5,8 @@ import { DataComponent } from &#39;./data/data.component&#39;;
 import { LoginComponent } from './login/login.component';
 import { TemplatesComponent } from './templates/templates.component';
 import { BusStopComponent } from './data/bus-stop/bus-stop.component';
+import { RoadSurfaceComponent } from './data/road-surface/road-surface.component';
+import { RoadWidthComponent } from './data/road-width/road-width.component';
 import { ServiceObjectComponent } from './data/service-object/service-object.component';
 const routes: Routes = [
@@ -14,6 +16,8 @@ const routes: Routes = [
     {path: 'data', component: DataComponent, children: [
         {path: 'bus-stop', component: BusStopComponent},
         {path: 'service-object', component: ServiceObjectComponent},
+        {path: 'road-surface', component: RoadSurfaceComponent},
+        {path: 'road-width', component: RoadWidthComponent},
       ]},
   ]},
 ];
@@ -38,11 +38,11 @@
                 <md-icon md-list-icon>dashboard</md-icon>
                 З'їзди
             </a>
-            <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-width']">
                 <md-icon md-list-icon>dashboard</md-icon>
                 Ширина проїзних частин
             </a>
-            <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-surface']">
                 <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()" (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>
+    </div>
+</div>
 \ No newline at end of file
+import {Component, ViewEncapsulation} from '@angular/core';
+import {GridOptions} from 'ag-grid/main';
+import { TdLoadingService } from '@covalent/core';
+
+import { StatementBase } from '../../../models/statement.base';
+
+import { RoadSurfaceService } from '../../../services/road-surface.service';
+import { RoadSurface } from '../../../models/road-surface';
+import { EditorComponent } from '../../../helpers/editor.component';
+import { RendererComponent } from '../../../helpers/renderer.component';
+import { RoadSurfaceCreateService } from '../../../services/road-surface-create.service';
+import { RegionSelectList } from '../../../models/region-select-list';
+import { RoadSelectList } from '../../../models/road-select-list';
+import { RoadDirectionSelectList } from '../../../models/road-direction-select-list';
+import { SurfaceTreatmentSelectList } from '../../../models/surface-treatment-select-list';
+import { StateCommonSelectList } from '../../../models/state-common-select-list';
+import { SurfaceTypeSelectList } from '../../../models/surface-type-select-list';
+
+import { routerTransition } from '../../../animations/router.animation';
+
+@Component({
+    selector: 'road-surface',
+    templateUrl: 'road-surface.component.html',
+    styleUrls: ['road-surface.scss'],
+    encapsulation: ViewEncapsulation.None,
+})
+export class RoadSurfaceComponent extends StatementBase {
+
+    public regions: RegionSelectList[];
+    public roadDirection: RoadDirectionSelectList[];
+    public roads: RoadSelectList[];
+    public surfaceTypes: SurfaceTypeSelectList[];
+ public states: StateCommonSelectList[];
+    public surfaceTreatment: SurfaceTreatmentSelectList[];
+
+    constructor(
+        protected service: RoadSurfaceService,
+        protected dataService: RoadSurfaceCreateService,
+        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: 'roadDirectionId',
+        editable: true,
+        cellEditorFramework: EditorComponent,
+        cellRendererFramework: RendererComponent,
+        cellEditorParams: {
+          data: this.roadDirection,
+          valueCol: 'roadDirectionId',
+          labelCol: 'name',
+        },
+      },
+      {
+        headerName: 'Місцезнаходження, км+ початок',
+        field: 'begin',
+        editable: true,
+      },
+      {
+        headerName: 'Місцезнаходження, км+ кінець',
+        field: 'end',
+        editable: true,
+      },
+      {
+        headerName: 'Тип покриття',
+        field: 'surfaceTypeId',
+        editable: true,
+        cellEditorFramework: EditorComponent,
+        cellRendererFramework: RendererComponent,
+        cellEditorParams: {
+          data: this.surfaceTypes,
+          valueCol: 'surfaceTypeId',
+          labelCol: 'name',
+        },
+      },
+      {
+        headerName: 'Тип поверхневої обробки',
+        field: 'surfaceTreatmentId',
+        editable: true,
+        cellEditorFramework: EditorComponent,
+        cellRendererFramework: RendererComponent,
+        cellEditorParams: {
+          data: this.surfaceTreatment,
+          valueCol: 'surfaceTreatmentId',
+          labelCol: 'name',
+        },
+      },
+      {
+        headerName: 'Стан покриття',
+        field: 'stateCommonId',
+        editable: true,
+        cellEditorFramework: EditorComponent,
+        cellRendererFramework: RendererComponent,
+        cellEditorParams: {
+          data: this.states,
+          valueCol: 'stateCommonId',
+          labelCol: 'value',
+        },
+      },
+    ];
+  }
+
+  protected initFunction(): void {
+    this.dataService.getModels().then((models: any) => {
+            this.regions = models.regionSelectListDsM as RegionSelectList[];
+            this.roads = models.roadSelectListDsM as RoadSelectList[];
+            this.roadDirection = models.roadDirectionSelectListDsM as RoadDirectionSelectList[];
+            this.surfaceTypes = models.surfaceTypeSelectListDsM as SurfaceTypeSelectList[];
+            this.states = models.stateCommonSelectListDsM as StateCommonSelectList[];
+            this.surfaceTreatment = models.surfaceTreatmentSelectListDsM as SurfaceTreatmentSelectList[];
+      }).then(() => {
+            this.bootstrapGrid();
+      });
+  }
+
+  // tslint:disable-next-line:member-ordering
+  public CreateModel(): Object {
+    return new RoadSurface();
+  }
+}
+.toolbar button {
+    margin: 2px;
+    padding: 0;
+}
 \ 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()" (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>
+    </div>
+</div>
 \ No newline at end of file
+import {Component, ViewEncapsulation} from '@angular/core';
+import {GridOptions} from 'ag-grid/main';
+import { TdLoadingService } from '@covalent/core';
+
+import { StatementBase } from '../../../models/statement.base';
+
+
+import { RoadWidth } from '../../../models/road-width';
+import { EditorComponent } from '../../../helpers/editor.component';
+import { RendererComponent } from '../../../helpers/renderer.component';
+import { RoadWidthService } from '../../../services/road-width.service';
+import { RoadWidthCreateService } from '../../../services/road-width-create.service';
+import { RegionSelectList } from '../../../models/region-select-list';
+import { RoadSelectList } from '../../../models/road-select-list';
+
+
+
+
+import { routerTransition } from '../../../animations/router.animation';
+
+@Component({
+    selector: 'road-width',
+    templateUrl: 'road-width.component.html',
+    styleUrls: ['road-width.scss'],
+    encapsulation: ViewEncapsulation.None,
+})
+export class RoadWidthComponent extends StatementBase {
+
+    public regions: RegionSelectList[];
+
+    public roads: RoadSelectList[];
+
+    constructor(
+        protected service: RoadWidthService,
+        protected dataService: RoadWidthCreateService,
+        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: 'begin',
+        editable: true,
+      },
+      {
+        headerName: 'Місцезнаходженя, км+ кінець',
+        field: 'end',
+        editable: true,
+      },
+      {
+        headerName: 'Ширина, узбіччя зліва',
+        field: 'widthRoadsideLeft',
+        editable: true,
+      },
+      {
+        headerName: 'Ширина, проїзна зворотнього напрямку',
+        field: 'widthReverseRoad',
+        editable: true,
+      },
+      {
+        headerName: 'Ширина, розподільча смуга',
+        field: 'widthStrip',
+        editable: true,
+      },
+      {
+        headerName: 'Ширина, проїзна прямого напрямку',
+        field: 'widthRoadwayForward',
+        editable: true,
+      },
+      {
+        headerName: 'Ширина, узбіччя справа',
+        field: 'widthRoadsideRight',
+        editable: true,
+      },
+      {
+        headerName: 'Кількість смуг руху зліва',
+        field: 'countLaneLeft',
+        editable: true,
+      },
+      {
+        headerName: 'Кількість смуг руху справа',
+        field: 'countLaneRight',
+        editable: true,
+      },
+    ];
+  }
+
+  protected initFunction(): void {
+    this.dataService.getModels().then((models: any) => {
+            this.regions = models.regionSelectListDsM as RegionSelectList[];
+            this.roads = models.roadSelectListDsM as RoadSelectList[];
+      }).then(() => {
+            this.bootstrapGrid();
+      });
+  }
+
+  // tslint:disable-next-line:member-ordering
+  public CreateModel(): Object {
+    return new RoadWidth();
+  }
+}
+.toolbar button {
+    margin: 2px;
+    padding: 0;
+}
 \ No newline at end of file
 import {Component, ViewEncapsulation} from '@angular/core';
 import {GridOptions} from 'ag-grid/main';
+import { TdLoadingService } from '@covalent/core';
 import { StatementBase } from '../../../models/statement.base';
@@ -37,6 +38,7 @@ export class ServiceObjectComponent extends StatementBase {
         protected service: ServiceObjectService,
         protected dataService: ServiceObjectCreateService,
         protected booleanService: BooleanSelectListService,
+        protected loadingService: TdLoadingService,
     ) {
         super();
     }
@@ -162,4 +164,9 @@ export class ServiceObjectComponent extends StatementBase {
             this.bootstrapGrid();
       });
   }
+
+  // tslint:disable-next-line:member-ordering
+  public CreateModel(): Object {
+    return new ServiceObject();
+  }
 }
+export class RoadDirectionSelectList {
+    roadDirectionId: number;
+    name: string;
+}
+export class RoadSurface {
+    id: number;
+    roadId: number;
+    regionId: number;
+    roadDirectionId: number;
+    begin: number;
+    end: number;
+    surfaceTypeId: number;
+    surfaceTreatmentId: number;
+    stateCommonid: number;
+}
+export class RoadWidth {
+    id: number;
+    roadId: number;
+    regionId: number;
+    begin: number;
+    end: number;
+    withRoadsideLeft: number;
+    widthReverseRoad: number;
+    widthStrip: number;
+    widthRoadwayForward: number;
+    widthRoadsideRight: number;
+    countLaneLeft: number;
+    countLaneRight: number;
+}
+export class SurfaceTreatmentSelectList {
+    surfaceTreatmentId: number;
+    name: string;
+}
+import { Injectable } from '@angular/core';
+import { Http } from '@angular/http';
+
+import { CreateBaseService } from './create.base.service';
+
+@Injectable()
+export class RoadSurfaceCreateService extends CreateBaseService {
+    protected apiUrl: string = 'http://localhost:5000/roadsurface/directory';
+    constructor(protected http: Http) {
+        super(http);
+    }
+}
+import { Injectable } from '@angular/core';
+import { Headers, Http } from '@angular/http';
+
+import { StatementBaseService } from './statement.base.service';
+
+import { RoadSurface } from '../models/road-surface';
+
+@Injectable()
+export class RoadSurfaceService extends StatementBaseService {
+  protected url: string = 'http://localhost:5000/roadsurface';
+  constructor(protected http: Http) {
+    super(http);
+   }
+   public createModel(): Object {
+     return new RoadSurface();
+   }
+   protected parseModels(json: any): any {
+     return json.roadSurfaceEditDsM as RoadSurface[];
+   }
+   protected parseModel(json: any): any {
+     return json as RoadSurface;
+   }
+}
+import { Injectable } from '@angular/core';
+import { Http } from '@angular/http';
+
+import { CreateBaseService } from './create.base.service';
+
+@Injectable()
+export class RoadWidthCreateService extends CreateBaseService {
+    protected apiUrl: string = 'http://localhost:5000/roadwidth/directory';
+    constructor(protected http: Http) {
+        super(http);
+    }
+}
+import { Injectable } from '@angular/core';
+import { Headers, Http } from '@angular/http';
+
+import { StatementBaseService } from './statement.base.service';
+
+import { RoadWidth } from '../models/road-width';
+
+@Injectable()
+export class RoadWidthService extends StatementBaseService {
+  protected url: string = 'http://localhost:5000/roadwidth';
+  constructor(protected http: Http) {
+    super(http);
+   }
+   public createModel(): Object {
+     return new RoadWidth();
+   }
+   protected parseModels(json: any): any {
+     return json.roadWidthEditDsM as RoadWidth[];
+   }
+   protected parseModel(json: any): any {
+     return json as RoadWidth;
+   }
+}