From 7d063e752435f6353f6f452caf4802627b12c7df Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Fri, 10 Feb 2017 14:57:58 +0200 Subject: [PATCH] add new rows --- src/app/data/service-object/service-object.component.ts | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------- src/models/department-affiliation-list.ts | 4 ---- src/models/department-affiliation-select-list.ts | 4 ++++ src/models/service-object-type-select-list.ts | 4 ++++ 4 files changed, 73 insertions(+), 12 deletions(-) delete mode 100644 src/models/department-affiliation-list.ts create mode 100644 src/models/department-affiliation-select-list.ts create mode 100644 src/models/service-object-type-select-list.ts diff --git a/src/app/data/service-object/service-object.component.ts b/src/app/data/service-object/service-object.component.ts index ea958e0..aea364f 100644 --- a/src/app/data/service-object/service-object.component.ts +++ b/src/app/data/service-object/service-object.component.ts @@ -8,9 +8,9 @@ import { RendererComponent } from '../../../helpers/renderer.component'; 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); diff --git a/src/models/department-affiliation-list.ts b/src/models/department-affiliation-list.ts deleted file mode 100644 index 451ed29..0000000 --- a/src/models/department-affiliation-list.ts +++ /dev/null @@ -1,4 +0,0 @@ -export class DepartmentAffiliationList { - departmentAffiliationId: number; - name: string; - } diff --git a/src/models/department-affiliation-select-list.ts b/src/models/department-affiliation-select-list.ts new file mode 100644 index 0000000..4d9094f --- /dev/null +++ b/src/models/department-affiliation-select-list.ts @@ -0,0 +1,4 @@ +export class DepartmentAffiliationSelectList { + departmentAffiliationId: number; + name: string; + } diff --git a/src/models/service-object-type-select-list.ts b/src/models/service-object-type-select-list.ts new file mode 100644 index 0000000..1519622 --- /dev/null +++ b/src/models/service-object-type-select-list.ts @@ -0,0 +1,4 @@ +export class ServiceObjectTypeSelectList { + stateCommonId: number; + value: string; + } -- libgit2 0.21.4