diff --git a/Step.Database/Controllers/NcToolManagerController.cs b/Step.Database/Controllers/NcToolManagerController.cs index 2fb3d71f..ef62244e 100644 --- a/Step.Database/Controllers/NcToolManagerController.cs +++ b/Step.Database/Controllers/NcToolManagerController.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Data.Entity; using System.Linq; using static Step.Utils.SupportFunctions; +using static Step.Model.Constants; namespace Step.Database.Controllers { @@ -401,7 +402,7 @@ namespace Step.Database.Controllers if (dbFamily.FamilyId == 0) dbFamily.FamilyId = GetFirstFreeId(dbCtx.Families.Select(x => x.FamilyId).ToList()); - dbFamily.Name = dbFamily.Name + dbFamily.FamilyId; + dbFamily.Name = DEFAULT_FAM_NAME + dbFamily.FamilyId; dbCtx.Families.Add(dbFamily); dbCtx.SaveChanges(); diff --git a/Step.Model/Constants.cs b/Step.Model/Constants.cs index 23a99699..4d22786f 100644 --- a/Step.Model/Constants.cs +++ b/Step.Model/Constants.cs @@ -15,6 +15,8 @@ namespace Step.Model public const string RADIUS_METRIC = "RADIUS"; public const string DIAM_METRIC = "DIAMETER"; + public const string DEFAULT_FAM_NAME = "Family"; + public enum SCADA_ELEMENT_TYPE { BUTTON = 0, diff --git a/Step/Controllers/WebApi/NcToolManagerController.cs b/Step/Controllers/WebApi/NcToolManagerController.cs index 11c867e7..30fe5de6 100644 --- a/Step/Controllers/WebApi/NcToolManagerController.cs +++ b/Step/Controllers/WebApi/NcToolManagerController.cs @@ -889,7 +889,7 @@ namespace Step.Controllers.WebApi private static DTONcToolWithFamilyModel DTO_TOOL_WITH_FAM = new DTONcToolWithFamilyModel() { Id = 0, - Name = "Family", + Name = DEFAULT_FAM_NAME, OffsetId1 = null, OffsetId2 = null, OffsetId3 = null,