From 5fd971a620ba42a1a6adb8adb5da5243c75de528 Mon Sep 17 00:00:00 2001
From: "ai.astrakhantsev" <ai.astrakhantsev@digitaldrilling.ru>
Date: Tue, 21 Feb 2023 10:19:07 +0500
Subject: [PATCH] =?UTF-8?q?#5822403=20=D0=9E=D1=88=D0=B8=D0=B1=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D0=B2=20=D0=BF=D0=BE=D0=BB=D1=8F=D1=85,=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B8=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B8=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D0=B9=20?=
 =?UTF-8?q?=D0=B2=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/DailyReport/DailyReportBlocks/BhaBlock.cs          | 2 +-
 .../DailyReport/DailyReportBlocks/DimensionlessBlock.cs         | 2 +-
 .../ServicesTests/TrajectoryVisualizationServiceTest.cs         | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/BhaBlock.cs b/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/BhaBlock.cs
index 60505718..cd859b00 100644
--- a/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/BhaBlock.cs
+++ b/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/BhaBlock.cs
@@ -81,7 +81,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks
             sheet.Cell(AddressDurationDataStart[1])
                 ._SetValue($"{blockDto.SluiceBegin}");
             sheet.Cell(AddressDurationDataFinish[1])
-                ._SetValue($"{blockDto.SluiceBegin}");
+                ._SetValue($"{blockDto.SluiceFinish}");
             sheet.Cell(AddressTotaData[1])
                 .SetFormulaA1($"{FormulaBhaBlock(AddressDurationDataStart[1], AddressDurationDataFinish[1])}").Style.SetAllBorders();
             sheet._Range(AddressOperationData[2], AddressOperationData[2] + (0, 4))
diff --git a/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/DimensionlessBlock.cs b/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/DimensionlessBlock.cs
index bf54bb4d..f10c046e 100644
--- a/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/DimensionlessBlock.cs
+++ b/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/DimensionlessBlock.cs
@@ -87,7 +87,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks
             sheet._Range(AddressPreparationHead[2], AddressPreparationHead[2] + (0, 1))
                 ._SetValue("Проработка при бур, факт (ч):");
             sheet.Cell(AddressPreparationValue[2])
-               ._SetValue($"{blockDto.StandardTimeExtension}");
+               ._SetValue($"{blockDto.ActualTimeBarrelPreparation}");
             sheet._Range(AddressPreparationHead[3], AddressPreparationHead[3] + (0, 1))
                 ._SetValue("Превышение плановых норм, (ч):");
             sheet.Cell(AddressPreparationValue[3])
diff --git a/AsbCloudWebApi.Tests/ServicesTests/TrajectoryVisualizationServiceTest.cs b/AsbCloudWebApi.Tests/ServicesTests/TrajectoryVisualizationServiceTest.cs
index 7ba99ce0..f4532d7c 100644
--- a/AsbCloudWebApi.Tests/ServicesTests/TrajectoryVisualizationServiceTest.cs
+++ b/AsbCloudWebApi.Tests/ServicesTests/TrajectoryVisualizationServiceTest.cs
@@ -1,6 +1,7 @@
 using AsbCloudApp.Data;
 using AsbCloudApp.Repositories;
 using AsbCloudInfrastructure.Services;
+using AsbCloudInfrastructure.Services.Trajectory;
 using Moq;
 using System;
 using System.Collections.Generic;