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

Administrator
2 parents db91579b ad02f75f
Showing 10 changed files with 206 additions and 1 deletions Show diff stats
src/app/app.module.ts
src/app/app.routes.ts
src/app/data/data.component.html
src/app/data/settlement-address-link/settlement-address-link.component.html
src/app/data/settlement-address-link/settlement-address-link.component.ts
src/app/data/settlement-address-link/settlement-address-link.scss
src/models/settlement-address-link.ts
src/models/settlement-location-select-list.ts
src/services/settlement-address-link-create.service.ts
src/services/settlement-address-link.service.ts
@@ -30,6 +30,7 @@ import { RendererComponent } from &#39;../helpers/renderer.component&#39;;
 import { FlowIntensityComponent } from './data/flow-intensity/flow-intensity.component';
 import { RoadComponent } from './data/road/road.component';
 import { RoadServiceComponent } from './data/road-service/road-service.component';
+import { SettlementAddressLinkComponent } from './data/settlement-address-link/settlement-address-link.component';
 // Services
 import { BusStopCreateService } from '../services/bus-stop-create.service';
@@ -49,6 +50,8 @@ import { RoadCreateService } from &#39;../services/road-create.service&#39;;
 import { RoadService } from '../services/road.service';
 import { RoadServiceService } from '../services/road-service.service';
 import { RoadServiceCreateService } from '../services/road-service-create.service';
+import { SettlementAddressLinkService } from '../services/settlement-address-link.service';
+import { SettlementAddressLinkCreateService } from '../services/settlement-address-link-create.service';
 const httpInterceptorProviders: Type<any>[] = [
   RequestInterceptor,
@@ -72,6 +75,7 @@ const httpInterceptorProviders: Type&lt;any&gt;[] = [
     RoadComponent,
     CrossSectionComponent,
     RoadServiceComponent,
+    SettlementAddressLinkComponent,
   ], // directives, components, and pipes owned by this NgModule
   imports: [
     BrowserModule,
@@ -86,6 +90,7 @@ const httpInterceptorProviders: Type&lt;any&gt;[] = [
       RoadComponent,
       CrossSectionComponent,
       RoadServiceComponent,
+      SettlementAddressLinkComponent,
     ]),
     CovalentCoreModule.forRoot(),
     CovalentChartsModule.forRoot(),
@@ -121,6 +126,8 @@ const httpInterceptorProviders: Type&lt;any&gt;[] = [
     CrossSectionService,
     RoadServiceService,
     RoadServiceCreateService,
+    SettlementAddressLinkService,
+    SettlementAddressLinkCreateService,
   ], // additional providers needed for this module
   entryComponents: [ ],
   bootstrap: [ AppComponent ],
@@ -12,6 +12,7 @@ import { ServiceObjectComponent } from &#39;./data/service-object/service-object.com
 import { FlowIntensityComponent } from './data/flow-intensity/flow-intensity.component';
 import { RoadComponent } from './data/road/road.component';
 import { RoadServiceComponent } from './data/road-service/road-service.component';
+import { SettlementAddressLinkComponent } from './data/settlement-address-link/settlement-address-link.component';
 const routes: Routes = [
   {path: 'login', component: LoginComponent},
@@ -26,6 +27,7 @@ const routes: Routes = [
         {path: 'cross-section', component: CrossSectionComponent},
         {path: 'road', component: RoadComponent},
         {path: 'road-service', component: RoadServiceComponent},
+        {path: 'settlement-address-link', component: SettlementAddressLinkComponent},
       ]},
   ]},
 ];
@@ -22,7 +22,7 @@
                 <md-icon md-list-icon>insert_chart</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]="['features']">
+            <a md-list-item md-ripple class="block relative" (click)="!media.query('gt-sm') && manageList.close()" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}" [routerLink]="['settlement-address-link']">
                 <md-icon md-list-icon>star</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 { SettlementAddressLinkService } from '../../../services/settlement-address-link.service';
