Commit Graph

544 Commits

Author SHA1 Message Date
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
e9f3175b56 #9156004 2023-02-22 09:01:54 +05:00
594033b3bc #9156004 2023-02-22 09:00:47 +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
3f04d73df6
IWellService remove useless using 2023-02-17 09:39:32 +05:00
ngfrolov
d41cff84a9
Add WellInfoService 2023-02-16 16:27:14 +05:00
c7a6e38315 1. Возвращаемый тип списка плановых операций - IEnumerable<WellOperationDto>
2. Добавлен CancellationToken token
3. Рефактор запроса на получение списка плановых операций
4. Проверка на доступность скважины пользователю
5. Сортировка данных по дате в методе MergeArrays
2023-02-16 09:51:55 +05:00
ngfrolov
7779116c8a
WellOperationRepository.GetCategories(..) add arg, to filter categories/ 2023-02-15 18:02:36 +05:00
ngfrolov
eb18d73dd0
Fix CrudWellRelated*Repository.. Get* method returns nonNullable values. 2023-02-15 18:00:48 +05:00
ngfrolov
fda5385e46
IWellService refactor.
- Add #nullable,
- Add WellRequest,
- Remove obsolete method
2023-02-15 17:57:32 +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
ngfrolov
759d6125b5
Merge branch 'dev' into feature/8103063 2023-02-03 15:59:50 +05:00
2ba6a57975 Рефакторинг + уьраны лишние using 2023-02-03 11:15:14 +05:00
71bb74137b Merge branch 'dev' into fix/add-sort-to-paginated-elements 2023-02-03 09:57:05 +05:00
d9684f6985 добавление необходимых полей в конструктор MessageRequest 2023-02-03 09:38:56 +05:00
479cf72f0c Документирующие комментарии в MessageRequestBase 2023-02-03 09:09:55 +05:00
0b7f53997a Документирующие комментарии в MessageRequestBase 2023-02-03 09:08:25 +05:00
ngfrolov
5956f8238f
#8103063 nit prettify 2023-02-02 14:30:27 +05:00
5644c06fac #8103063 Замечания 2023-02-02 12:04:50 +05:00
a4ff666b97 Добавлена сортировка сообщений в MessageController 2023-02-02 11:08:25 +05:00
20b99011d1 Merge branch 'feature/8103063' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into feature/8103063 2023-02-02 11:05:02 +05:00
1f80e38c10 #8103063 BuildQuery 2023-02-02 11:04:53 +05:00
ngfrolov
e4b790abbd
Merge branch 'dev' into feature/8103063 2023-02-02 11:04:44 +05:00
e2948782fa #8103063 BuildQuery 2023-02-02 10:32:53 +05:00
5d3b954171 Merge branch 'feature/WellFinalDocumentsRepository' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into feature/WellFinalDocumentsRepository 2023-01-31 10:13:40 +05:00
e58c292d30 #7065595 fix 2023-01-31 10:13:32 +05:00
ngfrolov
e4becb18ff
Merge branch 'feature/WellFinalDocumentsRepository' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into feature/WellFinalDocumentsRepository 2023-01-30 17:27:11 +05:00
ngfrolov
a367dea6a8
Merge branch 'dev' into feature/WellFinalDocumentsRepository 2023-01-30 17:26:58 +05:00
236c32b16c #7065595 fix 2023-01-30 14:32:16 +05:00