From 968596b4bf2c17178a20f582e1ceb79f0826ee44 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?= <falldimka007@gmail.com>
Date: Tue, 14 Nov 2023 10:51:36 +0500
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20DTO=20=D1=81=D1=83=D1=82=D0=BE=D1=87=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B3=D0=BE=20=D0=BE=D1=82=D1=87=D1=91=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. Удалён базовый класс EditableBlock, все изменяемые блоки наследуются от ItemInfoDto
2. Фикс названия свойств
---
 .../Data/DailyReport/Blocks/EditableBlock.cs  | 19 -----------------
 .../Blocks/ProcessMapWellDrillingRecordDto.cs |  2 +-
 .../DailyReport/Blocks/Sign/SignBlockDto.cs   |  2 +-
 .../Blocks/Subsystems/SubsystemBlockDto.cs    |  2 +-
 .../Blocks/TimeBalance/TimeBalanceBlockDto.cs | 13 ++++--------
 .../TimeBalance/TimeBalanceRecordDto.cs       |  8 +++----
 .../Data/DailyReport/DailyReportDto.cs        | 21 +++++++------------
 7 files changed, 19 insertions(+), 48 deletions(-)
 delete mode 100644 AsbCloudApp/Data/DailyReport/Blocks/EditableBlock.cs

diff --git a/AsbCloudApp/Data/DailyReport/Blocks/EditableBlock.cs b/AsbCloudApp/Data/DailyReport/Blocks/EditableBlock.cs
deleted file mode 100644
index 98dd67c0..00000000
--- a/AsbCloudApp/Data/DailyReport/Blocks/EditableBlock.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-
-namespace AsbCloudApp.Data.DailyReport.Blocks;
-
-/// <summary>
-/// Базовый класс для редактируемых блоков
-/// </summary>
-public abstract class EditableBlock
-{
-	/// <summary>
-	/// Id пользователя внесшего изменения в блок
-	/// </summary>
-	public int IdUser { get; set; }
-	
-	/// <summary>
-	/// Дата обновления блока
-	/// </summary>
-	public DateTime? DateLastUpdate { get; set; }
-}
\ No newline at end of file
diff --git a/AsbCloudApp/Data/DailyReport/Blocks/ProcessMapWellDrillingRecordDto.cs b/AsbCloudApp/Data/DailyReport/Blocks/ProcessMapWellDrillingRecordDto.cs
index 74b2c2d7..d51d4b5d 100644
--- a/AsbCloudApp/Data/DailyReport/Blocks/ProcessMapWellDrillingRecordDto.cs
+++ b/AsbCloudApp/Data/DailyReport/Blocks/ProcessMapWellDrillingRecordDto.cs
@@ -13,7 +13,7 @@ public class ProcessMapWellDrillingRecordDto
 	/// <summary>
 	/// Мех. скорость
 	/// </summary>
-	public PlanFactDto<double?> Rop { get; set; }
+	public PlanFactDto<double?> Rop { get; set; } = new();
 	
 	/// <summary>
 	/// Глубина ствола
diff --git a/AsbCloudApp/Data/DailyReport/Blocks/Sign/SignBlockDto.cs b/AsbCloudApp/Data/DailyReport/Blocks/Sign/SignBlockDto.cs
index 717c3403..d425f360 100644
--- a/AsbCloudApp/Data/DailyReport/Blocks/Sign/SignBlockDto.cs
+++ b/AsbCloudApp/Data/DailyReport/Blocks/Sign/SignBlockDto.cs
@@ -3,7 +3,7 @@ namespace AsbCloudApp.Data.DailyReport.Blocks.Sign;
 /// <summary>
 /// Блок с подписями
 /// </summary>
