Merge branch 'master' of gitlab.artweb.com.ua:root/maps_core_ng

Administrator
2 parents 6f43c2be 18ac329f
Showing 3 changed files with 25 additions and 15 deletions Show diff stats
src/app/components/editor.component.ts
src/app/components/renderer.component.ts
src/app/pages/statements/components/busStop2/busStop2.component.ts
@@ -2,20 +2,18 @@ import { Component, ViewContainerRef, ViewChild, AfterViewInit } from &#39;@angular/
  
 import { AgEditorComponent } from 'ag-grid-ng2/main';
  
-import { RegionSelectList } from '../models/regionselectlist';
-
 @Component({
     selector: 'editor-cell',
     template: `
         <div #container>
-            <p *ngFor="let item of data" (click)="onClick(item)" >{{item.name}}</p>
+            <p *ngFor="let item of data" (click)="onClick(item)" >{{item[this.params.labelCol]}}</p>
         </div>
     `
 })
 export class EditorComponent implements AgEditorComponent, AfterViewInit {
     @ViewChild('container', {read: ViewContainerRef}) public container;
-    public item: any;
-    public data: RegionSelectList[];
+    public item: Object = null;
+    public data: Object[];
     private params: any;
     ngAfterViewInit() {
         this.container.element.nativeElement.focus();
@@ -23,8 +21,13 @@ export class EditorComponent implements AgEditorComponent, AfterViewInit {
  
     agInit(params: any): void {
         this.params = params;
+        if (!this.params.valueCol) {
+            this.params.valueCol = 'id';
+        }
+        if (!this.params.labelCol) {
+            this.params.labelCol = 'name';
+        }
         this.data = params.data || [];
-        // this.setHappy(params.value === "Happy");
     }
  
     getValue(): any {
@@ -35,11 +38,11 @@ export class EditorComponent implements AgEditorComponent, AfterViewInit {
         return true;
     }
  
-    setValue(item: any): void {
+    setValue(item: Object): void {
         this.item = item;
     }
  
-    onClick(item: any) {
+    onClick(item: Object) {
         this.setValue(item);
         this.params.api.stopEditing();
     }
@@ -6,23 +6,28 @@ import { RegionSelectList } from &#39;../models/regionselectlist&#39;;
  
 @Component({
     selector: 'render-cell',
-    template: `<span *ngIf="this.region">{{this.region.name}}</span>`
+    template: `<span *ngIf="this.model">{{this.model[this.labelCol]}}</span>`
 })
 export class RendererComponent implements AgRendererComponent {
     private params: any;
-    private region: RegionSelectList;
+    private valueCol: string = 'id';
+    private labelCol: string = 'name';
+    private model: Object = null;
     agInit(params: any): void {
         this.params = params;
-        console.log(params);
+        if (params.colDef.cellEditorParams && params.colDef.cellEditorParams.valueCol) {
+            this.valueCol = params.colDef.cellEditorParams.valueCol;
+        }
+        if (params.colDef.cellEditorParams && params.colDef.cellEditorParams.labelCol) {
+            this.labelCol = params.colDef.cellEditorParams.labelCol;
+        }
         this.setValue(params);
     }
     refresh(params: any): void {
         this.params = params;
-        console.log(params);
         this.setValue(params);
     }
     private setValue(params) {
-        this.region = params.value;
-        console.log(params);
+        this.model = params.value;
     }
 }
@@ -85,7 +85,9 @@ export class BusStop2 {
         cellEditorFramework: EditorComponent,
         cellRendererFramework: RendererComponent,
         cellEditorParams: {
-          data: this.regions
+          data: this.regions,
+          valueCol: 'regionId',
+          labelCol: 'name'
         }
       },
       {