420 Commits

Author	SHA1	Message	Date
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
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	0c26c57d97	Enable nullable on DailyReport	2023-02-20 15:28:35 +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	3510af3628	Trim migrations history	2023-02-17 12:25:46 +05:00
ngfrolov	dcc3667e6a	Add migration Add_IX_FK_PlanOperation_to_WellOperation	2023-02-17 12:13:32 +05:00
ngfrolov	4750fe38d6	Merge branch 'dev' into feature/8879776_well_tree_with_stat	2023-02-17 09:50:37 +05:00
ngfrolov	b8caa7451d	merge dev to 8879776	2023-02-17 09:33:00 +05:00
ngfrolov	d41cff84a9	Add WellInfoService	2023-02-16 16:27:14 +05:00
Olga Nemt	aa3b96b31b	Плановые операции в суточном рапорте. ... 1. Добавлен столбец IdPlan в WellOperation 2. Перписан метод MergeArrays 3. Формирование списка плановых операций для сопоставления с фактическими (GetOperationsPlan в WellOperationController)	2023-02-15 17:02:43 +05:00
eugeniy_ivanov	2cc8abd767	рефакт	2023-02-14 12:20:29 +05:00
eugeniy_ivanov	6bf992f1f6	доработка методов репозитория	2023-02-13 23:11:39 +05:00
ngfrolov	8b80fff126	Merge branch 'dev' into Task/8543610	2023-02-10 09:36:14 +05:00
eugeniy_ivanov	f7a58cfa12	refact	2023-02-09 11:38:04 +05:00
eugeniy_ivanov	d35550380c	refact update role method	2023-02-08 15:12:46 +05:00
eugeniy_ivanov	973f1afb1b	refact ef update	2023-02-06 21:33:53 +05:00
ngfrolov	7396be4d6a	fix permission default data.	2023-02-03 10:27:16 +05:00
ngfrolov	cfdadcb2d2	Merge master to dev	2023-02-03 09:17:14 +05:00
ngfrolov	e804f7de2b	Fix Add permissions for ProcessMap	2023-02-03 09:07:53 +05:00
ngfrolov	bce61f97da	Fix PlannedTrajectory permissions	2023-01-24 15:03:45 +05:00
ngfrolov	d9fcfd862e	fix permission migration	2023-01-18 13:57:21 +05:00
ngfrolov	c5131d0f07	Add new permissions	2023-01-18 10:44:40 +05:00
ngfrolov	1a7d643c50	merge dev to ProcessMapReport	2023-01-12 16:24:10 +05:00
Никита Фролов	68c227e7c6	Merge branch 'dev' into PlannedTrajectory_refact	2023-01-12 11:24:50 +05:00
ngfrolov	5948a762ba	#7963103 fixes	2023-01-11 16:00:11 +05:00
eugeniy_ivanov	0b3825a531	finally refact	2023-01-11 14:59:54 +05:00
ai.astrakhantsev	60a80745a9	#7963103 Замечания	2023-01-11 13:51:11 +05:00
ai.astrakhantsev	193b9ff9f6	#7963103 Отображение общей наработки тальканата по всем объектам	2023-01-10 10:49:27 +05:00
ngfrolov	7585aefc4e	WellOperationService to WellOperationRepository	2022-12-28 17:38:53 +05:00
ngfrolov	fb4bb375e1	Merge branch 'dev' into feature/ProcessMapReport	2022-12-28 15:22:50 +05:00
ai.astrakhantsev	bfc9376733	#7987467 +	2022-12-27 14:30:52 +05:00
eugeniy_ivanov	50d6143366	edit column migration	2022-12-26 21:50:33 +05:00
eugeniy_ivanov	e84d45693c	refact model DB and migrations	2022-12-26 19:22:29 +05:00
eugeniy_ivanov	2115a2b2c1	refact db model ... add migration	2022-12-26 15:49:44 +05:00
eugeniy_ivanov	169968da44	Скорректированная версия ... -добавлена миграция -изменены методы - добавлен CRUD	2022-12-22 18:08:58 +05:00
ngfrolov	ba0eaa8014	Merge branch 'master' into dev	2022-12-20 11:58:05 +05:00
ngfrolov	f6e79e51d7	nit Add detectedOperations diagnostic message; ... add basic telemetry validation filter before analisys; simplify Avg calc; fix dbcontext refCount;	2022-12-20 11:57:29 +05:00
ngfrolov	96d3d4c3ce	nit add useful sql script.	2022-12-16 16:09:11 +05:00
ngfrolov	d2c638f667	Merge branch 'dev' into feature/7796681	2022-12-12 11:02:59 +05:00
ngfrolov	6c204c49dc	Merge branch 'dev' of http://46.146.209.148:8080/DDrilling/AsbCloudServer into dev	2022-12-12 10:59:30 +05:00
eugeniy_ivanov	feefd490e2	Добавление секций	2022-12-10 02:58:09 +05:00
Фролов	39a2ddc3a5	Fix operations ids in services	2022-12-09 18:32:18 +05:00
Фролов	af43cb7588	WellOperationCategory ids ordering	2022-12-09 14:36:45 +05:00
Фролов	c2b003bf8a	fix db	2022-12-08 18:00:01 +05:00
ai.astrakhantsev	aaa5627680	Merge branch 'feature/7987467' of http://46.146.209.148:8080/DDrilling/AsbCloudServer into feature/7987467	2022-12-07 10:52:47 +05:00
ai.astrakhantsev	102288f9e5	#7987467 fix	2022-12-07 10:52:35 +05:00
ngfrolov	60ab971cae	Merge branch 'dev' into feature/7987467	2022-12-07 09:15:39 +05:00
ai.astrakhantsev	398a6d443e	#7987467 правки	2022-12-07 08:47:41 +05:00
ngfrolov	81d3ef3146	Merge branch 'dev' into WellOperationTree/refact_migration	2022-12-06 16:29:53 +05:00
eugeniy_ivanov	52538a734a	refact	2022-12-06 13:36:41 +05:00
ai.astrakhantsev	4f100e6bc4	#7987467 Исправления	2022-12-06 10:41:13 +05:00
ngfrolov	84dfa183d7	Decrease TelemetryDataCache size.	2022-12-05 17:48:15 +05:00
ai.astrakhantsev	9b71b14048	#7987467	2022-12-05 12:43:16 +05:00
ai.astrakhantsev	9b4f14a036	#7987467 Раздел РТК в ЕЦП	2022-12-05 12:39:25 +05:00
ngfrolov	8094c8b1b8	Decrease TelemetryDataCache size.	2022-12-05 10:53:24 +05:00
eugeniy_ivanov	685691ea6d	delete old category - migrations	2022-12-03 00:59:27 +05:00
eugeniy_ivanov	6ed0dda96d	migration ... -edit default Data -edit model -update WellOperation	2022-12-03 00:48:40 +05:00
ngfrolov	c6a1c4dae6	AsbCloudDbContext Add active reference count prop	2022-12-02 10:58:19 +05:00
ngfrolov	0d9f9296df	Merge branch '7912198_WellCase_add_notification' into dev	2022-11-25 12:45:36 +05:00
ngfrolov	8209b61bad	#7912198 Tests ok	2022-11-25 09:34:20 +05:00
ai.astrakhantsev	454566dc2e	Merge branch 'dev' into feature/7887519	2022-11-24 10:52:07 +05:00
ngfrolov	fee2b19b46	Make EF default data public	2022-11-23 17:26:21 +05:00
ai.astrakhantsev	b00b4f3781	#7887519	2022-11-23 11:19:52 +05:00
ai.astrakhantsev	49cc9c2342	Merge branch 'dev' into feature/7887519	2022-11-18 14:30:34 +05:00
ai.astrakhantsev	c5aef20dc0	#7887519 Статистика по ограничивающим параметрам backend	2022-11-18 14:29:29 +05:00
ngfrolov	c78246ca7d	fix some nit warnings	2022-11-17 17:54:25 +05:00
ngfrolov	013e643da5	fix nit report warnings	2022-11-17 16:36:02 +05:00
ai.astrakhantsev	5ea6919738	#7205798 Перенос сервиса пользователей и ролей в репозиторий	2022-10-26 15:36:49 +05:00
ngfrolov	3f5d3cf865	Fix WitsRecordRepository.SaveDataAsync(). Add some milliseconds to duplicated records.	2022-10-25 17:23:01 +05:00
ngfrolov	1f5867e4b3	Merge branch 'feature/removing_unnecessary_files' into dev	2022-10-17 14:43:10 +05:00
ngfrolov	8b68b8276a	#6385536 refactoring	2022-10-17 14:42:47 +05:00
ngfrolov	c4b818ea7f	Merge branch 'feature/spin_mater_db' into dev	2022-10-13 17:19:16 +05:00
ai.astrakhantsev	b4372dde50	#6838390 Уменьшение хранимой модели данных SPIN master	2022-10-13 14:22:20 +05:00
ngfrolov	4d42c9e5ad	poc debagged.	2022-10-10 12:39:54 +05:00
eugeniy_ivanov	174be9b35f	migration change (Subsystem)	2022-09-18 22:30:18 +05:00
eugeniy_ivanov	edb53fb4e7	Merge branch 'dev' into SubsystemsOperationTime	2022-09-18 21:12:03 +05:00
eugeniy_ivanov	43f3a12651	-changing background subsystem service logic ... -add migration, delete all subsystem table data -edit EntityFillerSubsystem (new subsystem)	2022-09-14 12:34:24 +05:00
ngfrolov	4cbe71f8ca	merge	2022-09-13 13:34:52 +05:00
ai.astrakhantsev	d42a5ee544	#5998816 Permission, Controllers	2022-09-13 10:06:56 +05:00
ai.astrakhantsev	44be18f5ed	#5998816 WellFinalDocument edit publisher	2022-09-13 09:22:49 +05:00
ai.astrakhantsev	c4d88401fd	#5998816 дело скважины, исправления	2022-09-12 08:22:46 +05:00
ngfrolov	9ca7bf75e7	Update nuget packs	2022-09-09 15:29:46 +05:00
ai.astrakhantsev	0ad4cebdb8	#5998816 исправление замечаний	2022-09-08 12:05:56 +05:00
ngfrolov	a0ec08fac5	merge dev to subsystem	2022-09-08 09:46:32 +05:00
ngfrolov	79108c754a	fixed	2022-09-07 18:01:39 +05:00
ai.astrakhantsev	896ba03589	#5998816 Дело скважины + тесты	2022-09-05 09:13:45 +05:00
eugeniy_ivanov	20f79f461f	- В SubsystemStatDto свойство UsedTimeHours double. TimeSpan. ... - В SubsystemDto свойство Subsystem переименовано в SubsystemName - миграция для заполнения Subsystem - метод bsystemOperationTimeService.GetSubsystemByIdWellAsync перенесен в SubsystemService.	2022-08-15 15:08:17 +05:00
eugeniy_ivanov	62384b5673	-Доделан фоновый сервис ... -добавлена модель для запроса в Data Spin фонового сервиса -корректировка моделей (удаление пробелов и лишних библиотек) -добавление данных по умолчанию о подсистемах (через Entity Filler) - в методе Convert в SubsystemOperationTimeService сделана корректировка дат	2022-08-15 01:17:00 +05:00
ngfrolov	0eb9410ecc	remove file share service	2022-08-11 15:14:01 +05:00
ngfrolov	1dcfd93c0b	Add new operation - TemplatingWhileDrilling	2022-08-10 15:51:41 +05:00
ngfrolov	499f7cc4e2	Edit Detectors for rotor and slide. ... Add reason of end detecting operation.	2022-08-09 18:00:22 +05:00
ngfrolov	a5a31d5d82	UserSettingsController replace value type to JsonDocument	2022-08-09 15:59:40 +05:00
ngfrolov	70e6ce766b	Rename WellOperations key param name	2022-08-09 11:09:52 +05:00