684 Commits

Author	SHA1	Message	Date
ngfrolov	6c694ff7bc	enable nullable TimezoneService	2023-04-18 16:16:11 +05:00
ngfrolov	9c31c803de	Fix migration. ... Fix GtrWitsRepository.	2023-04-18 16:07:29 +05:00
ngfrolov	1bdb88492e	Merge branch 'dev' into gtr	2023-04-18 10:17:52 +05:00
eugeniy_ivanov	4df94466f0	fix gtr	2023-04-17 18:02:51 +05:00
ngfrolov	1289d782cf	Merge branch 'dev' into featute/null-enabled	2023-04-17 15:51:22 +05:00
ai.astrakhantsev	63a7ba2034	using	2023-04-14 12:34:47 +05:00
ai.astrakhantsev	7d0a214521	fix	2023-04-14 12:32:55 +05:00
ai.astrakhantsev	8b271da299	Получение телеметрии расхода БН	2023-04-14 11:47:49 +05:00
Olga Nemt	2431557539	#nullable enable (part 2)	2023-04-13 15:34:16 +05:00
ea.ivanov	f14b0064ed	Merge branch 'dev' into gtr	2023-04-12 00:43:04 +05:00
eugeniy_ivanov	7c827f4fae	rework get method in rep	2023-04-11 00:32:06 +05:00
eugeniy_ivanov	2e58dea88a	work migration (timescale)	2023-04-07 17:58:46 +05:00
ngfrolov	312d653aec	fix #9844930; ... Enable nullable for OperationsStatService.	2023-04-07 16:49:28 +05:00
eugeniy_ivanov	8e663e7bef	edit generic	2023-04-07 05:32:03 +05:00
eugeniy_ivanov	e26c5d98a7	delete manual timescale script (error index) ... edit generic repository	2023-04-07 04:51:30 +05:00
ngfrolov	577b699663	Add ProcessMapReportDto.UsagePlan; ... Fix % (mult 100);	2023-04-06 17:27:31 +05:00
ngfrolov	5e8df2e29f	Fix calculations	2023-04-06 17:16:53 +05:00
ngfrolov	40a3d3ab50	Debugged	2023-04-06 10:25:51 +05:00
eugeniy_ivanov	9a0617adce	add gtrRepository.SaveData	2023-04-06 04:02:47 +05:00
ngfrolov	1f904a7434	ProcessMapReportService implement all calculations (not tested)	2023-04-05 13:36:56 +05:00
ngfrolov	0457f8dd98	Merge branch 'dev' into feature/rtc-calc	2023-04-05 10:56:29 +05:00
eugeniy_ivanov	3ced1a0e20	new migration ... refact entity model wits rep and interface	2023-04-04 21:21:06 +05:00
on.nemtina	f1dc52c768	Merge branch 'dev' into feature/set-user-editor-to-operation	2023-04-04 12:54:42 +05:00
Olga Nemt	be0d171973	Запись пользователя, изменившего / создавшего опреацию в БД + запись даты изменения / создания	2023-04-04 12:52:11 +05:00
ngfrolov	9b794311c4	Rename processMaps to processMapPlan, processMapReport, processMapReportMaker.	2023-04-03 14:59:59 +05:00
ngfrolov	225d6ef827	Незначительные переименования	2023-03-31 16:57:20 +05:00
Olga Nemt	e142e1eff5	Запись для формирования отчета РТК - плоский список: ... 1. Убраны навигационные свойства Rotor и Slide (и соответствующая DTO) 2. Закомментирован код формирования отчета РТК	2023-03-31 15:20:27 +05:00
ngfrolov	2e1678f401	Добавлено WitsRecordDto	2023-03-31 11:26:42 +05:00
ngfrolov	7d83a0a93d	Merge branch 'dev' into gtr	2023-03-31 11:13:35 +05:00
Olga Nemt	6f08629966	Настройка в AddSwaggerGen cтрокового формата данных для DateOnly	2023-03-30 16:39:51 +05:00
Olga Nemt	921b5f75c0	Правки по ревью	2023-03-29 10:26:10 +05:00
eugeniy_ivanov	39cdc2ac0c	wits dtos	2023-03-29 01:17:26 +05:00
eugeniy_ivanov	118df71ccf	review dto	2023-03-28 03:41:30 +05:00
eugeniy_ivanov	ae10754368	add dtos	2023-03-28 03:39:41 +05:00
on.nemtina	ee8f000ab1	Merge branch 'dev' into feature/refactoring-daily-report-form	2023-03-27 17:15:31 +05:00
Olga Nemt	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
Olga Nemt	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
on.nemtina	01bbe2debe	Merge branch 'dev' into feature/refactoring-daily-report-form	2023-03-24 10:28:19 +05:00
Olga Nemt	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
Olga Nemt	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
Olga Nemt	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
Olga Nemt	baee2ae139	Добавление даты и ключа пользователя, внесшего изменения в блоки суточного рапорта	2023-03-22 11:29:53 +05:00
ngfrolov	14d8221917	Add usage to ProcessMap	2023-03-21 17:51:34 +05:00
Olga Nemt	8a9a565365	Merge branch 'dev' into feature/refactoring-daily-report-form	2023-03-21 15:58:23 +05:00
Olga Nemt	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
Olga Nemt	f1e0aaf3ae	Добавление даты и ключа пользователя, внесшего изменения в блок суточного рапорта	2023-03-21 15:55:03 +05:00
eugeniy_ivanov	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
eugeniy_ivanov	7de6d036b7	мелкие правки	2023-03-10 13:40:05 +05:00
Olga Nemt	a97fd12b74	Merge branch 'dev' into feature/refactoring-daily-report-form	2023-03-10 11:24:33 +05:00
eugeniy_ivanov	0750b0fc9a	удален лишний мусор	2023-03-10 10:34:03 +05:00
Olga Nemt	f8c26f1835	фикс фильтрации фактических операций	2023-03-10 10:25:10 +05:00
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
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	d6d14ca2f2	change dtos (auth,event,company,measure,message,userRole,well,welloperation) ... and delete validators	2023-03-07 00:04:20 +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	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
ai.astrakhantsev	feb2623200	IDailyReportService, WellInfoService, WellInfoService	2023-02-27 12:12:55 +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
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
ai.astrakhantsev	ad5ac00079	#9156004 MapPointBaseDto, HeadDto, MeasureDto, MessageDto, MinMaxDto, MinMaxExtendedViewDto, PermissionDto, PlanFactPredictBase, PlannedTrajectoryDto	2023-02-22 15:03:15 +05:00
ai.astrakhantsev	e39a701738	#9156004 DrillParamsDto, FileCategoryDto, FileInfoDto, FileMarkDto, IId, IMapPoint, IWellRelated, JobState, LimitingParameterDataDto, LimitingParameterDto	2023-02-22 11:35:35 +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
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
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	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
ngfrolov	ada2b36310	Refactor trajectory	2023-02-20 15:57:08 +05:00