+import { SettlementAddressLink } from '../../../models/settlement-address-link';
+import { EditorComponent } from '../../../helpers/editor.component';
+import { RendererComponent } from '../../../helpers/renderer.component';
+import { SettlementAddressLinkCreateService } from '../../../services/settlement-address-link-create.service';
+import { RegionSelectList } from '../../../models/region-select-list';
+import { RoadSelectList } from '../../../models/road-select-list';
+import { SettlementSelectList } from '../../../models/settlement-select-list';
+import { SettlementLocationSelectList } from '../../../models/settlement-location-select-list';
+
+import { routerTransition } from '../../../animations/router.animation';
+
+@Component({
+    // tslint:disable-next-line:component-selector
+    selector: 'bus-grid',
+    templateUrl: 'settlement-address-link.component.html',
+    styleUrls: ['settlement-address-link.scss'],
+    encapsulation: ViewEncapsulation.None,
+})
+export class SettlementAddressLinkComponent extends StatementBase {
+
+    public regions: RegionSelectList[];
+    public settlements: SettlementSelectList[];
+    public roads: RoadSelectList[];
+    public settlementLocations: SettlementLocationSelectList[];
+
+    constructor(
+        protected service: SettlementAddressLinkService,
+        protected dataService: SettlementAddressLinkCreateService,
+        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: 'settlementLocationId',
+        editable: true,
+        cellEditorFramework: EditorComponent,
+        cellRendererFramework: RendererComponent,
+        cellEditorParams: {
+          data: this.settlementLocations,
+          valueCol: 'id',
+          labelCol: 'name',
+        },
+      },
+      {
+        headerName: 'Назва населенного пункту',
+        field: 'settlementId',
+        editable: true,
+        cellEditorFramework: EditorComponent,
+        cellRendererFramework: RendererComponent,
+        cellEditorParams: {
+          data: this.settlements,
+          valueCol: 'settlementId',
+          labelCol: 'name',
+        },
+      },
+      {
+        headerName: 'Відстань від проїзної частини до забудови, м',
+        field: 'distance',
+        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.settlementLocations = models.settlementLocationSelectListDsM as SettlementLocationSelectList[];
+      }).then(() => {
+            this.bootstrapGrid();
+      });
+  }
+}
+.toolbar button {
+    margin: 2px;
+    padding: 0;
+}
 \ No newline at end of file
+export class SettlementAddressLink {
+    id: number;
+    roadId: number;
+    regionId: number;
+    settlementId: number;
+    settlementLocationId: number;
+    begin: number;
+    end: number;
+    distance: number;
+}
+export class SettlementLocationSelectList {
+    id: number;
+    name: string;
+ }
+import { Injectable } from '@angular/core';
+import { Http } from '@angular/http';
+
+import { CreateBaseService } from './create.base.service';
+
+@Injectable()
+export class SettlementAddressLinkCreateService extends CreateBaseService {
+    protected apiUrl: string = 'http://localhost:5000/settlementaddresslink/directory';
+    constructor(protected http: Http) {
+        super(http);
+    }
+}
+import { Injectable } from '@angular/core';
+import { Http } from '@angular/http';
+
+import { StatementBaseService } from './statement.base.service';
+
+import { SettlementAddressLink } from '../models/settlement-address-link';
+
+@Injectable()
+export class SettlementAddressLinkService extends StatementBaseService {
+  protected url: string = 'http://localhost:5000/settlementaddresslink';
+  constructor(protected http: Http) {
+    super(http);
+  }
+  public createModel(): Object {
+    return new SettlementAddressLink();
+  }
+  protected parseModels(json: any): any[] {
+     return json.settlementAddressLinkEditDsM as SettlementAddressLink[];
+  };
+  protected parseModel(json: any): any {
+     return json as SettlementAddressLink;
+  };
+}