From ac578bce3808185c6a05fd6b7097809f7696658e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D1=82=D0=B5=D0=BF=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=94?=
 =?UTF-8?q?=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9?=
 <da.stepanov@digitaldrilling.ru>
Date: Fri, 29 Sep 2023 18:48:17 +0500
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D0=B0=20=D1=80?=
 =?UTF-8?q?=D0=B0=D1=81=D1=88=D0=B8=D1=80=D0=B5=D0=BD=D0=B8=D1=8F.=20?=
 =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=B2=D0=BE=D0=B7?=
 =?UTF-8?q?=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=B2=D0=BE?=
 =?UTF-8?q?=D0=B7=D0=B2=D1=80=D0=B0=D1=89=D0=B0=D1=82=D1=8C=20null?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/Trajectory/PlannedTrajectoryImportService.cs    | 3 +--
 AsbCloudInfrastructure/XLExtentions.cs                       | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/AsbCloudInfrastructure/Services/Trajectory/PlannedTrajectoryImportService.cs b/AsbCloudInfrastructure/Services/Trajectory/PlannedTrajectoryImportService.cs
index ff1c59b6..771396dc 100644
--- a/AsbCloudInfrastructure/Services/Trajectory/PlannedTrajectoryImportService.cs
+++ b/AsbCloudInfrastructure/Services/Trajectory/PlannedTrajectoryImportService.cs
@@ -185,8 +185,7 @@ namespace AsbCloudInfrastructure.Services.Trajectory
                 AzimuthMagnetic = row.Cell(ColumnAzimuthMagnetic).GetCellValue<double>(),
                 VerticalDepth = row.Cell(ColumnVerticalDepth).GetCellValue<double>(),
                 Radius = row.Cell(ColumnRadius).GetCellValue<double>(),
-                Comment = row.Cell(ColumnComment).IsEmpty() ? null : 
-                    row.Cell(ColumnComment).GetCellValue<string>()
+                Comment = row.Cell(ColumnComment).GetCellValue<string?>()
             };
             
             return trajectoryRow;
diff --git a/AsbCloudInfrastructure/XLExtentions.cs b/AsbCloudInfrastructure/XLExtentions.cs
index ac2a40a1..a4f6f81a 100644
--- a/AsbCloudInfrastructure/XLExtentions.cs
+++ b/AsbCloudInfrastructure/XLExtentions.cs
@@ -158,10 +158,13 @@ internal static class XLExtentions
 		=> sheet.Range(begin.RowNumber, begin.ColumnNumber, end.RowNumber, end.ColumnNumber);
 	
 	
-	internal static T GetCellValue<T>(this IXLCell cell)
+	internal static T? GetCellValue<T>(this IXLCell cell)
 	{
 		try
 		{
+			if (cell.IsEmpty() && default(T) == null)
+				return default;
+			
 			if (typeof(T) != typeof(DateTime))
 				return (T)Convert.ChangeType(cell.GetFormattedString(), typeof(T), CultureInfo.InvariantCulture);