RevitDeclarations: Добавление условия для расчета параметра, добавления дефиса префикса

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 = false,
 
             RoomAreaParam = SharedParamsConfig.Instance.RoomArea.Name,
             RoomNameParam = LabelUtils.GetLabelFor(BuiltInParameter.ROOM_NAME),

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,

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) {

src/RevitDeclarations/Models/Rooms/CommercialRooms.cs

@@ -29,7 +29,7 @@ public CommercialRooms(IEnumerable<RoomElement> 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;
 

src/RevitDeclarations/Models/Rooms/PublicArea.cs

@@ -22,7 +22,7 @@ public PublicArea(IEnumerable<RoomElement> 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;

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; }
 }

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; }
 }

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;
     }
 
     // УТП Мастер-спальня.

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 && commercialParamsVM.AddPrefixToNumber;
     }
 }

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;
     }
 }

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;
     }
 }

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);
+    }
 
     /// <summary>
     /// Список параметров для проверки их заполненности в View