Awesome

Yarik
1 parent 1392e7de
Showing 10 changed files with 106 additions and 105 deletions Show diff stats
src/app/data/bus-stop/bus-stop.component.ts
src/app/data/service-object/service-object.component.ts
src/models/statement.base.ts
src/services/boolean-select-list.service.ts
src/services/bus-stop-create.service.ts
src/services/bus-stop.service.ts
src/services/create.base.service.ts
src/services/service-object-create.service.ts
src/services/service-object.service.ts
src/services/statement.base.service.ts
@@ -42,21 +42,6 @@ export class BusStopComponent extends StatementBase {
         protected loadingService: TdLoadingService,
     ) {
         super();
-        this.initGrid();
-        this.booleanService.getModels().then((models: BooleanSelectList[]) => this.boolean = models);
-        this.dataService.getModels().then((models: any) => {
-            this.regions = models.regionSelectListDsM as RegionSelectList[];
-            this.states = models.stateCommonSelectListDsM as StateCommonSelectList[];
-            this.surfaceTypes = models.surfaceTypeSelectListDsM as SurfaceTypeSelectList[];
-            this.settlements = models.settlementSelectListDsM as SettlementSelectList[];
-            this.roads = models.roadSelectListDsM as RoadSelectList[];
-      }).then(() => {
-            this.bootstrapGrid();
-      });
-    }
-
-    protected createModel(): Object {
-        return new BusStop();
     }
   protected createColumnDefs(): any[] {
@@ -192,4 +177,17 @@ export class BusStopComponent extends StatementBase {
       },
     ];
   }
+
+  protected initFunction(): void {
+    this.booleanService.getModels().then((models: BooleanSelectList[]) => this.boolean = models);
+    this.dataService.getModels().then((models: any) => {
+            this.regions = models.regionSelectListDsM as RegionSelectList[];
+            this.states = models.stateCommonSelectListDsM as StateCommonSelectList[];
+            this.surfaceTypes = models.surfaceTypeSelectListDsM as SurfaceTypeSelectList[];
+            this.settlements = models.settlementSelectListDsM as SettlementSelectList[];
+            this.roads = models.roadSelectListDsM as RoadSelectList[];
+      }).then(() => {
+            this.bootstrapGrid();
+      });
+  }
 }
@@ -35,25 +35,10 @@ export class ServiceObjectComponent extends StatementBase {
     constructor(
         protected service: ServiceObjectService,
-        private dataService: ServiceObjectCreateService,
-        private booleanService: BooleanSelectListService,
+        protected dataService: ServiceObjectCreateService,
+        protected booleanService: BooleanSelectListService,
     ) {
         super();
-        this.initGrid();
-        this.booleanService.getModels().then((models: BooleanSelectList[]) => this.boolean = models);
-        this.dataService.getModels().then((models: any) => {
-            this.regions = models.regionSelectListDsM as RegionSelectList[];
-            this.states = models.stateCommonSelectListDsM as StateCommonSelectList[];
-            this.departmentAffiliation = models.departmentAffiliationListDsM as DepartmentAffiliationList[];
-            this.settlements = models.settlementSelectListDsM as SettlementSelectList[];
-            this.roads = models.roadSelectListDsM as RoadSelectList[];
-      }).then(() => {
-            this.bootstrapGrid();
-      });
-    }
-
-    protected createModel(): Object {
-        return new ServiceObject();
     }
   protected createColumnDefs(): any[] {
@@ -106,4 +91,17 @@ export class ServiceObjectComponent extends StatementBase {
       },
     ];
   }
+
+  protected initFunction(): void {
+    this.booleanService.getModels().then((models: BooleanSelectList[]) => this.boolean = models);
+    this.dataService.getModels().then((models: any) => {
+            this.regions = models.regionSelectListDsM as RegionSelectList[];
+            this.states = models.stateCommonSelectListDsM as StateCommonSelectList[];
+            this.departmentAffiliation = models.departmentAffiliationListDsM as DepartmentAffiliationList[];
+            this.settlements = models.settlementSelectListDsM as SettlementSelectList[];
+            this.roads = models.roadSelectListDsM as RoadSelectList[];
+      }).then(() => {
+            this.bootstrapGrid();
+      });
+  }
 }
-import { AfterViewInit } from '@angular/core';
+import { AfterViewInit, OnInit } from '@angular/core';
 import { TdLoadingService } from '@covalent/core';
 import { GridOptions, IGetRowsParams, IRowModel, RowNode } from 'ag-grid/main';
+import { StatementBaseService } from '../services/statement.base.service';
-export abstract class StatementBase implements AfterViewInit {
+export abstract class StatementBase implements AfterViewInit, OnInit {
     protected columnDefs: any[];
     protected gridOptions: GridOptions;
-    protected service: any;
+    protected service: StatementBaseService;
     protected loadingService: TdLoadingService;
     public showGrid: boolean;
     public rowCount: string;
@@ -14,6 +15,11 @@ export abstract class StatementBase implements AfterViewInit {
     public isSelected: boolean = false;
     public isNew: boolean = false;
+    ngOnInit(): void {
+        this.initGrid();
+        this.initFunction();
+    }
+
     ngAfterViewInit(): void {
         this.gridOptions.api.setDatasource(this.setRowData());
     }
@@ -46,6 +52,7 @@ export abstract class StatementBase implements AfterViewInit {
         this.gridOptions.enableServerSideSorting = true;
         this.showGrid = true;
         this.gridOptions.rowModelType = 'virtual';
+        this.gridOptions.paginationPageSize = 25;
     }
     protected bootstrapGrid(): void {
@@ -212,6 +219,9 @@ export abstract class StatementBase implements AfterViewInit {
         console.log('onColumnEvent: ' + $event);
     }
-  protected abstract createModel(): Object;
+  protected createModel(): Object {
+      return this.service.createModel();
+  };
   protected abstract createColumnDefs(): any[];
+  protected abstract initFunction(): void;
 }
 import { Injectable } from '@angular/core';
+import { Http } from '@angular/http';
+
+import { CreateBaseService } from './create.base.service';
 import { BooleanSelectList } from '../models/boolean-select-list';
 @Injectable()
-export class BooleanSelectListService {
+export class BooleanSelectListService extends CreateBaseService  {
+    protected apiUrl: string = '';
+    constructor(protected http: Http) {
+        super(http);
+     }
     getModels(): Promise<BooleanSelectList[]> {
-        let values = [];
-        let trueValue = new BooleanSelectList();
+        let values: BooleanSelectList[] = [];
+        let trueValue: BooleanSelectList = new BooleanSelectList();
         trueValue.value = 1;
         trueValue.label = 'Да';
-        let falseValue = new BooleanSelectList();
+        let falseValue: BooleanSelectList = new BooleanSelectList();
         falseValue.value = 0;
         falseValue.label = 'Нет';
         values.push(falseValue);
 import { Injectable } from '@angular/core';
-import { Headers, Http } from '@angular/http';
+import { Http } from '@angular/http';
-import 'rxjs/add/operator/toPromise';
+import { CreateBaseService } from './create.base.service';
 @Injectable()
-export class BusStopCreateService {
-    private apiUrl = 'http://localhost:5000/busstop/directory';
-    private headers = new Headers({'Content-Type': 'applicaton/json'});
-    constructor(private http: Http) { }
-    getModels(): Promise<any> {
-        return this.http.get(this.apiUrl)
-            .toPromise()
-            .then(response => response.json())
-            .catch(this.handleError);
-    }
-    private handleError(error: any): Promise<any> {
-        console.error('An error occured', error);
-        return Promise.reject(error.message || error);
+export class BusStopCreateService extends CreateBaseService {
+    protected apiUrl: string = 'http://localhost:5000/busstop/directory';
+    constructor(protected http: Http) {
+        super(http);
     }
 }
-import { BusStop } from '../models/bus-stop';
 import { Injectable } from '@angular/core';
-import { StatementBaseService } from '../services/statement.base.service';
 import { Http } from '@angular/http';
+import { StatementBaseService } from './statement.base.service';
+
+import { BusStop } from '../models/bus-stop';
+
 @Injectable()
 export class BusStopService extends StatementBaseService {
   protected url: string = 'http://localhost:5000/busstop';
   constructor(protected http: Http) {
     super(http);
   }
+  public createModel(): Object {
+    return new BusStop();
+  }
   protected parseModels(json: any): any[] {
      return json.busStopEditDsM as BusStop[];
   };
+import { Headers, Http, Response } from '@angular/http';
+
+export abstract class CreateBaseService {
+    protected abstract apiUrl: string;
+    protected headers: Headers = new Headers({'Content-Type': 'applicaton/json'});
+    constructor(protected http: Http) {  }
+    getModels(): Promise<any> {
+        return this.http.get(this.apiUrl)
+            .toPromise()
+            .then((response: Response) => response.json())
+            .catch(this.handleError);
+    }
+    protected handleError(error: any): Promise<any> {
+        console.error('An error occured', error);
+        return Promise.reject(error.message || error);
+    }
+}
 import { Injectable } from '@angular/core';
-import { Headers, Http } from '@angular/http';
+import { Http } from '@angular/http';
-import 'rxjs/add/operator/toPromise';
+import { CreateBaseService } from './create.base.service';
 @Injectable()
-export class ServiceObjectCreateService {
-    private apiUrl = 'http://localhost:5000/serviceobject/directory';
-    private headers = new Headers({'Content-Type': 'applicaton/json'});
-    constructor(private http: Http) { }
-    getModels(): Promise<any> {
-        return this.http.get(this.apiUrl)
-            .toPromise()
-            .then(response => response.json())
-            .catch(this.handleError);
-    }
-    private handleError(error: any): Promise<any> {
-        console.error('An error occured', error);
-        return Promise.reject(error.message || error);
+export class ServiceObjectCreateService extends CreateBaseService {
+    protected apiUrl: string = 'http://localhost:5000/serviceobject/directory';
+    constructor(protected http: Http) {
+        super(http);
     }
 }
 import { Injectable } from '@angular/core';
 import { Headers, Http } from '@angular/http';
-import 'rxjs/add/operator/toPromise';
+import { StatementBaseService } from './statement.base.service';
 import { ServiceObject } from '../models/service-object';
 @Injectable()
-export class ServiceObjectService {
-  private url = 'http://localhost:5000/serviceobject';
-  private headers = new Headers({'Content-Type': 'application/json'});
-  constructor(private http: Http) { }
-  getData(): Promise<ServiceObject[]> {
-    return this.http.get(this.url)
-      .toPromise()
-      .then(response => response.json().serviceObjectEditDsM as ServiceObject[])
-      .catch(this.handleError);
-  }
-  update(id: number, data: string): Promise<any> {
-    return this.http.post(this.url + '/update?id=' + id, data, { headers: this.headers })
-      .toPromise()
-      .then(response => response.json())
-      .catch(this.handleError);
-  }
-  create(data: string): Promise<ServiceObject> {
-    return this.http.post(this.url + '/create', data, { headers: this.headers })
-      .toPromise()
-      .then(response => response.json() as ServiceObject)
-      .catch(this.handleError);
-  }
-  delete(id: number): Promise<any> {
-    return this.http.delete(this.url + '/delete?id=' + id, { headers: this.headers })
-      .toPromise()
-      .then(response => response.json())
-      .catch(this.handleError);
-  }
-  private handleError(error: any): Promise<any> {
-    console.error('An error occured', error);
-    return Promise.reject(error.message || error);
-  }
+export class ServiceObjectService extends StatementBaseService {
+  protected url: string = 'http://localhost:5000/serviceobject';
+  constructor(protected http: Http) {
+    super(http);
+   }
+   public createModel(): Object {
+     return new ServiceObject();
+   }
+   protected parseModels(json: any): any {
+     return json.serviceObjectEditDsM as ServiceObject[];
+   }
+   protected parseModel(json: any): any {
+     return json as ServiceObject;
+   }
 }
@@ -41,6 +41,8 @@ export abstract class StatementBaseService {
       .catch(this.handleError);
   }
+  public abstract createModel(): Object;
+
   protected handleError(error: any): Promise<any> {
     console.error('An error occured', error);
     return Promise.reject(error.message || error);