on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

Merge pull request '#5822403 Ошибка в полях, при добавлении значений в таблицу' (#28) from bug/5822403 into dev

Browse Source 
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/28
This commit is contained in:
Никита Фролов 2023-02-21 10:55:04 +05:00
commit f62b23fc47
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/BhaBlock.cs
View File

@ -81,7 +81,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks
sheet.Cell(AddressDurationDataStart[1]) sheet.Cell(AddressDurationDataStart[1])
._SetValue($"{blockDto.SluiceBegin}"); ._SetValue($"{blockDto.SluiceBegin}");
sheet.Cell(AddressDurationDataFinish[1]) sheet.Cell(AddressDurationDataFinish[1])
._SetValue($"{blockDto.SluiceBegin}"); ._SetValue($"{blockDto.SluiceFinish}");
sheet.Cell(AddressTotaData[1]) sheet.Cell(AddressTotaData[1])
.SetFormulaA1($"{FormulaBhaBlock(AddressDurationDataStart[1], AddressDurationDataFinish[1])}").Style.SetAllBorders(); .SetFormulaA1($"{FormulaBhaBlock(AddressDurationDataStart[1], AddressDurationDataFinish[1])}").Style.SetAllBorders();
sheet._Range(AddressOperationData[2], AddressOperationData[2] + (0, 4)) sheet._Range(AddressOperationData[2], AddressOperationData[2] + (0, 4))

2
AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/DimensionlessBlock.cs
View File

@ -87,7 +87,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks
sheet._Range(AddressPreparationHead[2], AddressPreparationHead[2] + (0, 1)) sheet._Range(AddressPreparationHead[2], AddressPreparationHead[2] + (0, 1))
._SetValue("Проработка при бур, факт (ч):"); ._SetValue("Проработка при бур, факт (ч):");
sheet.Cell(AddressPreparationValue[2]) sheet.Cell(AddressPreparationValue[2])
._SetValue($"{blockDto.StandardTimeExtension}"); ._SetValue($"{blockDto.ActualTimeBarrelPreparation}");
sheet._Range(AddressPreparationHead[3], AddressPreparationHead[3] + (0, 1)) sheet._Range(AddressPreparationHead[3], AddressPreparationHead[3] + (0, 1))
._SetValue("Превышение плановых норм, (ч):"); ._SetValue("Превышение плановых норм, (ч):");
sheet.Cell(AddressPreparationValue[3]) sheet.Cell(AddressPreparationValue[3])

1
AsbCloudWebApi.Tests/ServicesTests/TrajectoryVisualizationServiceTest.cs
View File

@ -1,6 +1,7 @@
using AsbCloudApp.Data; using AsbCloudApp.Data;
using AsbCloudApp.Repositories; using AsbCloudApp.Repositories;
using AsbCloudInfrastructure.Services; using AsbCloudInfrastructure.Services;
using AsbCloudInfrastructure.Services.Trajectory;
using Moq; using Moq;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;