add new rows

Administrator
1 parent 06a997f1
Showing 3 changed files with 70 additions and 9 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
@@ -8,9 +8,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';
@@ -30,8 +30,8 @@ export class ServiceObjectComponent {
     public rowData: any[];
     public rowCount: string;
     public regions: RegionSelectList[];
-    public states: StateCommonSelectList[];
-    public departmentAffiliation: DepartmentAffiliationList[];
+    public serviceObjectType: ServiceObjectTypeSelectList[];
+    public departmentAffiliation: DepartmentAffiliationSelectList[];
     public settlements: SettlementSelectList[];
     public roads: RoadSelectList[];
     public boolean: BooleanSelectList[];
@@ -53,8 +53,8 @@ export class ServiceObjectComponent {
         this.booleanService.getModels().then((models) => this.boolean = models);
         this.dataService.getModels().then((models) => {
         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(() => {
@@ -145,6 +145,42 @@ export class ServiceObjectComponent {
         },
       },
       {
+        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,
@@ -154,6 +190,27 @@ export class ServiceObjectComponent {
         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',
+      },
     ];
   }
@@ -164,7 +221,7 @@ export class ServiceObjectComponent {
     private onCellValueChanged($event) {
         if ($event.oldValue !== $event.newValue) {
             let data = JSON.stringify($event.data);
-            let id = $event.data.busStopId;
+            let id = $event.data.serviceObjectId;
             let result = null;
             if (id) {
                 this.isLoading = true;
@@ -191,7 +248,7 @@ export class ServiceObjectComponent {
             return ;
         }
         rows.forEach((element) => {
-            let id = element.data.busStopId;
+            let id = element.data.serviceObjectId;
             if (id) {
                 this.isLoading = true;
                 this.service.delete(id).then(() => this.isLoading = false);
-export class DepartmentAffiliationList {
+export class DepartmentAffiliationSelectList {
     departmentAffiliationId: number;
     name: string;
  }
+export class ServiceObjectTypeSelectList {
+    stateCommonId: number;
+    value: string;
+ }