RevitDeclarations: Добавлены декларации нежилых помещений и МОП

src/RevitDeclarations/RevitDeclarationsCommand.cs → src/RevitDeclarations/ApartmentsDeclarationCommand.cs

@@ -14,31 +14,35 @@
 using Ninject;
 
 using RevitDeclarations.Models;
+using RevitDeclarations.Models.Configs;
 using RevitDeclarations.ViewModels;
 using RevitDeclarations.Views;
 
 namespace RevitDeclarations {
     [Transaction(TransactionMode.Manual)]
-    public class RevitDeclarationsCommand : BasePluginCommand {
-        public RevitDeclarationsCommand() {
-            PluginName = "Декларации";
+    public class ApartmentsDeclarationCommand : BasePluginCommand {
+        public ApartmentsDeclarationCommand() {
+            PluginName = "15.2. О характеристиках жилых помещений";
         }
 
         protected override void Execute(UIApplication uiApplication) {
 			using(IKernel kernel = uiApplication.CreatePlatformServices()) {
                 kernel.Bind<RevitRepository>()
                     .ToSelf()
                     .InSingletonScope();
-
-				kernel.Bind<PluginConfig>()
-                    .ToMethod(c => PluginConfig.GetPluginConfig());
+                kernel.Bind<ApartmentsSettings>()
+                    .ToSelf()
+                    .InSingletonScope();
+
+                kernel.Bind<ApartmentsConfig>()
+                    .ToMethod(c => ApartmentsConfig.GetPluginConfig());
 
-				kernel.Bind<MainViewModel>().ToSelf();
-				kernel.Bind<MainWindow>().ToSelf()
+				kernel.Bind<ApartmentsMainVM>().ToSelf();
+				kernel.Bind<ApartmentsMainWindow>().ToSelf()
                     .WithPropertyValue(nameof(Window.Title), PluginName)
-                    .WithPropertyValue(nameof(Window.DataContext), c => c.Kernel.Get<MainViewModel>());
+                    .WithPropertyValue(nameof(Window.DataContext), c => c.Kernel.Get<ApartmentsMainVM>());
 
-				Notification(kernel.Get<MainWindow>());
+				Notification(kernel.Get<ApartmentsMainWindow>());
 			}
         }
     }

src/RevitDeclarations/CommercialDeclarationCommand.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+
+using Autodesk.Revit.Attributes;
+using Autodesk.Revit.UI;
+
+using dosymep.Bim4Everyone;
+using dosymep.Bim4Everyone.SimpleServices;
+
+using Ninject;
+
+using RevitDeclarations.Models;
+using RevitDeclarations.ViewModels;
+using RevitDeclarations.Views;
+
+namespace RevitDeclarations {
+    [Transaction(TransactionMode.Manual)]
+    public class CommercialDeclarationCommand : BasePluginCommand {
+        public CommercialDeclarationCommand() {
+            PluginName = "15.3. О характеристиках нежилых помещений";
+        }
+
+        protected override void Execute(UIApplication uiApplication) {
+            using(IKernel kernel = uiApplication.CreatePlatformServices()) {
+                kernel.Bind<RevitRepository>()
+                    .ToSelf()
+                    .InSingletonScope();
+                kernel.Bind<CommercialSettings>()
+                    .ToSelf()
+                    .InSingletonScope();
+
+                kernel.Bind<CommercialConfig>()
+                    .ToMethod(c => CommercialConfig.GetPluginConfig());
+
+                kernel.Bind<CommercialMainVM>().ToSelf();
+                kernel.Bind<CommercialMainWindow>().ToSelf()
+                    .WithPropertyValue(nameof(Window.Title), PluginName)
+                    .WithPropertyValue(nameof(Window.DataContext), c => c.Kernel.Get<CommercialMainVM>());
+
+                Notification(kernel.Get<CommercialMainWindow>());
+            }
+        }
+    }
+}

src/RevitDeclarations/Models/PluginConfig.cs → src/RevitDeclarations/Models/Configs/ApartmentsConfig.cs

@@ -10,81 +10,65 @@
 
 using pyRevitLabs.Json;
 
-namespace RevitDeclarations.Models {
-    internal class PluginConfig : ProjectConfig<RevitSettings> {
+namespace RevitDeclarations.Models.Configs {
+    internal class ApartmentsConfig : ProjectConfig<ApartmnetsConfigSettings> {
         [JsonIgnore] public override string ProjectConfigPath { get; set; }
 
         [JsonIgnore] public override IConfigSerializer Serializer { get; set; }
 
-        public static PluginConfig GetPluginConfig() {
+        public static ApartmentsConfig GetPluginConfig() {
             return new ProjectConfigBuilder()
                 .SetSerializer(new ConfigSerializer())
                 .SetPluginName(nameof(RevitDeclarations))
                 .SetRevitVersion(ModuleEnvironment.RevitVersion)
-                .SetProjectConfigName(nameof(PluginConfig) + ".json")
-                .Build<PluginConfig>();
+                .SetProjectConfigName(nameof(ApartmentsConfig) + ".json")
+                .Build<ApartmentsConfig>();
         }
     }
 
-    // Настройки Accuracy и LoadUtp не сохраняются в конфиг
-    internal class RevitSettings : ProjectSettings {
-        public override string ProjectName { get; set; }
-        public string DeclarationName { get; set; }
-        public string DeclarationPath { get; set; }
-        public Guid ExportFormat { get; set; }
-        public string Phase { get; set; }
-        public List<string> RevitDocuments { get; set; } = new List<string>();
-
-        public string FilterRoomsParam { get; set; }
-        public string FilterRoomsValue { get; set; }
-        public string GroupingBySectionParam { get; set; }
-        public string GroupingByGroupParam { get; set; }
-        public string MultiStoreyParam { get; set; }
-
+    internal class ApartmnetsConfigSettings : DeclarationConfigSettings {
         public string ApartmentFullNumberParam { get; set; }
-        public string DepartmentParam { get; set; }
-        public string LevelParam { get; set; }
-        public string SectionParam { get; set; }
-        public string BuildingParam { get; set; }
-        public string ApartmentNumberParam { get; set; }
-        public string ApartmentAreaParam { get; set; }
+
+        public string BuildingNumberParam { get; set; }
+        public string ConstrWorksNumberParam { get; set; }
         public string ApartmentAreaCoefParam { get; set; }
-        public string ApartmentAreaLivingParam { get; set; }
         public string RoomsAmountParam { get; set; }
-        public string ProjectNameID { get; set; }
-        public string ApartmentAreaNonSumParam { get; set; }
+        public string ApartmentAreaLivingParam { get; set; }
         public string RoomsHeightParam { get; set; }
-
-        public string RoomAreaParam { get; set; }
+        public string ApartmentAreaNonSumParam { get; set; }
         public string RoomAreaCoefParam { get; set; }
-
         public string PrioritiesFilePath { get; set; }
 
-
-        public RevitSettings GetCompanyConfig() {
-            return new RevitSettings() {
+        public ApartmnetsConfigSettings GetCompanyConfig() {
+            return new ApartmnetsConfigSettings() {
                 FilterRoomsParam = LabelUtils.GetLabelFor(BuiltInParameter.ROOM_DEPARTMENT),
-                FilterRoomsValue = "квартира",
+                FilterRoomsValues = new[] { "квартира" },
                 GroupingBySectionParam = SharedParamsConfig.Instance.RoomSectionShortName.Name,
-                GroupingByGroupParam = SharedParamsConfig.Instance.RoomGroupShortName.Name,                
+                GroupingByGroupParam = SharedParamsConfig.Instance.RoomGroupShortName.Name,
                 MultiStoreyParam = SharedParamsConfig.Instance.RoomMultilevelGroup.Name,
 
-                ApartmentFullNumberParam = SharedParamsConfig.Instance.ApartmentNumber.Name,
                 DepartmentParam = LabelUtils.GetLabelFor(BuiltInParameter.ROOM_DEPARTMENT),
                 LevelParam = SharedParamsConfig.Instance.Level.Name,
                 SectionParam = SharedParamsConfig.Instance.RoomSectionShortName.Name,
                 BuildingParam = SharedParamsConfig.Instance.RoomBuildingShortName.Name,
+                BuildingNumberParam = SharedParamsConfig.Instance.BuildingNumber.Name,
+                ConstrWorksNumberParam = SharedParamsConfig.Instance.ConstructionWorksNumber.Name,
+
                 ApartmentNumberParam = SharedParamsConfig.Instance.RoomGroupShortName.Name,
+                ApartmentFullNumberParam = SharedParamsConfig.Instance.ApartmentNumber.Name,
                 ApartmentAreaParam = SharedParamsConfig.Instance.ApartmentArea.Name,
                 ApartmentAreaCoefParam = SharedParamsConfig.Instance.ApartmentAreaRatio.Name,
                 ApartmentAreaLivingParam = SharedParamsConfig.Instance.ApartmentLivingArea.Name,
-                RoomsAmountParam = SharedParamsConfig.Instance.RoomsCount.Name,
-                ProjectNameID = "",
                 ApartmentAreaNonSumParam = SharedParamsConfig.Instance.ApartmentAreaNoBalcony.Name,
+                RoomsAmountParam = SharedParamsConfig.Instance.RoomsCount.Name,
                 RoomsHeightParam = LabelUtils.GetLabelFor(BuiltInParameter.ROOM_HEIGHT),
 
+                ProjectNameID = "",
+
                 RoomAreaParam = SharedParamsConfig.Instance.RoomArea.Name,
-                RoomAreaCoefParam = SharedParamsConfig.Instance.RoomAreaWithRatio.Name
+                RoomAreaCoefParam = SharedParamsConfig.Instance.RoomAreaWithRatio.Name,
+                RoomNameParam = LabelUtils.GetLabelFor(BuiltInParameter.ROOM_NAME),
+                RoomNumberParam = LabelUtils.GetLabelFor(BuiltInParameter.ROOM_NUMBER)
             };
         }
     }

src/RevitDeclarations/Models/Configs/CommercialConfig.cs

@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+
+using Autodesk.Revit.DB;
+
+using dosymep.Bim4Everyone;
+using dosymep.Bim4Everyone.ProjectConfigs;
+using dosymep.Bim4Everyone.SharedParams;
+using dosymep.Serializers;
+
+using pyRevitLabs.Json;
+
+namespace RevitDeclarations.Models {
+    internal class CommercialConfig : ProjectConfig<CommercialConfigSettings> {
+        [JsonIgnore] public override string ProjectConfigPath { get; set; }
+
+        [JsonIgnore] public override IConfigSerializer Serializer { get; set; }
+
+        public static CommercialConfig GetPluginConfig() {
+            return new ProjectConfigBuilder()
+                .SetSerializer(new ConfigSerializer())
+                .SetPluginName(nameof(RevitDeclarations))
+                .SetRevitVersion(ModuleEnvironment.RevitVersion)
+                .SetProjectConfigName(nameof(CommercialConfig) + ".json")
+                .Build<CommercialConfig>();
+        }
+    }
+
+    internal class CommercialConfigSettings : DeclarationConfigSettings {
+        public string BuildingNumberParam { get; set; }
+        public string ConstrWorksNumberParam { get; set; }
+        public bool AddPrefixToNumber { get; set; }
+        public string RoomsHeightParam { get; set; }
+        public string ParkingSpaceClass { get; set; }
+        public string GroupNameParam { get; set; }
+
+        public CommercialConfigSettings GetCompanyConfig() {
+            return new CommercialConfigSettings() {
+                FilterRoomsParam = LabelUtils.GetLabelFor(BuiltInParameter.ROOM_DEPARTMENT),
+                FilterRoomsValues = new[] { "нежилое помещение", "машино-место", "кладовая" },
+                GroupingBySectionParam = SharedParamsConfig.Instance.RoomGroupShortName.Name,
+                GroupingByGroupParam = LabelUtils.GetLabelFor(BuiltInParameter.ROOM_NUMBER),
+                MultiStoreyParam = SharedParamsConfig.Instance.RoomMultilevelGroup.Name,
+
+                DepartmentParam = LabelUtils.GetLabelFor(BuiltInParameter.ROOM_DEPARTMENT),
+                LevelParam = SharedParamsConfig.Instance.Level.Name,
+                SectionParam = SharedParamsConfig.Instance.RoomSectionShortName.Name,
+                BuildingParam = SharedParamsConfig.Instance.RoomBuildingShortName.Name,
+                BuildingNumberParam = SharedParamsConfig.Instance.BuildingNumber.Name,
+                ConstrWorksNumberParam = SharedParamsConfig.Instance.ConstructionWorksNumber.Name,
+
+                ApartmentNumberParam = SharedParamsConfig.Instance.RoomGroupShortName.Name,
+                ApartmentAreaParam = SharedParamsConfig.Instance.ApartmentArea.Name,
+                RoomsHeightParam = LabelUtils.GetLabelFor(BuiltInParameter.ROOM_HEIGHT),
+                ParkingSpaceClass = SharedParamsConfig.Instance.ParkingSpaceClass.Name,
+                GroupNameParam = SharedParamsConfig.Instance.ApartmentGroupName.Name,
+
+                ProjectNameID = "",
+
+                AddPrefixToNumber = true,
+
+                RoomAreaParam = SharedParamsConfig.Instance.RoomArea.Name,
+                RoomNameParam = LabelUtils.GetLabelFor(BuiltInParameter.ROOM_NAME),
+                RoomNumberParam = LabelUtils.GetLabelFor(BuiltInParameter.ROOM_NUMBER)
+            };
+        }
+    }
+}

src/RevitDeclarations/Models/Configs/DeclarationConfigSettings.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using dosymep.Bim4Everyone.ProjectConfigs;
+
+namespace RevitDeclarations.Models {
+    internal abstract class DeclarationConfigSettings : ProjectSettings {
+        public override string ProjectName { get; set; }
+
+        public string DeclarationName { get; set; }
+        public string DeclarationPath { get; set; }
+        public Guid ExportFormat { get; set; }
+        public string Phase { get; set; }
+        public List<string> RevitDocuments { get; set; } = new List<string>();
+
+        public string FilterRoomsParam { get; set; }
+        public string[] FilterRoomsValues { get; set; }
+        public string GroupingBySectionParam { get; set; }
+        public string GroupingByGroupParam { get; set; }
+        public string MultiStoreyParam { get; set; }
+
+        public string DepartmentParam { get; set; }
+        public string LevelParam { get; set; }
+        public string SectionParam { get; set; }
+        public string BuildingParam { get; set; }
+        public string RoomNameParam { get; set; }
+        public string RoomNumberParam { get; set; }
+        public string RoomAreaParam { get; set; }
+        public string ApartmentAreaParam { get; set; }
+        public string ApartmentNumberParam { get; set; }
+        public string ProjectNameID { get; set; }
+    }
+}

src/RevitDeclarations/Models/Configs/PublicAreasConfig.cs

@@ -0,0 +1,54 @@
+using Autodesk.Revit.DB;
+
+using dosymep.Bim4Everyone;
+using dosymep.Bim4Everyone.ProjectConfigs;
+using dosymep.Bim4Everyone.SharedParams;
+using dosymep.Serializers;
+
+using pyRevitLabs.Json;
+
+namespace RevitDeclarations.Models {
+    internal class PublicAreasConfig : ProjectConfig<PublicAreasConfigSettings> {
+        [JsonIgnore] public override string ProjectConfigPath { get; set; }
+
+        [JsonIgnore] public override IConfigSerializer Serializer { get; set; }
+
+        public static PublicAreasConfig GetPluginConfig() {
+            return new ProjectConfigBuilder()
+                .SetSerializer(new ConfigSerializer())
+                .SetPluginName(nameof(RevitDeclarations))
+                .SetRevitVersion(ModuleEnvironment.RevitVersion)
+                .SetProjectConfigName(nameof(PublicAreasConfig) + ".json")
+                .Build<PublicAreasConfig>();
+        }
+    }
+
+    internal class PublicAreasConfigSettings : DeclarationConfigSettings {
+        public bool AddPrefixToNumber { get; set; }
+
+        public PublicAreasConfigSettings GetCompanyConfig() {
+            return new PublicAreasConfigSettings() {
+                FilterRoomsParam = LabelUtils.GetLabelFor(BuiltInParameter.ROOM_DEPARTMENT),
+                FilterRoomsValues = new[] { "общественное", "техническое" },
+                GroupingBySectionParam = SharedParamsConfig.Instance.RoomGroupShortName.Name,
+                GroupingByGroupParam = LabelUtils.GetLabelFor(BuiltInParameter.ROOM_NUMBER),
+                MultiStoreyParam = SharedParamsConfig.Instance.RoomMultilevelGroup.Name,
+
+                DepartmentParam = LabelUtils.GetLabelFor(BuiltInParameter.ROOM_DEPARTMENT),
+                LevelParam = SharedParamsConfig.Instance.Level.Name,
+                SectionParam = SharedParamsConfig.Instance.RoomSectionShortName.Name,
+                BuildingParam = SharedParamsConfig.Instance.RoomBuildingShortName.Name,
+
+                ApartmentAreaParam = SharedParamsConfig.Instance.ApartmentArea.Name,
+                ApartmentNumberParam = SharedParamsConfig.Instance.RoomGroupShortName.Name,
+
+                AddPrefixToNumber = true,
+                ProjectNameID = "",
+
+                RoomAreaParam = SharedParamsConfig.Instance.RoomArea.Name,
+                RoomNameParam = LabelUtils.GetLabelFor(BuiltInParameter.ROOM_NAME),
+                RoomNumberParam = LabelUtils.GetLabelFor(BuiltInParameter.ROOM_NUMBER),
+            };
+        }
+    }
+}

src/RevitDeclarations/Models/Converters/ValueConverter.cs

@@ -0,0 +1,15 @@
+using System.Text.RegularExpressions;
+
+namespace RevitDeclarations.Models {
+    internal class ValueConverter {
+        public static int ConvertStringToInt(string value) {
+            if(string.IsNullOrEmpty(value)) {
+                return 0;
+            } else {
+                string resultString = Regex.Match(value, @"\d+").Value;
+                int.TryParse(resultString, out int result);
+                return result;
+            }
+        }
+    }
+}