Merge

Yarik
2 parents 026fffbd 7146348e
Showing 3 changed files with 69 additions and 7 deletions Show diff stats
src/app/data/service-object/service-object.component.ts
src/models/department-affiliation-list.ts → src/models/department-affiliation-select-list.ts
src/models/service-object-type-select-list.ts
@@ -10,9 +10,9 @@ import { RendererComponent } from &#39;../../../helpers/renderer.component&#39;;
 import { ServiceObjectCreateService } from '../../../services/service-object-create.service';
 import { BooleanSelectListService } from '../../../services/boolean-select-list.service';
 import { RegionSelectList } from '../../../models/region-select-list';
-import { StateCommonSelectList } from '../../../models/state-common-select-list';
+import { ServiceObjectTypeSelectList } from '../../../models/service-object-type-select-list';
 import { RoadSelectList } from '../../../models/road-select-list';
-import { DepartmentAffiliationList } from '../../../models/department-affiliation-list';
+import { DepartmentAffiliationSelectList } from '../../../models/department-affiliation-select-list';
 import { BooleanSelectList } from '../../../models/boolean-select-list';
 import { SettlementSelectList } from '../../../models/settlement-select-list';
  
@@ -27,8 +27,8 @@ import { routerTransition } from &#39;../../../animations/router.animation&#39;;
 export class ServiceObjectComponent extends StatementBase {
  
     public regions: RegionSelectList[];
-    public states: StateCommonSelectList[];
-    public departmentAffiliation: DepartmentAffiliationList[];
+    public serviceObjectType: ServiceObjectTypeSelectList[];
+    public departmentAffiliation: DepartmentAffiliationSelectList[];
     public settlements: SettlementSelectList[];
     public roads: RoadSelectList[];
     public boolean: BooleanSelectList[];
@@ -80,6 +80,42 @@ export class ServiceObjectComponent extends StatementBase {
         },
       },
       {
+        headerName: 'Вид споруди чи об\'єкту',
+        field: 'serviceObjectTypeId',
+        editable: true,
+        cellEditorFramework: EditorComponent,
+        cellRendererFramework: RendererComponent,
+        cellEditorParams: {
+          data: this.serviceObjectType,
+          valueCol: 'serviceObjectTypeId',
+          labelCol: 'name',
+        },
+      },
+      {
+        headerName: 'Назва підприємства та населеного пункту',
+        field: 'settlementId',
+        editable: true,
+        cellEditorFramework: EditorComponent,
+        cellRendererFramework: RendererComponent,
+        cellEditorParams: {
+          data: this.settlements,
+          valueCol: 'settlementId',
+          labelCol: 'name',
+        },
+      },
+      {
+        headerName: 'Відоча приналежність',
+        field: 'departmentAffiliationId',
+        editable: true,
+        cellEditorFramework: EditorComponent,
+        cellRendererFramework: RendererComponent,
+        cellEditorParams: {
+          data: this.departmentAffiliation,
+          valueCol: 'departmentAffiliationId',
+          labelCol: 'name',
+        },
+      },
+      {
         headerName: 'Місцезнаходження, км+ справа',
         field: 'locationRight',
         editable: true,
@@ -89,6 +125,27 @@ export class ServiceObjectComponent extends StatementBase {
         field: 'locationLeft',
         editable: true,
       },
+      {
+        headerName: 'Місцезнаходження, км+ по осі',
+        field: 'locationAxis',
+        editable: true,
+      },
+      {
+        headerName: 'Відстань до об\'єкту від вісі дор., м',
+        field: 'distance',
+        editable: true,
+      },
+      {
+        headerName: 'Потужність',
+        field: 'capacity',
+        editable: true,
+      },
+      {
+        headerName: 'Елементи облаштування',
+        field: 'arrangementElements',
+        editable: true,
+        cellEditor: 'largeText',
+      },
     ];
   }
  
@@ -96,10 +153,11 @@ export class ServiceObjectComponent extends StatementBase {
     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.serviceObjectType = models.serviceObjectTypeSelectListDsM as ServiceObjectTypeSelectList[];
+            this.departmentAffiliation = models.departmentAffiliationSelectListDsM as DepartmentAffiliationSelectList[];
             this.settlements = models.settlementSelectListDsM as SettlementSelectList[];
             this.roads = models.roadSelectListDsM as RoadSelectList[];
+
       }).then(() => {
             this.bootstrapGrid();
       });
-export class DepartmentAffiliationList {
+export class DepartmentAffiliationSelectList {
     departmentAffiliationId: number;
     name: string;
  }
+export class ServiceObjectTypeSelectList {
+    stateCommonId: number;
+    value: string;
+ }