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

Yarik
2 parents 8f0bd441 c36e5ea5
Showing 10 changed files with 48 additions and 50 deletions Show diff stats
src/animations/router.animation.ts
src/app/app.module.ts
src/app/app.routes.ts
src/app/data/bus-stop/bus-stop.component.ts
src/app/data/bus-stop/bus-stop.scss
src/app/data/data.component.html
src/app/data/service-object/service-object.component.ts
src/models/department-affiliation-lis.ts → src/models/department-affiliation-list.ts
src/services/service-object.service.ts
src/styles.scss
+import {trigger, state, animate, style, transition} from '@angular/core';
+
+export function routerTransition() {
+  return trigger('routerTransition', [
+    state('void', style({position:'absolute', width:'1000px', height:'1000px'}) ),
+    state('*', style({position:'absolute', width:'1000px', height:'1000px'}) ),
+    transition(':enter', [
+      style({transform: 'translateY(-100%)'}),
+      animate('0.5s ease-in-out', style({transform: 'translateY(0%)'}))
+    ]),
+    transition(':leave', [
+      style({transform: 'translateY(0%)'}),
+      animate('0.5s ease-in-out', style({transform: 'translateY(100%)'}))
+    ])
+  ]);
+}
@@ -21,13 +21,17 @@ import { RequestInterceptor } from &#39;../config/interceptors/request.interceptor&#39;;
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 import { BusStopComponent } from './data/bus-stop/bus-stop.component';
+import { ServiceObjectComponent } from './data/service-object/service-object.component';
 import { EditorComponent } from '../helpers/editor.component';
 import { RendererComponent } from '../helpers/renderer.component';
 // Services
 import { BusStopCreateService } from '../services/bus-stop-create.service';
-import { BooleanSelectListService } from '../services/boolean-select-list.service';
 import { BusStopService } from '../services/bus-stop.service';
+import { ServiceObjectCreateService } from '../services/service-object-create.service';
+import { ServiceObjectService } from '../services/service-object.service';
+import { BooleanSelectListService } from '../services/boolean-select-list.service';
+
 const httpInterceptorProviders: Type<any>[] = [
   RequestInterceptor,
@@ -42,6 +46,7 @@ const httpInterceptorProviders: Type&lt;any&gt;[] = [
     ChartComponent,
     TemplatesComponent,
     BusStopComponent,
+    ServiceObjectComponent,
     EditorComponent,
     RendererComponent,
   ], // directives, components, and pipes owned by this NgModule
@@ -49,6 +54,7 @@ const httpInterceptorProviders: Type&lt;any&gt;[] = [
     BrowserModule,
     AgGridModule.withComponents([
       BusStopComponent,
+      ServiceObjectComponent,
       EditorComponent,
       RendererComponent,
     ]),
@@ -69,9 +75,11 @@ const httpInterceptorProviders: Type&lt;any&gt;[] = [
     appRoutingProviders,
     httpInterceptorProviders,
     Title,
-    BusStopCreateService,
     BooleanSelectListService,
+    BusStopCreateService,
     BusStopService,
+    ServiceObjectCreateService,
+    ServiceObjectService
   ], // additional providers needed for this module
   entryComponents: [ ],
   bootstrap: [ AppComponent ],
@@ -5,6 +5,7 @@ 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 { ServiceObjectComponent } from './data/service-object/service-object.component';
 const routes: Routes = [
   {path: 'login', component: LoginComponent},
@@ -12,6 +13,7 @@ const routes: Routes = [
     {path: '', component: TemplatesComponent},
     {path: 'data', component: DataComponent, children: [
         {path: 'bus-stop', component: BusStopComponent},
+        {path: 'service-object', component: ServiceObjectComponent},
       ]},
   ]},
 ];
@@ -15,6 +15,7 @@ import { BooleanSelectList } from &#39;../../../models/boolean-select-list&#39;;
 import { SettlementSelectList } from '../../../models/settlement-select-list';
 import { SurfaceTypeSelectList } from '../../../models/surface-type-select-list';
+import { routerTransition } from '../../../animations/router.animation';
 // only import this if you are using the ag-Grid-Enterprise
 .toolbar button {
     margin: 2px;
     padding: 0;
-}
-
-.control_button {
-    position: fixed;
-    bottom: 10px;
-    right: 10px;
-    td-loading {
-        width: 56px;
-        height: 56px;
-        float: left;
-        margin-right: 20px;
-        .td-loading-wrapper {
-            margin-top: -10px;
-        }
-    }
 }
 \ No newline at end of file
@@ -46,7 +46,7 @@
                 <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]="['service-object']">
                 <md-icon md-list-icon>dashboard</md-icon>
                 Об'єкти сервісу
             </a>
