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

Merge branch 'dev' into feature/refactoring_api_route

Browse Source
This commit is contained in:
Степанов Дмитрий Александрович 2023-07-28 15:53:11 +05:00
commit 8b137ca851
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AsbCloudInfrastructure/Services/WellOperationService/OperationsStatService.cs
View File

@ -431,6 +431,9 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
var tzOffsetHours = wellService.GetTimezone(idWell).Hours; var tzOffsetHours = wellService.GetTimezone(idWell).Hours;
var merged = MergeArraysBySections(sectionsIds, wellOperationsPlan, wellOperationsFact).ToList(); var merged = MergeArraysBySections(sectionsIds, wellOperationsPlan, wellOperationsFact).ToList();
if (merged.Count ==0)
return Enumerable.Empty<PlanFactPredictBase<WellOperationDto>>();
var tvd = new List<PlanFactPredictBase<WellOperationDto>>(merged.Count); var tvd = new List<PlanFactPredictBase<WellOperationDto>>(merged.Count);
var (Plan, Fact) = merged.FirstOrDefault(); var (Plan, Fact) = merged.FirstOrDefault();
var dateStart = Plan?.DateStart ?? Fact!.DateStart; var dateStart = Plan?.DateStart ?? Fact!.DateStart;

2
AsbCloudWebApi/Controllers/UserSettingsController.cs
View File

@ -94,7 +94,7 @@ namespace AsbCloudWebApi.Controllers
/// <returns></returns> /// <returns></returns>
[HttpDelete("/api/admin/user/{idUser}/settings")] [HttpDelete("/api/admin/user/{idUser}/settings")]
[Permission] [Permission]
public virtual async Task<ActionResult<int>> DeleteAsync(int idUser, CancellationToken token) public virtual async Task<ActionResult<int>> DeleteAllAsync(int idUser, CancellationToken token)
{ {
var result = await service.DeleteAsync(idUser, token).ConfigureAwait(false); var result = await service.DeleteAsync(idUser, token).ConfigureAwait(false);