on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity
1,453 Commits 1 Branch 0 Tags 37 MiB
b6181ab82f
Commit Graph

1453 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Olga Nemt
b6181ab82f 1. Сохранение суточного рапорта по частям. 
2. Обновление типа данных поля "Дата отчета" в таблице "Суточный рапорт" (timestamp with time zone изменен на date)
 2023-03-06 16:30:36 +05:00
ngfrolov
24764f2fd4
Merge branch 'dev' into feature/filling-fact-operations-in-daily-report 2023-02-28 09:23:05 +05:00
ngfrolov
9bdea8f410
Merge branch 'feature/nullable' into dev 2023-02-27 13:42:14 +05:00
ngfrolov
6d5232231d
fix nullable ScheduleRepository 2023-02-27 12:30:44 +05:00
ai.astrakhantsev
feb2623200 IDailyReportService, WellInfoService, WellInfoService 2023-02-27 12:12:55 +05:00
ai.astrakhantsev
15fdfa11ed ArgumentInvalidException 2023-02-27 11:29:06 +05:00
ai.astrakhantsev
73f2fe0826 PlanFactBase, ArgumentInvalidException 2023-02-27 10:33:59 +05:00
ai.astrakhantsev
57fc19396e ISubsystemOperationTimeService, ISubsystemService, FileService, IAuthService, ICrudRepository, IDetectedOperationService, ILimitingParameterService, IMessageService, IPlannedTrajectoryImportService, IProcessMapService, IReduceSamplingService, IReportService, IRepositoryWellRelated, IRequerstTrackerService, ISetpointsService, ITelemetryDataSaubService, ITelemetryDataService, ITelemetryService, ITelemetryUserService, ITrajectoryVisualizationService, IWellFinalDocumentsService, IWellService 2023-02-27 10:21:17 +05:00
ai.astrakhantsev
dea93ac9c0 DetectedOperationRequest, FileRequest, LimitingParameterRequest, MessageRequestBase, ProcessMapRequest, RequestBase, SubsystemOperationTimeRequest, WellOperationRequest, WellRequest 2023-02-27 10:11:50 +05:00
ai.astrakhantsev
9549b62d3e IDepositRepository, IFileRepository, IFileStorageRepository, ILimitingParameterRepository, IProcessMapRepository, ITelemetryWirelineRunOutRepository, IUserRoleRepository, IWellCompositeRepository, IWellFinalDocumentsRepository, IWellOperationRepository 2023-02-27 10:06:54 +05:00
ai.astrakhantsev
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
ai.astrakhantsev
aceefe637a #9156004 2023-02-24 14:41:24 +05:00
ai.astrakhantsev
9410c55b8d #9156004 CompanyDto, ReportProgressDto, ScheduleDto, StatClusterDto, StatSectionDto, StatWellDto, TelemetryBaseDto 2023-02-24 14:37:57 +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
ngfrolov
cd130264c4
remove wrong test 2023-02-22 15:06:18 +05:00
ai.astrakhantsev
ad5ac00079 #9156004 MapPointBaseDto, HeadDto, MeasureDto, MessageDto, MinMaxDto, MinMaxExtendedViewDto, PermissionDto, PlanFactPredictBase, PlannedTrajectoryDto 2023-02-22 15:03:15 +05:00
ngfrolov
2b84cd5b8f
Tests Add extension method to replace services in webhost 2023-02-22 15:00:43 +05:00
ngfrolov
496f8d18fb
Fix plan trajectory template file path. 
Remove permissions from plan trajectory.
 2023-02-22 12:53:13 +05:00
