From d0d8d48c4e59b377deca3dd2183f0fe440f55737 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=20=D0=90=D0=BB=D0=B5=D0=BA?=
 =?UTF-8?q?=D1=81=D0=B0=D0=BD=D0=B4=D1=80=D0=BE=D0=B2=D0=B8=D1=87?=
 <da.stepanov@digitaldrilling.ru>
Date: Fri, 21 Jul 2023 09:07:58 +0500
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=B2?=
 =?UTF-8?q?=20Dto?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AutoGeneratedDailyReportDto.cs              | 14 +++++++-------
 .../AutogeneratedDailyReport/HeadBlockDto.cs    | 11 ++++++++---
 .../TimeBalanceRecordDto.cs                     | 17 +++++++++++++++++
 3 files changed, 32 insertions(+), 10 deletions(-)
 create mode 100644 AsbCloudApp/Data/AutogeneratedDailyReport/TimeBalanceRecordDto.cs

diff --git a/AsbCloudApp/Data/AutogeneratedDailyReport/AutoGeneratedDailyReportDto.cs b/AsbCloudApp/Data/AutogeneratedDailyReport/AutoGeneratedDailyReportDto.cs
index 234a80c1..d24be197 100644
--- a/AsbCloudApp/Data/AutogeneratedDailyReport/AutoGeneratedDailyReportDto.cs
+++ b/AsbCloudApp/Data/AutogeneratedDailyReport/AutoGeneratedDailyReportDto.cs
@@ -19,14 +19,9 @@ public class AutoGeneratedDailyReportDto
 	public string FileName { get; set; } = null!;
 	
 	/// <summary>
-	/// Начальная дата
+	/// Размер файла
 	/// </summary>
-	public DateOnly From { get; set; }
-	
-	/// <summary>
-	/// Конечная дата
-	/// </summary>
-	public DateOnly To { get; set; }
+	public int FileSize { get; set; }
 
 	/// <summary>
 	/// Блок заголовка
@@ -42,4 +37,9 @@ public class AutoGeneratedDailyReportDto
 	/// Блок ограничивающих параметров
 	/// </summary>
 	public IEnumerable<LimitingParameterRecordDto> LimitingParameters { get; set; } = null!;
+
+	/// <summary>
+	/// Баланс времени
+	/// </summary>
+	public IEnumerable<TimeBalanceRecordDto> TimeBalance { get; set; } = null!;
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Data/AutogeneratedDailyReport/HeadBlockDto.cs b/AsbCloudApp/Data/AutogeneratedDailyReport/HeadBlockDto.cs
index 6ec65477..125cd80a 100644
--- a/AsbCloudApp/Data/AutogeneratedDailyReport/HeadBlockDto.cs
+++ b/AsbCloudApp/Data/AutogeneratedDailyReport/HeadBlockDto.cs
@@ -28,10 +28,15 @@ public class HeadBlockDto
 	public string Deposit { get; set; } = null!;
 	
 	/// <summary>
-	/// Дата создания отчёта
+	/// Начальная дата
 	/// </summary>
-	public DateTime ReportDate { get; set; }
-	
+	public DateOnly From { get; set; }
+
+	/// <summary>
+	/// Конечная дата
+	/// </summary>
+	public DateOnly To => From.AddDays(1);
+
 	/// <summary>
 	/// Глубина забоя на дату начала интервала
 	/// </summary>
diff --git a/AsbCloudApp/Data/AutogeneratedDailyReport/TimeBalanceRecordDto.cs b/AsbCloudApp/Data/AutogeneratedDailyReport/TimeBalanceRecordDto.cs
new file mode 100644
index 00000000..a6ac9845
--- /dev/null
+++ b/AsbCloudApp/Data/AutogeneratedDailyReport/TimeBalanceRecordDto.cs
@@ -0,0 +1,17 @@
+namespace AsbCloudApp.Data.AutogeneratedDailyReport;
+
+/// <summary>
+/// Баланс времени
+/// </summary>
+public class TimeBalanceRecordDto
+{
+	/// <summary>
+	/// Название операции
+	/// </summary>
+	public string Name { get; set; } = null!;
+	
+	/// <summary>
+	/// Продолжительность, часы
+	/// </summary>
+	public double DurationHours { get; set; }
+}
\ No newline at end of file