Commit Graph

322 Commits

Author SHA1 Message Date
ngfrolov
24764f2fd4
Merge branch 'dev' into feature/filling-fact-operations-in-daily-report 2023-02-28 09:23:05 +05:00
73f2fe0826 PlanFactBase, ArgumentInvalidException 2023-02-27 10:33:59 +05:00
f0ba243afe RecordBaseDto, MinMaxExtendedViewDto, MinMaxDto, PlanFactDto, TrajectoryVisualizationDto, UserDto, UserExtendedDto, UserRegistrationDto, UserRoleDto, UserTokenDto, WellCaseDto, WellDto, WellFinalDocumentDBDto, WellFinalDocumentDto, WellFinalDocumentInputDto, WellFinalDocumentsHistoryDto, WellGroupOpertionDto, WellInfoDto, WellMapInfoDto, WellOperationCategoryDto, WellOperationDto 2023-02-27 10:02:51 +05:00
ngfrolov
1e86c24258
Fix comparators implementation and revise some dtos 2023-02-22 17:10:29 +05:00
ngfrolov
bc35e18703
fix nullable 2023-02-22 15:31:16 +05:00
ad5ac00079 #9156004 MapPointBaseDto, HeadDto, MeasureDto, MessageDto, MinMaxDto, MinMaxExtendedViewDto, PermissionDto, PlanFactPredictBase, PlannedTrajectoryDto 2023-02-22 15:03:15 +05:00
e39a701738 #9156004 DrillParamsDto, FileCategoryDto, FileInfoDto, FileMarkDto, IId, IMapPoint, IWellRelated, JobState, LimitingParameterDataDto, LimitingParameterDto 2023-02-22 11:35:35 +05:00
4634d8d4c6 #9156004 Record7Dto, AuthDto, ClusterDto, CompanyDto, CompanyTypeDto, DrillerDto, DrillingProgramPartDto, DrillingProgramStateDto 2023-02-22 10:10:46 +05:00
dd3a2f4ff6 #9156004 SubsystemActiveWellStatDto, SubsystemDto, SubsystemOperationTimeDto, SubsystemStatDto 2023-02-22 09:56:01 +05:00
a067c47863 #9156004 TelemetryDataSaubStatDto, TelemetryDataSpinDto, TelemetryInfoDto, TelemetryMessageDto, TelemetryUserDto, TelemetryWirelineRunOutBaseDto 2023-02-22 09:50:11 +05:00
7cc951d102 #9156004 TelemetryDataSaubDto, SetpointsRequestDto, SetpointInfoDto, EventDto, ProcessMapReportRowDto, ProcessMapReportParamsDto, ProcessMapReportDto, ProcessMapDto 2023-02-22 09:43:32 +05:00
5178b59ba7 #9156004 DailyReportDto, HeadDto. DetectedOperationDto, DetectedOperationListDto, DetectedOperationStatDto 2023-02-22 09:26:22 +05:00
d36139c037 #9156004 SignBlock, TimeBalanceBlock 2023-02-22 09:20:04 +05:00
7b61b5ed39 #9156004 SaubDto 2023-02-22 09:13:46 +05:00
1417013cbd #9156004 BhaDto, HeadDto 2023-02-22 09:11:01 +05:00
c15c0e5522 1. Правки после ревью
2. nullable enable в WellOperationPlanDto
2023-02-21 16:15:36 +05:00
4f6cbd014e убраны лишние юзинги, поправлен комментарий к WellOperationPlanDto 2023-02-21 13:33:50 +05:00
aef99cbf11 1. Изменен запрос для формирования списка плановых операция для сопоставления
2. Добавлена модель WellOperationPlanDto для хранения списка плановых операций и даты последней сопоставленной плановой операции
3. WellSectionTypeName и CategoryName в WellOperationDto могут быть nullable
2023-02-21 13:22:24 +05:00
ngfrolov
ada2b36310
Refactor trajectory 2023-02-20 15:57:08 +05:00
ngfrolov
01e94fc489
Merge branch 'dev' into feature/8636739 2023-02-20 15:28:54 +05:00
ngfrolov
09d0d42688
Enable nullable on Telemetry* 2023-02-20 15:06:26 +05:00
ngfrolov
02a8db1a58
Enable nullable on Relation*, ReportProperty, SetpointRequest, WellFinalDocument. 2023-02-20 14:21:52 +05:00
ngfrolov
942b2bca74
Enable nullable on user, userRole 2023-02-20 12:18:45 +05:00
ngfrolov
1f8b7b7451
Enable nullable on Permission Measure LimitingParameter 2023-02-17 17:58:07 +05:00
ngfrolov
2b0e36d68c
Enable nullable on DetectedOperation DrillingProgramPart FileCategory FileInfo FileMark 2023-02-17 17:36:25 +05:00
ngfrolov
61bee21ad9
Enable nullable for ef models: Deposit, Cluster, Well, WellOperation, WellOperationCategory, Company, and corresponding dtos. 2023-02-17 15:30:17 +05:00
ngfrolov
4750fe38d6
Merge branch 'dev' into feature/8879776_well_tree_with_stat 2023-02-17 09:50:37 +05:00
ngfrolov
d41cff84a9
Add WellInfoService 2023-02-16 16:27:14 +05:00
aa3b96b31b Плановые операции в суточном рапорте.
1. Добавлен столбец IdPlan в WellOperation
2. Перписан метод MergeArrays
3. Формирование списка плановых операций для сопоставления с фактическими (GetOperationsPlan в WellOperationController)
2023-02-15 17:02:43 +05:00
5759388713 #8636739 dto 2023-02-15 10:49:55 +05:00
3f2febc022 #8636739 Визуализация траектории 3D 2023-02-13 12:39:45 +05:00
7127dfd9bb #8636739 Визуализация траектории 3D 2023-02-13 09:10:48 +05:00
d47fa1b09c #8636739 Визуализация траектории 3D 2023-02-10 11:12:16 +05:00
ngfrolov
f7afa8638e
8879776 new dtos 2023-02-07 16:20:36 +05:00
d8b131622f #7987467 fix 2023-01-24 09:59:18 +05:00
ngfrolov
49678c4973
fix TelemetryWirelineRunOut. make wellinfo optional for POST request. 2023-01-19 11:43:37 +05:00
ngfrolov
56e02ffdd8
fix WellInfoDto. Add well Id. 2023-01-18 15:05:11 +05:00
ngfrolov
f7f0f02c34
ProcessMapReport.
Добавлен ченовик всех рассчетов.
Добавлено формирования excel по dto.
2023-01-17 08:56:07 +05:00
ngfrolov
8fd3f3c290
LimitingParameterDataDto fix. DateTimeOffset -> DateTime 2023-01-16 10:29:52 +05:00
ngfrolov
9f996003eb
ProcessMapReport. Add GetTelemetryDataStatAsync(..) to TelemetryDataSaubService. 2023-01-13 16:08:38 +05:00
ngfrolov
1a7d643c50
merge dev to ProcessMapReport 2023-01-12 16:24:10 +05:00
68c227e7c6 Merge branch 'dev' into PlannedTrajectory_refact 2023-01-12 11:24:50 +05:00
ngfrolov
5948a762ba
#7963103 fixes 2023-01-11 16:00:11 +05:00
60a80745a9 #7963103 Замечания 2023-01-11 13:51:11 +05:00
5c00e996f5 Merge remote-tracking branch 'origin/dev' into PlannedTrajectory_refact 2023-01-10 15:54:11 +05:00
ngfrolov
ac1c9aedb2
ProcessMapService calculations draft 2023-01-10 12:31:01 +05:00
193b9ff9f6 #7963103 Отображение общей наработки тальканата по всем объектам 2023-01-10 10:49:27 +05:00
ngfrolov
f5becebbeb #7987467 Add telemetry statistic calc (not completed) 2022-12-30 15:30:12 +05:00
46453b3893 повторный рефакт
после ревью
2022-12-29 04:25:08 +05:00
ngfrolov
fb4bb375e1 Merge branch 'dev' into feature/ProcessMapReport 2022-12-28 15:22:50 +05:00