ngfrolov
c94a2f2904
fix tests 2023-02-22 12:37:43 +05:00
ngfrolov
c73b6438e3
Merge branch 'dev' into feature/filling-fact-operations-in-daily-report 2023-02-22 12:26:57 +05:00
ai.astrakhantsev
e39a701738 #9156004 DrillParamsDto, FileCategoryDto, FileInfoDto, FileMarkDto, IId, IMapPoint, IWellRelated, JobState, LimitingParameterDataDto, LimitingParameterDto 2023-02-22 11:35:35 +05:00
ngfrolov
9de4b31f2d
nit WellOperationRepository renames 2023-02-22 11:25:51 +05:00
ai.astrakhantsev
4634d8d4c6 #9156004 Record7Dto, AuthDto, ClusterDto, CompanyDto, CompanyTypeDto, DrillerDto, DrillingProgramPartDto, DrillingProgramStateDto 2023-02-22 10:10:46 +05:00
ai.astrakhantsev
dd3a2f4ff6 #9156004 SubsystemActiveWellStatDto, SubsystemDto, SubsystemOperationTimeDto, SubsystemStatDto 2023-02-22 09:56:01 +05:00
ai.astrakhantsev
a067c47863 #9156004 TelemetryDataSaubStatDto, TelemetryDataSpinDto, TelemetryInfoDto, TelemetryMessageDto, TelemetryUserDto, TelemetryWirelineRunOutBaseDto 2023-02-22 09:50:11 +05:00
ai.astrakhantsev
7cc951d102 #9156004 TelemetryDataSaubDto, SetpointsRequestDto, SetpointInfoDto, EventDto, ProcessMapReportRowDto, ProcessMapReportParamsDto, ProcessMapReportDto, ProcessMapDto 2023-02-22 09:43:32 +05:00
ngfrolov
3bd6c7d0fb
MemoryCacheExtentions delete GetOrCreateBasic* based on DbContext 2023-02-22 09:40:02 +05:00
ai.astrakhantsev
5178b59ba7 #9156004 DailyReportDto, HeadDto. DetectedOperationDto, DetectedOperationListDto, DetectedOperationStatDto 2023-02-22 09:26:22 +05:00
ai.astrakhantsev
d36139c037 #9156004 SignBlock, TimeBalanceBlock 2023-02-22 09:20:04 +05:00
ai.astrakhantsev
7b61b5ed39 #9156004 SaubDto 2023-02-22 09:13:46 +05:00
ai.astrakhantsev
1417013cbd #9156004 BhaDto, HeadDto 2023-02-22 09:11:01 +05:00
ai.astrakhantsev
e9f3175b56 #9156004 2023-02-22 09:01:54 +05:00
ai.astrakhantsev
594033b3bc #9156004 2023-02-22 09:00:47 +05:00
ngfrolov
539d04d3cf
remove EfCacheExtensions, replace by IMemoryCache 2023-02-21 18:01:03 +05:00
Olga Nemt
c7c5de563a 1. Разделение методов получения фактических и плановых операций (GetPageOperationsPlanAsync и GetPageOperationsFactAsync) 
2. Фикс получения категории операции в BuildQuery
 2023-02-21 17:16:45 +05:00
Olga Nemt
c15c0e5522 1. Правки после ревью 
2. nullable enable в WellOperationPlanDto
 2023-02-21 16:15:36 +05:00
Olga Nemt
4f6cbd014e убраны лишние юзинги, поправлен комментарий к WellOperationPlanDto 2023-02-21 13:33:50 +05:00
Olga Nemt
33acfe6b8f Revert "1. Изменен запрос для формирования списка плановых операция для сопоставления" 
This reverts commit 2aab16886c.
 2023-02-21 13:24:22 +05:00
Olga Nemt
2aab16886c 1. Изменен запрос для формирования списка плановых операция для сопоставления 
2. Добавлена модель WellOperationPlanDto для хранения списка плановых операций и даты последней сопоставленной плановой операции
3. WellSectionTypeName и CategoryName в WellOperationDto могут быть nullable
 2023-02-21 13:23:06 +05:00
Olga Nemt
aef99cbf11 1. Изменен запрос для формирования списка плановых операция для сопоставления 
2. Добавлена модель WellOperationPlanDto для хранения списка плановых операций и даты последней сопоставленной плановой операции
3. WellSectionTypeName и CategoryName в WellOperationDto могут быть nullable
 2023-02-21 13:22:24 +05:00
Olga Nemt
0083048821 Merge branch 'dev' into feature/filling-fact-operations-in-daily-report 2023-02-21 13:18:43 +05:00
Никита Фролов
f62b23fc47 Merge pull request '#5822403 Ошибка в полях, при добавлении значений в таблицу' (#28) from bug/5822403 into dev 
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/28
 2023-02-21 10:55:04 +05:00
ai.astrakhantsev
5fd971a620 #5822403 Ошибка в полях, при добавлении значений в таблицу 2023-02-21 10:19:07 +05:00
Никита Фролов
b1fe1c8571 Merge pull request '#8636739 Визуализация траектории 3D' (#26) from feature/8636739 into dev 
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/26
 2023-02-20 15:58:48 +05:00
ngfrolov
ada2b36310
Refactor trajectory 2023-02-20 15:57:08 +05:00
ngfrolov
ff6c5d7751
Merge branch 'feature/8636739' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into feature/8636739 2023-02-20 15:29:06 +05:00
ngfrolov
01e94fc489
Merge branch 'dev' into feature/8636739 2023-02-20 15:28:54 +05:00
ngfrolov
0c26c57d97
Enable nullable on DailyReport 2023-02-20 15:28:35 +05:00
Olga Nemt
5a101b163a Merge branch 'dev' into feature/filling-fact-operations-in-daily-report 2023-02-20 15:25:33 +05:00