From 22c929ffe0582ac8eab402ccd4748524f6b93b95 Mon Sep 17 00:00:00 2001 From: KozlovPS Date: Thu, 25 Jun 2026 17:51:51 +0300 Subject: [PATCH 1/5] =?UTF-8?q?Reviteclarations:=20=D0=94=D0=BE=D0=B1?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=83=D1=81=D0=BB?= =?UTF-8?q?=D0=BE=D0=B2=D0=B8=D1=8F=20=D0=A3=D0=A2=D0=9F=20=D0=94=D0=BE?= =?UTF-8?q?=D0=BF=D1=8E=20=D0=BB=D0=B5=D1=82=D0=BD=D0=B8=D0=B5=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=BC=D0=B5=D1=89=D0=B5=D0=BD=D0=B8=D1=8F=20-=20=D1=82?= =?UTF-8?q?=D0=B5=D1=80=D1=80=D0=B0=D1=81=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/RevitDeclarations/Models/UtpCalculator.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/RevitDeclarations/Models/UtpCalculator.cs b/src/RevitDeclarations/Models/UtpCalculator.cs index 8993968e8..1d2545cd0 100644 --- a/src/RevitDeclarations/Models/UtpCalculator.cs +++ b/src/RevitDeclarations/Models/UtpCalculator.cs @@ -133,8 +133,9 @@ public string CalculateBalcony(Apartment apartment) { public string CalculateExtraSummerRooms(Apartment apartment) { int balconies = apartment.GetRoomsByPrior(_priorities.Balcony).Count; int loggies = apartment.GetRoomsByPrior(_priorities.Loggia).Count; + int terraces = apartment.GetRoomsByPrior(_priorities.Terrace).Count; - return balconies + loggies > 1 ? _utpYes : _utpNo; + return balconies + loggies + terraces > 1 ? _utpYes : _utpNo; } // УТП Мастер-спальня. From f1217b95fda691a1e2c372e4caa778417b155368 Mon Sep 17 00:00:00 2001 From: KozlovPS Date: Thu, 25 Jun 2026 22:45:36 +0300 Subject: [PATCH 2/5] =?UTF-8?q?RevitDeclarations:=20=D0=94=D0=BE=D0=B1?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BD=D0=BE?= =?UTF-8?q?=D0=BF=D0=BA=D0=B8=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=B5=D1=84=D0=B8=D1=81=D0=B0=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=BF=D1=80=D0=B5=D1=84=D0=B8=D0=BA=D1=81?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Pages/ParamsCommercialPage.xaml | 106 ++++++++++-------- .../assets/localization/Language.en-US.xaml | 3 +- .../assets/localization/Language.ru-RU.xaml | 3 +- 3 files changed, 63 insertions(+), 49 deletions(-) diff --git a/src/RevitDeclarations/Views/Pages/ParamsCommercialPage.xaml b/src/RevitDeclarations/Views/Pages/ParamsCommercialPage.xaml index 06f06f0a7..3ecdc3f16 100644 --- a/src/RevitDeclarations/Views/Pages/ParamsCommercialPage.xaml +++ b/src/RevitDeclarations/Views/Pages/ParamsCommercialPage.xaml @@ -303,6 +303,7 @@ + @@ -344,15 +345,26 @@ Grid.Row="2" Margin="10, 0" IsChecked="{Binding AddPrefixToNumber}"/> - + + + + diff --git a/src/RevitDeclarations/assets/localization/Language.en-US.xaml b/src/RevitDeclarations/assets/localization/Language.en-US.xaml index dec46d67e..4006ea4b8 100644 --- a/src/RevitDeclarations/assets/localization/Language.en-US.xaml +++ b/src/RevitDeclarations/assets/localization/Language.en-US.xaml @@ -77,7 +77,8 @@ Parameters for filling out the declaration 1.1 Room number: 1.2 Add prefix to the number: - 1.3 Parameter for prefix: + 1.3 Add hyphen after prefix: + 1.4 Parameter for prefix: 8. Total area 8.1 For a group of multiple rooms: 8.2 For a single room: diff --git a/src/RevitDeclarations/assets/localization/Language.ru-RU.xaml b/src/RevitDeclarations/assets/localization/Language.ru-RU.xaml index f1a591dd3..316c71069 100644 --- a/src/RevitDeclarations/assets/localization/Language.ru-RU.xaml +++ b/src/RevitDeclarations/assets/localization/Language.ru-RU.xaml @@ -77,7 +77,8 @@ Параметры для заполнения декларации 1.1 Номер помещения: 1.2 Добавить префикс в номер: - 1.3 Параметр для префикса: + 1.3 Добавить дефис после префикса: + 1.4 Параметр для префикса: 8. Общая площадь 8.1 Для группы из нескольких помещений: 8.2 Для одного помещения: From 36f487b9da6b304815ee694d9b763b6510e2fa3a Mon Sep 17 00:00:00 2001 From: KozlovPS Date: Thu, 25 Jun 2026 23:10:26 +0300 Subject: [PATCH 3/5] =?UTF-8?q?RevitDeclarations:=20=D0=94=D0=BE=D0=B1?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81=D0=B2=D0=BE?= =?UTF-8?q?=D0=B9=D1=81=D1=82=D0=B2=20=D0=B4=D0=B5=D1=84=D0=B8=D1=81=D0=B0?= =?UTF-8?q?=20=D0=B2=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D1=8B=20=D0=B8=20?= =?UTF-8?q?=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/RevitDeclarations/Models/Configs/CommercialConfig.cs | 4 +++- src/RevitDeclarations/Models/Settings/CommercialSettings.cs | 1 + .../ViewModels/MainViewModels/CommercialMainVM.cs | 2 ++ .../ViewModels/ParametersViewModels/CommercialParamsVM.cs | 1 + .../ViewModels/ParametersViewModels/ParametersViewModel.cs | 6 ++++++ src/RevitDeclarations/Views/Pages/ParamsCommercialPage.xaml | 2 +- 6 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/RevitDeclarations/Models/Configs/CommercialConfig.cs b/src/RevitDeclarations/Models/Configs/CommercialConfig.cs index c2c3ac780..f1d23912c 100644 --- a/src/RevitDeclarations/Models/Configs/CommercialConfig.cs +++ b/src/RevitDeclarations/Models/Configs/CommercialConfig.cs @@ -29,6 +29,7 @@ internal class CommercialConfigSettings : DeclarationConfigSettings { public string BuildingNumberParam { get; set; } public string ConstrWorksNumberParam { get; set; } public bool AddPrefixToNumber { get; set; } + public bool AddHyphenToPrefix { get; set; } public string RoomsHeightParam { get; set; } public string ParkingSpaceClass { get; set; } public string ParkingInfo { get; set; } @@ -38,7 +39,7 @@ internal class CommercialConfigSettings : DeclarationConfigSettings { public CommercialConfigSettings GetCompanyConfig() { return new CommercialConfigSettings() { FilterRoomsParam = LabelUtils.GetLabelFor(BuiltInParameter.ROOM_DEPARTMENT), - FilterRoomsValues = new[] { "нежилое помещение", "машино-место", "кладовая" }, + FilterRoomsValues = ["нежилое помещение", "машино-место", "кладовая"], GroupingBySectionParam = SharedParamsConfig.Instance.RoomGroupShortName.Name, GroupingByGroupParam = LabelUtils.GetLabelFor(BuiltInParameter.ROOM_NUMBER), MultiStoreyParam = SharedParamsConfig.Instance.RoomMultilevelGroup.Name, @@ -61,6 +62,7 @@ public CommercialConfigSettings GetCompanyConfig() { ProjectNameID = "", AddPrefixToNumber = true, + AddHyphenToPrefix = true, RoomAreaParam = SharedParamsConfig.Instance.RoomArea.Name, RoomNameParam = LabelUtils.GetLabelFor(BuiltInParameter.ROOM_NAME), diff --git a/src/RevitDeclarations/Models/Settings/CommercialSettings.cs b/src/RevitDeclarations/Models/Settings/CommercialSettings.cs index 42670f834..20c69d2f5 100644 --- a/src/RevitDeclarations/Models/Settings/CommercialSettings.cs +++ b/src/RevitDeclarations/Models/Settings/CommercialSettings.cs @@ -11,4 +11,5 @@ internal class CommercialSettings : DeclarationSettings { public Parameter GroupNameParam { get; set; } public bool AddPrefixToNumber { get; set; } + public bool AddHyphenToPrefix { get; set; } } diff --git a/src/RevitDeclarations/ViewModels/MainViewModels/CommercialMainVM.cs b/src/RevitDeclarations/ViewModels/MainViewModels/CommercialMainVM.cs index e31fd824b..b63e73951 100644 --- a/src/RevitDeclarations/ViewModels/MainViewModels/CommercialMainVM.cs +++ b/src/RevitDeclarations/ViewModels/MainViewModels/CommercialMainVM.cs @@ -115,6 +115,7 @@ private void SaveConfig() { if(settings.AddPrefixToNumber) { configSettings.RoomNumberParam = settings.RoomNumberParam?.Definition.Name; } + configSettings.AddHyphenToPrefix = settings.AddHyphenToPrefix; config.SaveProjectConfig(); } @@ -143,5 +144,6 @@ private void SetCommSettings() { _settings.PositionType = commercialParamsVM.SelectedPositionType; _settings.GroupNameParam = commercialParamsVM.SelectedGroupNameParam; _settings.AddPrefixToNumber = commercialParamsVM.AddPrefixToNumber; + _settings.AddHyphenToPrefix = commercialParamsVM.AddHyphenToPrefix; } } diff --git a/src/RevitDeclarations/ViewModels/ParametersViewModels/CommercialParamsVM.cs b/src/RevitDeclarations/ViewModels/ParametersViewModels/CommercialParamsVM.cs index dbac1d667..3d52ffc75 100644 --- a/src/RevitDeclarations/ViewModels/ParametersViewModels/CommercialParamsVM.cs +++ b/src/RevitDeclarations/ViewModels/ParametersViewModels/CommercialParamsVM.cs @@ -147,5 +147,6 @@ public override void SetParametersFromConfig(ProjectSettings configSettings) { .FirstOrDefault(x => x.Definition.Name == commercialConfigSettings.GroupNameParam); AddPrefixToNumber = commercialConfigSettings.AddPrefixToNumber; + AddHyphenToPrefix = commercialConfigSettings.AddHyphenToPrefix; } } diff --git a/src/RevitDeclarations/ViewModels/ParametersViewModels/ParametersViewModel.cs b/src/RevitDeclarations/ViewModels/ParametersViewModels/ParametersViewModel.cs index 6ccba974c..c20590124 100644 --- a/src/RevitDeclarations/ViewModels/ParametersViewModels/ParametersViewModel.cs +++ b/src/RevitDeclarations/ViewModels/ParametersViewModels/ParametersViewModel.cs @@ -34,6 +34,7 @@ internal abstract class ParametersViewModel : BaseViewModel { private Parameter _selectedRoomNameParam; private Parameter _selectedRoomNumberParam; private bool _addPrefixToNumber; + private bool _addHyphenToPrefix; public ParametersViewModel(RevitRepository revitRepository, MainViewModel mainViewModel) { _mainViewModel = mainViewModel; @@ -147,6 +148,11 @@ public bool AddPrefixToNumber { get => _addPrefixToNumber; set => RaiseAndSetIfChanged(ref _addPrefixToNumber, value); } + + public bool AddHyphenToPrefix { + get => _addHyphenToPrefix; + set => RaiseAndSetIfChanged(ref _addHyphenToPrefix, value); + } /// /// Список параметров для проверки их заполненности в View diff --git a/src/RevitDeclarations/Views/Pages/ParamsCommercialPage.xaml b/src/RevitDeclarations/Views/Pages/ParamsCommercialPage.xaml index 3ecdc3f16..bc7fc6e6e 100644 --- a/src/RevitDeclarations/Views/Pages/ParamsCommercialPage.xaml +++ b/src/RevitDeclarations/Views/Pages/ParamsCommercialPage.xaml @@ -637,7 +637,7 @@ Text="{me:LocalizationSource ParametersPage.ComRoomProjectName}"/> From 82ca4eacbc5439123af5c641d8cfc9e6cc903d3d Mon Sep 17 00:00:00 2001 From: KozlovPS Date: Fri, 26 Jun 2026 09:30:56 +0300 Subject: [PATCH 4/5] =?UTF-8?q?RevitDeclarations:=20=D0=B8=D0=B7=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=81=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4?= =?UTF-8?q?=D0=B0=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=B4=D0=B5=D1=84=D0=B8=D1=81=D0=B0,=20=D0=BA=D0=BE?= =?UTF-8?q?=D1=80=D1=80=D0=B5=D0=BA=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=BA?= =?UTF-8?q?=D0=B0=20=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=B8=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA?= =?UTF-8?q?=D0=B8=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Models/Configs/CommercialConfig.cs | 2 +- .../Models/Configs/PublicAreasConfig.cs | 2 ++ .../Models/RoomParamProvider.cs | 19 ++++++++++++------- .../Models/Rooms/CommercialRooms.cs | 2 +- .../Models/Rooms/PublicArea.cs | 2 +- .../Models/Settings/PublicAreasSettings.cs | 1 + .../MainViewModels/CommercialMainVM.cs | 2 +- .../MainViewModels/PublicAreasMainVM.cs | 2 ++ .../Views/Pages/ParamsCommercialPage.xaml | 1 + 9 files changed, 22 insertions(+), 11 deletions(-) diff --git a/src/RevitDeclarations/Models/Configs/CommercialConfig.cs b/src/RevitDeclarations/Models/Configs/CommercialConfig.cs index f1d23912c..3a5a786cf 100644 --- a/src/RevitDeclarations/Models/Configs/CommercialConfig.cs +++ b/src/RevitDeclarations/Models/Configs/CommercialConfig.cs @@ -62,7 +62,7 @@ public CommercialConfigSettings GetCompanyConfig() { ProjectNameID = "", AddPrefixToNumber = true, - AddHyphenToPrefix = true, + AddHyphenToPrefix = false, RoomAreaParam = SharedParamsConfig.Instance.RoomArea.Name, RoomNameParam = LabelUtils.GetLabelFor(BuiltInParameter.ROOM_NAME), diff --git a/src/RevitDeclarations/Models/Configs/PublicAreasConfig.cs b/src/RevitDeclarations/Models/Configs/PublicAreasConfig.cs index 57439292d..c15c95e46 100644 --- a/src/RevitDeclarations/Models/Configs/PublicAreasConfig.cs +++ b/src/RevitDeclarations/Models/Configs/PublicAreasConfig.cs @@ -27,6 +27,7 @@ public static PublicAreasConfig GetPluginConfig() { internal class PublicAreasConfigSettings : DeclarationConfigSettings { public bool AddPrefixToNumber { get; set; } + public bool AddHyphenToPrefix { get; set; } public PublicAreasConfigSettings GetCompanyConfig() { return new PublicAreasConfigSettings() { @@ -45,6 +46,7 @@ public PublicAreasConfigSettings GetCompanyConfig() { ApartmentNumberParam = SharedParamsConfig.Instance.RoomGroupShortName.Name, AddPrefixToNumber = true, + AddHyphenToPrefix = false, ProjectNameID = "", RoomAreaParam = SharedParamsConfig.Instance.RoomArea.Name, diff --git a/src/RevitDeclarations/Models/RoomParamProvider.cs b/src/RevitDeclarations/Models/RoomParamProvider.cs index 1681c4f7f..20908b3d8 100644 --- a/src/RevitDeclarations/Models/RoomParamProvider.cs +++ b/src/RevitDeclarations/Models/RoomParamProvider.cs @@ -6,18 +6,23 @@ namespace RevitDeclarations.Models; internal class RoomParamProvider { private readonly DeclarationSettings _settings; + private const string _hyphen = "-"; + public RoomParamProvider(DeclarationSettings settings) { _settings = settings; } - public string GetTwoParamsWithHyphen(RoomElement room, bool addPrefix) { + public string GetTwoParamsWithHyphen(RoomElement room, bool addPrefix, bool addHyphen) { string number = room.GetTextParamValue(_settings.RoomNumberParam); - if(addPrefix) { - string group = room.GetTextParamValue(_settings.ApartmentNumberParam); - if(!string.IsNullOrEmpty(group)) { - return $"{group}-{number}"; - } + if(!addPrefix) { + return number; + } + string group = room.GetTextParamValue(_settings.ApartmentNumberParam); + if(string.IsNullOrEmpty(group)) { + return number; } - return number; + return addHyphen + ? $"{group}{_hyphen}{number}" + : $"{group}{number}"; } public string GetDepartment(RoomElement room, string name) { diff --git a/src/RevitDeclarations/Models/Rooms/CommercialRooms.cs b/src/RevitDeclarations/Models/Rooms/CommercialRooms.cs index c4d64f30f..728b02d22 100644 --- a/src/RevitDeclarations/Models/Rooms/CommercialRooms.cs +++ b/src/RevitDeclarations/Models/Rooms/CommercialRooms.cs @@ -29,7 +29,7 @@ public CommercialRooms(IEnumerable rooms, public string PositionType => _firstRoom.GetTextParamValue(_settings.PositionType); public string DeclarationNumber => - _paramProvider.GetTwoParamsWithHyphen(_firstRoom, _settings.AddPrefixToNumber); + _paramProvider.GetTwoParamsWithHyphen(_firstRoom, _settings.AddPrefixToNumber, _settings.AddHyphenToPrefix); public override double AreaMain => _isOneRoomGroup ? _firstRoom.Area : base.AreaMain; diff --git a/src/RevitDeclarations/Models/Rooms/PublicArea.cs b/src/RevitDeclarations/Models/Rooms/PublicArea.cs index f6a7bc7e7..260eee293 100644 --- a/src/RevitDeclarations/Models/Rooms/PublicArea.cs +++ b/src/RevitDeclarations/Models/Rooms/PublicArea.cs @@ -22,7 +22,7 @@ public PublicArea(IEnumerable rooms, } public string DeclarationNumber => - _paramProvider.GetTwoParamsWithHyphen(_firstRoom, _settings.AddPrefixToNumber); + _paramProvider.GetTwoParamsWithHyphen(_firstRoom, _settings.AddPrefixToNumber, _settings.AddHyphenToPrefix); public override string Department => _paramProvider.GetDepartment(_firstRoom, "МОП"); public override double AreaMain => _isOneRoomGroup ? _firstRoom.Area : base.AreaMain; diff --git a/src/RevitDeclarations/Models/Settings/PublicAreasSettings.cs b/src/RevitDeclarations/Models/Settings/PublicAreasSettings.cs index dbe4597d6..b739af033 100644 --- a/src/RevitDeclarations/Models/Settings/PublicAreasSettings.cs +++ b/src/RevitDeclarations/Models/Settings/PublicAreasSettings.cs @@ -1,4 +1,5 @@ namespace RevitDeclarations.Models; internal class PublicAreasSettings : DeclarationSettings { public bool AddPrefixToNumber { get; set; } + public bool AddHyphenToPrefix { get; set; } } diff --git a/src/RevitDeclarations/ViewModels/MainViewModels/CommercialMainVM.cs b/src/RevitDeclarations/ViewModels/MainViewModels/CommercialMainVM.cs index b63e73951..87dccba54 100644 --- a/src/RevitDeclarations/ViewModels/MainViewModels/CommercialMainVM.cs +++ b/src/RevitDeclarations/ViewModels/MainViewModels/CommercialMainVM.cs @@ -144,6 +144,6 @@ private void SetCommSettings() { _settings.PositionType = commercialParamsVM.SelectedPositionType; _settings.GroupNameParam = commercialParamsVM.SelectedGroupNameParam; _settings.AddPrefixToNumber = commercialParamsVM.AddPrefixToNumber; - _settings.AddHyphenToPrefix = commercialParamsVM.AddHyphenToPrefix; + _settings.AddHyphenToPrefix = commercialParamsVM.AddHyphenToPrefix && commercialParamsVM.AddPrefixToNumber; } } diff --git a/src/RevitDeclarations/ViewModels/MainViewModels/PublicAreasMainVM.cs b/src/RevitDeclarations/ViewModels/MainViewModels/PublicAreasMainVM.cs index 49afc2e69..c89b47a43 100644 --- a/src/RevitDeclarations/ViewModels/MainViewModels/PublicAreasMainVM.cs +++ b/src/RevitDeclarations/ViewModels/MainViewModels/PublicAreasMainVM.cs @@ -110,6 +110,7 @@ private void SaveConfig() { if(settings.AddPrefixToNumber) { configSettings.RoomNumberParam = settings.RoomNumberParam?.Definition.Name; } + configSettings.AddHyphenToPrefix = settings.AddHyphenToPrefix; config.SaveProjectConfig(); } @@ -131,5 +132,6 @@ private void LoadConfig() { private void SetPublicAreasSettings() { var publicAreasParamsVM = (PublicAreasParamsVM) _parametersViewModel; _settings.AddPrefixToNumber = publicAreasParamsVM.AddPrefixToNumber; + _settings.AddHyphenToPrefix = publicAreasParamsVM.AddHyphenToPrefix && publicAreasParamsVM.AddPrefixToNumber; } } diff --git a/src/RevitDeclarations/Views/Pages/ParamsCommercialPage.xaml b/src/RevitDeclarations/Views/Pages/ParamsCommercialPage.xaml index bc7fc6e6e..e500ac9a0 100644 --- a/src/RevitDeclarations/Views/Pages/ParamsCommercialPage.xaml +++ b/src/RevitDeclarations/Views/Pages/ParamsCommercialPage.xaml @@ -355,6 +355,7 @@ Grid.Column="2" Grid.Row="3" Margin="10, 0" + IsEnabled="{Binding AddPrefixToNumber}" IsChecked="{Binding AddHyphenToPrefix}"/> Date: Fri, 26 Jun 2026 10:19:14 +0300 Subject: [PATCH 5/5] =?UTF-8?q?RevitDeclarations:=20=D0=94=D1=80=D0=B0?= =?UTF-8?q?=D0=B1=D0=BE=D1=82=D0=BA=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D1=86=D1=8B=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=20=D0=9C=D0=9E=D0=9F=20=D0=B8=20=D0=BB=D0=BE?= =?UTF-8?q?=D0=BA=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Pages/ParamsPublicAreasPage.xaml | 61 +++++++++++-------- .../assets/localization/Language.en-US.xaml | 2 +- .../assets/localization/Language.ru-RU.xaml | 2 +- 3 files changed, 39 insertions(+), 26 deletions(-) diff --git a/src/RevitDeclarations/Views/Pages/ParamsPublicAreasPage.xaml b/src/RevitDeclarations/Views/Pages/ParamsPublicAreasPage.xaml index 4d9bfd2fd..cddcaa894 100644 --- a/src/RevitDeclarations/Views/Pages/ParamsPublicAreasPage.xaml +++ b/src/RevitDeclarations/Views/Pages/ParamsPublicAreasPage.xaml @@ -294,6 +294,7 @@ + @@ -335,15 +336,27 @@ Grid.Row="2" Margin="10, 0" IsChecked="{Binding AddPrefixToNumber}"/> - + + + + diff --git a/src/RevitDeclarations/assets/localization/Language.en-US.xaml b/src/RevitDeclarations/assets/localization/Language.en-US.xaml index 4006ea4b8..1ca7adc03 100644 --- a/src/RevitDeclarations/assets/localization/Language.en-US.xaml +++ b/src/RevitDeclarations/assets/localization/Language.en-US.xaml @@ -95,7 +95,7 @@ Parameter for grouping within public area groups: 1.1 Room number: 1.2 Add prefix: - 1.3 Parameter for prefix: + 1.4 Parameter for prefix: 2. Room type: 3.1 Location - building block: 3.2 Location - section: diff --git a/src/RevitDeclarations/assets/localization/Language.ru-RU.xaml b/src/RevitDeclarations/assets/localization/Language.ru-RU.xaml index 316c71069..c11c5e034 100644 --- a/src/RevitDeclarations/assets/localization/Language.ru-RU.xaml +++ b/src/RevitDeclarations/assets/localization/Language.ru-RU.xaml @@ -95,7 +95,7 @@ Параметр группировки внутри групп МОП: 1.1 Номер помещения: 1.2 Добавить префикс: - 1.3 Параметр для префикса: + 1.4 Параметр для префикса: 2. Вид помещения: 3.1 Местоположение - корпус: 3.2 Местоположение - секция: