From 2f726c82572532c7d9461f553a574aa8b823036a Mon Sep 17 00:00:00 2001 From: sssenya Date: Wed, 21 May 2025 12:26:57 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=B5=20=D0=BF=D0=B0?= =?UTF-8?q?=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D1=8B=20=D0=B4=D0=BB=D1=8F?= =?UTF-8?q?=20=D0=BE=D1=82=D0=B4=D0=B5=D0=BB=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SharedParams/SharedParam.cs | 18 ++++ .../SharedParams/SharedParamsConfig.cs | 90 +++++++++++++++++++ 2 files changed, 108 insertions(+) diff --git a/src/dosymep.Bim4Everyone/SharedParams/SharedParam.cs b/src/dosymep.Bim4Everyone/SharedParams/SharedParam.cs index 0d983b6..b20d886 100644 --- a/src/dosymep.Bim4Everyone/SharedParams/SharedParam.cs +++ b/src/dosymep.Bim4Everyone/SharedParams/SharedParam.cs @@ -710,10 +710,22 @@ internal static ForgeTypeId GetUnitType(string paramId) { return SpecTypeId.String.Text; case nameof(SharedParamsConfig.FloorFinishingType2): return SpecTypeId.String.Text; + case nameof(SharedParamsConfig.FloorFinishingType3): + return SpecTypeId.String.Text; + case nameof(SharedParamsConfig.FloorFinishingType4): + return SpecTypeId.String.Text; + case nameof(SharedParamsConfig.FloorFinishingType5): + return SpecTypeId.String.Text; case nameof(SharedParamsConfig.CeilingFinishingType1): return SpecTypeId.String.Text; case nameof(SharedParamsConfig.CeilingFinishingType2): return SpecTypeId.String.Text; + case nameof(SharedParamsConfig.CeilingFinishingType3): + return SpecTypeId.String.Text; + case nameof(SharedParamsConfig.CeilingFinishingType4): + return SpecTypeId.String.Text; + case nameof(SharedParamsConfig.CeilingFinishingType5): + return SpecTypeId.String.Text; case nameof(SharedParamsConfig.WallFinishingType1): return SpecTypeId.String.Text; case nameof(SharedParamsConfig.WallFinishingType2): @@ -738,6 +750,12 @@ internal static ForgeTypeId GetUnitType(string paramId) { return SpecTypeId.String.Text; case nameof(SharedParamsConfig.BaseboardFinishingType2): return SpecTypeId.String.Text; + case nameof(SharedParamsConfig.BaseboardFinishingType3): + return SpecTypeId.String.Text; + case nameof(SharedParamsConfig.BaseboardFinishingType4): + return SpecTypeId.String.Text; + case nameof(SharedParamsConfig.BaseboardFinishingType5): + return SpecTypeId.String.Text; case nameof(SharedParamsConfig.FinishingRoomName): return SpecTypeId.String.Text; case nameof(SharedParamsConfig.FinishingRoomNumber): diff --git a/src/dosymep.Bim4Everyone/SharedParams/SharedParamsConfig.cs b/src/dosymep.Bim4Everyone/SharedParams/SharedParamsConfig.cs index fc87453..261964e 100644 --- a/src/dosymep.Bim4Everyone/SharedParams/SharedParamsConfig.cs +++ b/src/dosymep.Bim4Everyone/SharedParams/SharedParamsConfig.cs @@ -1041,6 +1041,36 @@ public SharedParam FloorFinishingType2 StorageType = StorageType.String }; + /// + /// ФОП_ОТД_Полы Тип 3 + /// + public SharedParam FloorFinishingType3 + => new SharedParam(nameof(FloorFinishingType3), new Guid("faf38afc-0eab-45f4-b24d-f6e1971747ed")) { + Name = "ФОП_ОТД_Полы Тип 3", + UnitType = SharedParam.GetUnitType(nameof(FloorFinishingType3)), + StorageType = StorageType.String + }; + + /// + /// ФОП_ОТД_Полы Тип 4 + /// + public SharedParam FloorFinishingType4 + => new SharedParam(nameof(FloorFinishingType4), new Guid("a0353eb7-e49a-404d-9997-1ba4ccb68eef")) { + Name = "ФОП_ОТД_Полы Тип 4", + UnitType = SharedParam.GetUnitType(nameof(FloorFinishingType4)), + StorageType = StorageType.String + }; + + /// + /// ФОП_ОТД_Полы Тип 5 + /// + public SharedParam FloorFinishingType5 + => new SharedParam(nameof(FloorFinishingType5), new Guid("50a11012-368d-4389-b447-8e13388c8596")) { + Name = "ФОП_ОТД_Полы Тип 5", + UnitType = SharedParam.GetUnitType(nameof(FloorFinishingType5)), + StorageType = StorageType.String + }; + /// /// ФОП_ОТД_Потолки Тип 1 /// @@ -1061,6 +1091,36 @@ public SharedParam CeilingFinishingType2 StorageType = StorageType.String }; + /// + /// ФОП_ОТД_Потолки Тип 3 + /// + public SharedParam CeilingFinishingType3 + => new SharedParam(nameof(CeilingFinishingType3), new Guid("4fa13b7d-97a0-4e39-8e14-885b6435d8dd")) { + Name = "ФОП_ОТД_Потолки Тип 3", + UnitType = SharedParam.GetUnitType(nameof(CeilingFinishingType3)), + StorageType = StorageType.String + }; + + /// + /// ФОП_ОТД_Потолки Тип 4 + /// + public SharedParam CeilingFinishingType4 + => new SharedParam(nameof(CeilingFinishingType4), new Guid("f985418e-a043-454c-aaa3-8177fec97326")) { + Name = "ФОП_ОТД_Потолки Тип 4", + UnitType = SharedParam.GetUnitType(nameof(CeilingFinishingType4)), + StorageType = StorageType.String + }; + + /// + /// ФОП_ОТД_Потолки Тип 5 + /// + public SharedParam CeilingFinishingType5 + => new SharedParam(nameof(CeilingFinishingType5), new Guid("bb3768ed-91dc-4945-89e6-9ad2683a0a0c")) { + Name = "ФОП_ОТД_Потолки Тип 5", + UnitType = SharedParam.GetUnitType(nameof(CeilingFinishingType5)), + StorageType = StorageType.String + }; + /// /// ФОП_ОТД_Стены Тип 1 /// @@ -1181,6 +1241,36 @@ public SharedParam BaseboardFinishingType2 StorageType = StorageType.String }; + /// + /// ФОП_ОТД_Плинтусы Тип 3 + /// + public SharedParam BaseboardFinishingType3 + => new SharedParam(nameof(BaseboardFinishingType3), new Guid("8a440520-d34b-482d-965e-dce0e3fc3224")) { + Name = "ФОП_ОТД_Плинтусы Тип 3", + UnitType = SharedParam.GetUnitType(nameof(BaseboardFinishingType3)), + StorageType = StorageType.String + }; + + /// + /// ФОП_ОТД_Плинтусы Тип 4 + /// + public SharedParam BaseboardFinishingType4 + => new SharedParam(nameof(BaseboardFinishingType4), new Guid("b1741f27-e041-48db-bfd5-85a05795cb23")) { + Name = "ФОП_ОТД_Плинтусы Тип 4", + UnitType = SharedParam.GetUnitType(nameof(BaseboardFinishingType4)), + StorageType = StorageType.String + }; + + /// + /// ФОП_ОТД_Плинтусы Тип 5 + /// + public SharedParam BaseboardFinishingType5 + => new SharedParam(nameof(BaseboardFinishingType5), new Guid("cd4084e0-70c7-4904-b2a4-927550d3a9f2")) { + Name = "ФОП_ОТД_Плинтусы Тип 5", + UnitType = SharedParam.GetUnitType(nameof(BaseboardFinishingType5)), + StorageType = StorageType.String + }; + /// /// ФОП_ОТД_Имя помещения /// From c1ffc64d04316f5d8e7692073c22ed0d9f67f2b2 Mon Sep 17 00:00:00 2001 From: sssenya Date: Wed, 21 May 2025 13:13:00 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80?= =?UTF-8?q?=D1=8B=20=D0=B2=20=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=B2=D0=BE?= =?UTF-8?q?=D0=B9=20=D1=81=D0=BF=D0=B5=D1=86=D0=B8=D1=84=D0=B8=D0=BA=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../KeySchedules/KeySchedulesConfig.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/dosymep.Bim4Everyone/KeySchedules/KeySchedulesConfig.cs b/src/dosymep.Bim4Everyone/KeySchedules/KeySchedulesConfig.cs index 22c0829..85752a3 100644 --- a/src/dosymep.Bim4Everyone/KeySchedules/KeySchedulesConfig.cs +++ b/src/dosymep.Bim4Everyone/KeySchedules/KeySchedulesConfig.cs @@ -256,8 +256,14 @@ public class KeySchedulesConfig : RevitSchedulesConfig { RequiredSharedParams = new List() { nameof(SharedParamsConfig.FloorFinishingType1), nameof(SharedParamsConfig.FloorFinishingType2), + nameof(SharedParamsConfig.FloorFinishingType3), + nameof(SharedParamsConfig.FloorFinishingType4), + nameof(SharedParamsConfig.FloorFinishingType5), nameof(SharedParamsConfig.CeilingFinishingType1), nameof(SharedParamsConfig.CeilingFinishingType2), + nameof(SharedParamsConfig.CeilingFinishingType3), + nameof(SharedParamsConfig.CeilingFinishingType4), + nameof(SharedParamsConfig.CeilingFinishingType5), nameof(SharedParamsConfig.WallFinishingType1), nameof(SharedParamsConfig.WallFinishingType2), nameof(SharedParamsConfig.WallFinishingType3), @@ -269,7 +275,10 @@ public class KeySchedulesConfig : RevitSchedulesConfig { nameof(SharedParamsConfig.WallFinishingType9), nameof(SharedParamsConfig.WallFinishingType10), nameof(SharedParamsConfig.BaseboardFinishingType1), - nameof(SharedParamsConfig.BaseboardFinishingType2) + nameof(SharedParamsConfig.BaseboardFinishingType2), + nameof(SharedParamsConfig.BaseboardFinishingType3), + nameof(SharedParamsConfig.BaseboardFinishingType4), + nameof(SharedParamsConfig.BaseboardFinishingType5) }, RequiredProjectParams = new List() { },