From a8d570713d155fd7a0e0176def9d81e0a1516744 Mon Sep 17 00:00:00 2001 From: ear Date: Fri, 8 Nov 2024 15:18:00 +0500 Subject: [PATCH] Correct errors of opening material --- .../Converters/HelperMaterialFromDTOConvertStrategy.cs | 8 ++++---- .../Models/Materials/FRMaterials/FRMaterial.cs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DataAccess/DTOs/Converters/HelperMaterialFromDTOConvertStrategy.cs b/DataAccess/DTOs/Converters/HelperMaterialFromDTOConvertStrategy.cs index dc5f73c..cf20515 100644 --- a/DataAccess/DTOs/Converters/HelperMaterialFromDTOConvertStrategy.cs +++ b/DataAccess/DTOs/Converters/HelperMaterialFromDTOConvertStrategy.cs @@ -73,8 +73,8 @@ namespace DataAccess.DTOs private IHelperMaterial GetElasticMaterial(ElasticMaterialDTO source) { TraceLogger?.AddMessage(MaterialIs + "Elastic material", TraceLogStatuses.Service); - reinforcementConvertStrategy.ReferenceDictionary = ReferenceDictionary; - reinforcementConvertStrategy.TraceLogger = TraceLogger; + elasticConvertStrategy.ReferenceDictionary = ReferenceDictionary; + elasticConvertStrategy.TraceLogger = TraceLogger; var newItem = elasticConvertStrategy.Convert(source); safetyFactorUpdateStrategy.Update(newItem, source); return newItem; @@ -83,8 +83,8 @@ namespace DataAccess.DTOs private IHelperMaterial GetFRMaterial(FRMaterialDTO source) { TraceLogger?.AddMessage(MaterialIs + "Fiber reinforcement material", TraceLogStatuses.Service); - reinforcementConvertStrategy.ReferenceDictionary = ReferenceDictionary; - reinforcementConvertStrategy.TraceLogger = TraceLogger; + frConvertStrategy.ReferenceDictionary = ReferenceDictionary; + frConvertStrategy.TraceLogger = TraceLogger; var newItem = frConvertStrategy.Convert(source); safetyFactorUpdateStrategy.Update(newItem, source); return newItem; diff --git a/StructureHelperLogics/Models/Materials/FRMaterials/FRMaterial.cs b/StructureHelperLogics/Models/Materials/FRMaterials/FRMaterial.cs index 4ad45aa..8e284ed 100644 --- a/StructureHelperLogics/Models/Materials/FRMaterials/FRMaterial.cs +++ b/StructureHelperLogics/Models/Materials/FRMaterials/FRMaterial.cs @@ -29,7 +29,7 @@ namespace StructureHelperLogics.Models.Materials public FRMaterial(MaterialTypes materialType, Guid id) { - if (materialType != MaterialTypes.CarbonFiber || + if (materialType != MaterialTypes.CarbonFiber & materialType != MaterialTypes.GlassFiber) { throw new StructureHelperException(ErrorStrings.DataIsInCorrect + $": Material type {materialType} is not right");