From 593183ec87fd9e782d338f402db09de47c3453cf Mon Sep 17 00:00:00 2001
From: Olga Nemt <on.nemtina@digitaldrilling.ru>
Date: Thu, 21 Mar 2024 11:33:43 +0500
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D1=82=D0=B8=D0=BF=D0=B0=20=D0=B4=D0=B0=D1=82=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20FileMarkDto?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AsbCloudApp/Data/FileMarkDto.cs                               | 2 +-
 AsbCloudInfrastructure/Repository/FileRepository.cs           | 2 +-
 .../Services/DrillingProgram/DrillingProgramService.cs        | 2 +-
 .../Services/DrillingProgram/TitleListSheet.cs                | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/AsbCloudApp/Data/FileMarkDto.cs b/AsbCloudApp/Data/FileMarkDto.cs
index 7329821b..305fad5c 100644
--- a/AsbCloudApp/Data/FileMarkDto.cs
+++ b/AsbCloudApp/Data/FileMarkDto.cs
@@ -33,7 +33,7 @@ namespace AsbCloudApp.Data
         /// Необязательно указывать в запросе на создание.
         /// </summary>
         [Required]
-        public DateTime DateCreated { get; set; }
+        public DateTimeOffset DateCreated { get; set; }
 
         /// <summary>
         /// Полезный комментарий 
diff --git a/AsbCloudInfrastructure/Repository/FileRepository.cs b/AsbCloudInfrastructure/Repository/FileRepository.cs
index dd6cc8ea..c4560116 100644
--- a/AsbCloudInfrastructure/Repository/FileRepository.cs
+++ b/AsbCloudInfrastructure/Repository/FileRepository.cs
@@ -282,7 +282,7 @@ namespace AsbCloudInfrastructure.Repository
             dto.FileMarks = entity.FileMarks.Select(m =>
             {
                 var mark = m.Adapt<FileMarkDto>();
-                mark.DateCreated = m.DateCreated.ToRemoteDateTime(timezoneOffset);
+                mark.DateCreated = m.DateCreated.ToOffset(TimeSpan.FromHours(timezoneOffset));
                 return mark;
             });
             return dto;
diff --git a/AsbCloudInfrastructure/Services/DrillingProgram/DrillingProgramService.cs b/AsbCloudInfrastructure/Services/DrillingProgram/DrillingProgramService.cs
index 644a62cb..18e6acf2 100644
--- a/AsbCloudInfrastructure/Services/DrillingProgram/DrillingProgramService.cs
+++ b/AsbCloudInfrastructure/Services/DrillingProgram/DrillingProgramService.cs
@@ -489,7 +489,7 @@ namespace AsbCloudInfrastructure.Services.DrillingProgram
                     part.File.FileMarks = marks.Select(m =>
                     {
                         var mark = m.Adapt<FileMarkDto>();
-                        mark.DateCreated = m.DateCreated.ToRemoteDateTime(timezoneOffset);
+                        mark.DateCreated = m.DateCreated.ToOffset(TimeSpan.FromHours(timezoneOffset));
                         return mark;
                     });
                     var hasReject = marks.Any(m => m.IdMarkType == idMarkTypeReject);
diff --git a/AsbCloudInfrastructure/Services/DrillingProgram/TitleListSheet.cs b/AsbCloudInfrastructure/Services/DrillingProgram/TitleListSheet.cs
index 3d6482a7..7c9355d8 100644
--- a/AsbCloudInfrastructure/Services/DrillingProgram/TitleListSheet.cs
+++ b/AsbCloudInfrastructure/Services/DrillingProgram/TitleListSheet.cs
@@ -11,7 +11,7 @@ namespace AsbCloudInfrastructure.Services.DrillingProgram
     {
         private const string directionDirectorPositionName = "Руководитель направления по ТСБ";
 
-        private readonly DateTime totalDate;
+        private readonly DateTimeOffset totalDate;
         private readonly FileMarkDto? acceptDirectionDirector;
         private readonly List<FileMarkDto> acceptsOthers;
         private readonly WellDto well;
@@ -157,7 +157,7 @@ namespace AsbCloudInfrastructure.Services.DrillingProgram
                 .Alignment.SetHorizontal(XLAlignmentHorizontalValues.Left);
         }
 
-        private static string FormatDate(DateTime dateTime)
+        private static string FormatDate(DateTimeOffset dateTime)
             => $"{dateTime.Day:00}.{dateTime.Month:00}.{dateTime.Year:00}";
     }