Commit Graph

602 Commits

Author SHA1 Message Date
6f08629966 Настройка в AddSwaggerGen cтрокового формата данных для DateOnly 2023-03-30 16:39:51 +05:00
921b5f75c0 Правки по ревью 2023-03-29 10:26:10 +05:00
ee8f000ab1 Merge branch 'dev' into feature/refactoring-daily-report-form 2023-03-27 17:15:31 +05:00
d09dabd9ce Merge branch 'feature/refactoring-daily-report-form' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into feature/refactoring-daily-report-form 2023-03-27 17:14:44 +05:00
6815dc4437 Актуализирован блок "Баланс времени" в выгружаемом отчете. 2023-03-27 17:14:36 +05:00
ngfrolov
464678a3db
nit deleting an outdated tasks 2023-03-27 09:40:51 +05:00
ngfrolov
c06712f2f9
Merge branch 'dev' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into dev 2023-03-24 12:35:13 +05:00
ngfrolov
b64c90b3e3
Add DateValidationAttribute 2023-03-24 12:34:57 +05:00
01bbe2debe Merge branch 'dev' into feature/refactoring-daily-report-form 2023-03-24 10:28:19 +05:00
56be9b2358 Merge branch 'feature/refactoring-daily-report-form' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into feature/refactoring-daily-report-form 2023-03-24 19:27:50 +14:00
510595239c Правки по ревью 2023-03-24 19:27:30 +14:00
dc8aa67344 Merge pull request 'Фикс: проверка ключа скважины в методе контроллера, а не в свойстве класса (т.к. на этом падал фронтенд)' (#38) from fix/filling-fact-operations-editor-fixes into dev
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/38
Reviewed-by: Никита Фролов <ng.frolov@digitaldrilling.ru>
2023-03-23 17:14:15 +05:00
7b8506e44d Фикс: проверка ключа скважины в методе контроллера, а не в свойсте класса (т.к. на этом падал фронтенд) 2023-03-23 11:11:54 +05:00
ngfrolov
df6c423341
Merge branch 'dev' into feature/refactoring-daily-report-form 2023-03-23 11:07:10 +05:00
baee2ae139 Добавление даты и ключа пользователя, внесшего изменения в блоки суточного рапорта 2023-03-22 11:29:53 +05:00
ngfrolov
14d8221917
Add usage to ProcessMap 2023-03-21 17:51:34 +05:00
8a9a565365 Merge branch 'dev' into feature/refactoring-daily-report-form 2023-03-21 15:58:23 +05:00
56477e5a9b Merge branch 'feature/refactoring-daily-report-form' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into feature/refactoring-daily-report-form 2023-03-21 15:55:15 +05:00
f1e0aaf3ae Добавление даты и ключа пользователя, внесшего изменения в блок суточного рапорта 2023-03-21 15:55:03 +05:00
99687c495f rep and dto 2023-03-21 12:41:43 +05:00
ngfrolov
a1c73effc3
TelemetryDataSaubDto doc. Add units to description 2023-03-20 15:06:53 +05:00
ngfrolov
6ddef54514
Merge branch 'dev' into feature/refactoring-daily-report-form 2023-03-10 16:48:18 +05:00
7de6d036b7 мелкие правки 2023-03-10 13:40:05 +05:00
a97fd12b74 Merge branch 'dev' into feature/refactoring-daily-report-form 2023-03-10 11:24:33 +05:00
0750b0fc9a удален лишний мусор 2023-03-10 10:34:03 +05:00
f8c26f1835 фикс фильтрации фактических операций 2023-03-10 10:25:10 +05:00
fe25c1e962 edit message dto 2023-03-10 05:53:48 +05:00
65d846dba4 dev changes 2023-03-10 05:48:43 +05:00
a9ee51e090 merge dev 2023-03-10 05:47:40 +05:00
0540df26c4 edit validate user registration 2023-03-10 05:42:54 +05:00
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
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
612fa19b10 add attrib's -ProcessMap,permissions
and remove validators
2023-03-07 00:36:09 +05:00
d6d14ca2f2 change dtos (auth,event,company,measure,message,userRole,well,welloperation)
and delete validators
2023-03-07 00:04:20 +05:00
52a6b92824 Merge branch 'dev' into feature/refactoring-daily-report-form 2023-03-06 16:33:58 +05:00
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
24764f2fd4
Merge branch 'dev' into feature/filling-fact-operations-in-daily-report 2023-02-28 09:23:05 +05:00
ngfrolov
6d5232231d
fix nullable ScheduleRepository 2023-02-27 12:30:44 +05:00
feb2623200 IDailyReportService, WellInfoService, WellInfoService 2023-02-27 12:12:55 +05:00
73f2fe0826 PlanFactBase, ArgumentInvalidException 2023-02-27 10:33:59 +05:00
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
dea93ac9c0 DetectedOperationRequest, FileRequest, LimitingParameterRequest, MessageRequestBase, ProcessMapRequest, RequestBase, SubsystemOperationTimeRequest, WellOperationRequest, WellRequest 2023-02-27 10:11:50 +05:00
9549b62d3e IDepositRepository, IFileRepository, IFileStorageRepository, ILimitingParameterRepository, IProcessMapRepository, ITelemetryWirelineRunOutRepository, IUserRoleRepository, IWellCompositeRepository, IWellFinalDocumentsRepository, IWellOperationRepository 2023-02-27 10:06:54 +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