-public class SignBlockDto : EditableBlock
+public class SignBlockDto : ItemInfoDto
 {
 	/// <summary>
 	/// Подпись мастера буровой
diff --git a/AsbCloudApp/Data/DailyReport/Blocks/Subsystems/SubsystemBlockDto.cs b/AsbCloudApp/Data/DailyReport/Blocks/Subsystems/SubsystemBlockDto.cs
index 21b5ea71..5866d057 100644
--- a/AsbCloudApp/Data/DailyReport/Blocks/Subsystems/SubsystemBlockDto.cs
+++ b/AsbCloudApp/Data/DailyReport/Blocks/Subsystems/SubsystemBlockDto.cs
@@ -6,7 +6,7 @@ namespace AsbCloudApp.Data.DailyReport.Blocks.Subsystems;
 /// <summary>
 /// Блок статистики работы подсистем
 /// </summary>
-public class SubsystemBlockDto : EditableBlock
+public class SubsystemBlockDto : ItemInfoDto
 {
 	/// <summary>
 	/// Длина ствола скважины
diff --git a/AsbCloudApp/Data/DailyReport/Blocks/TimeBalance/TimeBalanceBlockDto.cs b/AsbCloudApp/Data/DailyReport/Blocks/TimeBalance/TimeBalanceBlockDto.cs
index 74773f1c..f58ed0ac 100644
--- a/AsbCloudApp/Data/DailyReport/Blocks/TimeBalance/TimeBalanceBlockDto.cs
+++ b/AsbCloudApp/Data/DailyReport/Blocks/TimeBalance/TimeBalanceBlockDto.cs
@@ -7,7 +7,7 @@ namespace AsbCloudApp.Data.DailyReport.Blocks.TimeBalance;
 /// <summary>
 /// Блок с балансом времени
 /// </summary>
-public class TimeBalanceBlockDto : EditableBlock
+public class TimeBalanceBlockDto : ItemInfoDto
 {
 	/// <summary>
 	/// Идентификатор секции
@@ -21,15 +21,10 @@ public class TimeBalanceBlockDto : EditableBlock
 	public string? SectionName { get; set; }
 	
 	/// <summary>
-	/// Плановая проходка скважины
+	/// Проходка скважины
 	/// </summary>
-	public double? WellDepthPlan { get; set; }
-	
-	/// <summary>
-	/// Фактическая проходка скважины
-	/// </summary>
-	public double WellDepthFact { get; set; }
-	
+	public PlanFactDto<double?> WellDepth { get; set; } = new();
+
 	/// <summary>
 	/// Кол-во наращиваний за сутки
 	/// </summary>
diff --git a/AsbCloudApp/Data/DailyReport/Blocks/TimeBalance/TimeBalanceRecordDto.cs b/AsbCloudApp/Data/DailyReport/Blocks/TimeBalance/TimeBalanceRecordDto.cs
index 35fb6f3c..5bdbec9a 100644
--- a/AsbCloudApp/Data/DailyReport/Blocks/TimeBalance/TimeBalanceRecordDto.cs
+++ b/AsbCloudApp/Data/DailyReport/Blocks/TimeBalance/TimeBalanceRecordDto.cs
@@ -11,13 +11,13 @@ public class TimeBalanceRecordDto
 	/// Наращивание, выход на режим - 3
 	/// Промывка, проработка - 4
 	/// </summary>
-	public int IdWellOperation { get; set; } 
+	public int IdWellOperation { get; set; }
 
 	/// <summary>
 	/// Продолжительность операции, ч
 	/// </summary>
-	public PlanFactDto<double>? DurationHours { get; set; }
-	
+	public PlanFactDto<double?> DurationHours { get; set; } = new();
+
 	/// <summary>
 	/// Отклонение за секцию
 	/// </summary>
@@ -26,7 +26,7 @@ public class TimeBalanceRecordDto
 	/// <summary>
 	/// Отклонение за сутки
 	/// </summary>
-	public double? DrillingDeviationPerDaily { get; set; }
+	public double? DrillingDeviationPerDay { get; set; }
 	
 	/// <summary>
 	/// Причина отклонения
diff --git a/AsbCloudApp/Data/DailyReport/DailyReportDto.cs b/AsbCloudApp/Data/DailyReport/DailyReportDto.cs
index f4925d16..0caeea30 100644
--- a/AsbCloudApp/Data/DailyReport/DailyReportDto.cs
+++ b/AsbCloudApp/Data/DailyReport/DailyReportDto.cs
@@ -24,7 +24,7 @@ public class DailyReportDto : IId,
 	/// <summary>
 	/// Название скважины
 	/// </summary>
-	public string WellName { get; set; } = null!;
+	public string WellCaption { get; set; } = null!;
 
 	/// <summary>
 	/// Название типа скважины
@@ -61,21 +61,16 @@ public class DailyReportDto : IId,
 	/// </summary>
 	public double? DepthEnd { get; set; }
 
+	/// <summary>
+	/// Дата формирования отчёта
+	/// </summary>
+	public DateTime Date { get; set; }
+	
 	/// <summary>
 	/// Дата последнего обновления
 	/// </summary>
-	public DateTime? DateLastUpdate { get; set; }
-
-	/// <summary>
-	/// Начальная дата отчёта
-	/// </summary>
-	public DateTime DateStart { get; set; }
-
-	/// <summary>
-	/// Конечная дата отчёта
-	/// </summary>
-	public DateTime DateEnd => DateStart.AddHours(24);
-
+	public DateTime? DateLastUpdate { get; set; } 
+	
 	/// <summary>
 	/// Блок фактической траектории
 	/// </summary>