Обновление спецификации: Правка Группирования

src/RevitMechanicalSpecification/Entities/SpecificationElement.cs

@@ -12,6 +12,7 @@ public class SpecificationElement {
         private Element _elementType;
         private BuiltInCategory _builtInCategory;
         private string _elementName;
+        private string _elementMark;
         private FamilyInstance _manifoldInstance = null;
         private SpecificationElement _manifoldSpElement;
         private SpecificationElement _insulationSpHost;
@@ -46,6 +47,11 @@ public string ElementName {
             set => _elementName = value;
         }
 
+        public string ElementMark {
+            get => _elementMark;
+            set => _elementMark = value;
+        }
+
         public FamilyInstance ManifoldInstance {
                 get => _manifoldInstance;
                 set => _manifoldInstance = value;

src/RevitMechanicalSpecification/Models/Fillers/ElementParamGroupFiller.cs

@@ -109,7 +109,10 @@ private string GetBaseGroup(Element element) {
         /// </summary>
         private string GetDetailedGroup(SpecificationElement specificationElement) {
             string name = specificationElement.ElementName;
-            string mark = specificationElement.GetTypeOrInstanceParamStringValue(Config.OriginalParamNameMark);
+            string mark = !string.IsNullOrEmpty(specificationElement.ElementMark)
+                   ? specificationElement.ElementMark
+                   : specificationElement.GetTypeOrInstanceParamStringValue(Config.OriginalParamNameMark);
+
             string code = specificationElement.GetTypeOrInstanceParamStringValue(Config.OriginalParamNameCode);
             string creator = specificationElement.GetTypeOrInstanceParamStringValue(Config.OriginalParamNameCreator);
 

src/RevitMechanicalSpecification/Models/Fillers/ElementParamMarkFiller.cs

@@ -41,6 +41,7 @@ private string GetMark(SpecificationElement specificationElement) {
 
             if(specificationElement.BuiltInCategory == BuiltInCategory.OST_DuctFitting) {
                 mark = _calculator.GetDuctFittingMark(specificationElement.Element);
+                specificationElement.ElementMark = mark;
             }
 
             return mark;

src/RevitMechanicalSpecification/Models/RevitRepository.cs

@@ -53,19 +53,20 @@ public RevitRepository(UIApplication uiApplication) {
                 _specConfiguration,
                 Document,
                 _calculator),
-                //Заполнение ФОП_ВИС_Группирование
-                new ElementParamGroupFiller(
-                _specConfiguration.TargetNameGroup,
-                null,
-                _specConfiguration,
-                Document),
                 //Заполнение ФОП_ВИС_Марка
                 new ElementParamMarkFiller(
                 _specConfiguration.TargetNameMark,
                 _specConfiguration.OriginalParamNameMark,
                 _specConfiguration,
                 _calculator,
                 Document),
+                //Заполнение ФОП_ВИС_Группирование
+                new ElementParamGroupFiller(
+                _specConfiguration.TargetNameGroup,
+                null,
+                _specConfiguration,
+                Document),
+
                 //Заполнение ФОП_ВИС_Код изделия
                 new ElementParamDefaultFiller(
                 _specConfiguration.TargetNameCode,

src/RevitMechanicalSpecification/Service/VisElementsCalculator.cs

@@ -75,19 +75,19 @@ public string GetDuctFittingName(Element element) {
 
             switch(fitting.PartType) {
                 case PartType.Transition:
-                    startName = "Переход между сечениями воздуховода ";
+                    startName = "Переход между сечениями воздуховода";
                     break;
                 case PartType.Tee:
-                    startName = "Тройник ";
+                    startName = "Тройник";
                     break;
                 case PartType.TapAdjustable:
-                    startName = "Врезка в воздуховод ";
+                    startName = "Врезка в воздуховод";
                     break;
                 case PartType.Cross:
-                    startName = "Крестовина ";
+                    startName = "Крестовина";
                     break;
                 case PartType.Cap:
-                    startName = "Заглушка ";
+                    startName = "Заглушка";
                     break;
                 case PartType.Union:
                     return "!Не учитывать";