@@ -10,10 +10,11 @@ import { BooleanSelectListService } from &#39;../../../services/boolean-select-list.
 import { RegionSelectList } from '../../../models/region-select-list';
 import { StateCommonSelectList } from '../../../models/state-common-select-list';
 import { RoadSelectList } from '../../../models/road-select-list';
+import { DepartmentAffiliationList } from '../../../models/department-affiliation-list';
 import { BooleanSelectList } from '../../../models/boolean-select-list';
 import { SettlementSelectList } from '../../../models/settlement-select-list';
-import { SurfaceTypeSelectList } from '../../../models/surface-type-select-list';
+import { routerTransition } from '../../../animations/router.animation';
 // only import this if you are using the ag-Grid-Enterprise
@@ -21,16 +22,16 @@ import { SurfaceTypeSelectList } from &#39;../../../models/surface-type-select-list&#39;
     selector: 'service-object',
     templateUrl: 'service-object.component.html',
     styleUrls: ['service-object.scss'],
-    encapsulation: ViewEncapsulation.None
+    encapsulation: ViewEncapsulation.None,
 })
-export class BusStopComponent {
+export class ServiceObjectComponent {
     public showGrid: boolean;
     public rowData: any[];
     public rowCount: string;
     public regions: RegionSelectList[];
     public states: StateCommonSelectList[];
-    public surfaceTypes: SurfaceTypeSelectList[];
+    public departmentAffiliation: DepartmentAffiliationList[];
     public settlements: SettlementSelectList[];
     public roads: RoadSelectList[];
     public boolean: BooleanSelectList[];
@@ -53,7 +54,7 @@ export class BusStopComponent {
       this.dataService.getModels().then(models => {
         this.regions = models.regionSelectListDsM as RegionSelectList[];
         this.states = models.stateCommonSelectListDsM as StateCommonSelectList[];
-        this.surfaceTypes = models.surfaceTypeSelectListDsM as SurfaceTypeSelectList[];
+        this.departmentAffiliation = models.departmentAffiliationListDsM as DepartmentAffiliationList[];
         this.settlements = models.settlementSelectListDsM as SettlementSelectList[];
         this.roads = models.roadSelectListDsM as RoadSelectList[];
       }).then(() => {
@@ -117,7 +118,7 @@ export class BusStopComponent {
       },
       {
         headerName: 'ID',
-        field: 'busStopId',
+        field: 'serviceObjectId',
       },
       {
         headerName: 'Назва дороги',
@@ -152,30 +153,6 @@ export class BusStopComponent {
         headerName: 'Місцезнаходження, км+ зліва',
         field: 'locationLeft',
         editable: true,
-      },
-      {
-        headerName: 'Технічний стан',
-        field: 'stateCommonId',
-        editable: true,
-        cellEditorFramework: EditorComponent,
-        cellRendererFramework: RendererComponent,
-        cellEditorParams: {
-          data: this.states,
-          valueCol: 'stateCommonId',
-          labelCol: 'value'
-        }
-      },
-      {
-        headerName: 'Наявність туалету',
-        field: 'toiletAvailability',
-        editable: true,
-        cellEditorFramework: EditorComponent,
-        cellRendererFramework: RendererComponent,
-        cellEditorParams: {
-          data: this.boolean,
-          valueCol: 'value',
-          labelCol: 'label'
-        }
       }
     ];
   }
-export class DepartmentAffiliationLis {
+export class DepartmentAffiliationList {
     departmentAffiliationId: number;
     name: string;
  }
@@ -13,7 +13,7 @@ export class ServiceObjectService {
   getData(): Promise<ServiceObject[]> {
     return this.http.get(this.url)
       .toPromise()
-      .then(response => response.json().busStopEditDsM as ServiceObject[])
+      .then(response => response.json().serviceObjectEditDsM as ServiceObject[])
       .catch(this.handleError);
   }
   update(id: number, data: string): Promise<any> {
@@ -21,4 +21,13 @@ a[md-icon-button] {
     position: fixed;
     bottom: 40px;
     right: 40px;
+    td-loading {
+        width: 56px;
+        height: 56px;
+        float: left;
+        margin-right: 20px;
+        .td-loading-wrapper {
+            margin-top: -10px;
+        }
+    }
 }
 \ No newline at end of file