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

1679 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
eugeniy_ivanov
fe25c1e962 edit message dto 2023-03-10 05:53:48 +05:00
eugeniy_ivanov
65d846dba4 dev changes 2023-03-10 05:48:43 +05:00
eugeniy_ivanov
a9ee51e090 merge dev 2023-03-10 05:47:40 +05:00
eugeniy_ivanov
0540df26c4 edit validate user registration 2023-03-10 05:42:54 +05:00
eugeniy_ivanov
4d7ef61ab8 add error message 2023-03-10 05:09:41 +05:00
ngfrolov
db1bd49d60
Add TelemetryDataSaubController.GetZippedCsv(..) 2023-03-09 12:32:09 +05:00
Olga Nemt
2dd04d4037 мини-правка 2023-03-09 11:56:36 +05:00
Olga Nemt
29e34445be Отдельный extension-метод для дат - ExtractDateOnly 2023-03-09 11:38:43 +05:00
Olga Nemt
4545325a93 Проверка создания суточного рапорта: если он есть в базе, то нужно возвращать ошибку 2023-03-09 09:55:53 +05:00
ngfrolov
cff9fe3fe7
Merge branch 'dev' into ZippedCsvTelemetryExport 2023-03-07 15:49:00 +05:00
ngfrolov
fb128c0eb1
Add root auto-permission 2023-03-07 15:33:06 +05:00
ngfrolov
43847298d8
Replace TelemetryService.GetOrDefaultIdTelemetryByIdWell() by GetOrDefaultTelemetryByIdWell() 2023-03-07 09:47:30 +05:00
eugeniy_ivanov
612fa19b10 add attrib's -ProcessMap,permissions 
and remove validators
 2023-03-07 00:36:09 +05:00
eugeniy_ivanov
9793280b28 todo TimeDtoValidator 2023-03-07 00:16:20 +05:00
eugeniy_ivanov
d6d14ca2f2 change dtos (auth,event,company,measure,message,userRole,well,welloperation) 
and delete validators
 2023-03-07 00:04:20 +05:00
Olga Nemt
0d16d09ad7 Тип System.DateTime сокращен до DateTime в параметре метода AddAsync (в сервисе DailyReportService) 2023-03-06 16:54:47 +05:00
Olga Nemt
52373f8fde Revert "1. Сохранение суточного рапорта по частям." 
This reverts commit 5c60b3927b.
 2023-03-06 16:43:04 +05:00
Olga Nemt
5c60b3927b 1. Сохранение суточного рапорта по частям. 
2. Обновление типа данных поля "Дата отчета" в таблице "Суточный рапорт" (timestamp with time zone изменен на date)
 2023-03-06 16:41:55 +05:00
Olga Nemt
52a6b92824 Merge branch 'dev' into feature/refactoring-daily-report-form 2023-03-06 16:33:58 +05:00
Olga Nemt
b6181ab82f 1. Сохранение суточного рапорта по частям. 
2. Обновление типа данных поля "Дата отчета" в таблице "Суточный рапорт" (timestamp with time zone изменен на date)
 2023-03-06 16:30:36 +05:00
ngfrolov
1ca72d50d1
StatWellDto Add TvdLagDays and calculation. 2023-03-06 16:12:26 +05:00
ngfrolov
546ac8068e
Fix. Ошибка при добавлении скважины. 2023-03-02 14:31:17 +05:00
ngfrolov
1c21d9abae
Merge branch 'dev' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into dev 2023-03-02 09:32:50 +05:00
Никита Фролов
4626a2855e Merge pull request 'Add and rename operation category' (#32) from Task9168959 into dev 
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/32
Reviewed-by: Никита Фролов <ng.frolov@digitaldrilling.ru>
 2023-03-02 09:31:38 +05:00
ngfrolov
c76088b5e8
update web client 2023-03-02 08:56:08 +05:00
eugeniy_ivanov
21065efb22 rename column "name" (rotor and slide operation) 2023-03-01 12:08:34 +05:00
eugeniy_ivanov
927935a523 добавление новых категорий 2023-03-01 11:39:47 +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