ngfrolov
|
39de15e1ba
|
Merge branch 'feature/detected_operations_change_algorithm' into dev
|
2023-12-05 12:10:52 +05:00 |
|
ngfrolov
|
371083bd38
|
DetectedOperationExportService fix comment
|
2023-12-05 12:10:30 +05:00 |
|
|
8ec901736b
|
Merge pull request '#23919905 - Баг с выгрузкой рапорта в "Диаграммах"' (#164) from fix/#23919905-daily-diagram-create-report-from-signalr into dev
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/164
Reviewed-by: Никита Фролов <ng.frolov@digitaldrilling.ru>
|
2023-12-05 12:05:28 +05:00 |
|
|
fe1c84467d
|
Merge branch 'dev' into fix/#23919905-daily-diagram-create-report-from-signalr
|
2023-12-05 12:05:17 +05:00 |
|
ngfrolov
|
2ceac00a4f
|
fix2 migration DetectedOperation_add_subsystems_and_extraData
|
2023-12-05 11:37:52 +05:00 |
|
ngfrolov
|
e550ac9d13
|
fix migration DetectedOperation_add_subsystems_and_extraData
|
2023-12-05 11:35:11 +05:00 |
|
ngfrolov
|
4631772bc3
|
Merge branch 'dev' into feature/detected_operations_change_algorithm
|
2023-12-05 11:33:31 +05:00 |
|
ngfrolov
|
356b12d9a1
|
fix Daily report migration
|
2023-12-05 11:31:02 +05:00 |
|
ngfrolov
|
29c5de89a5
|
DetectedOperation add migration
|
2023-12-05 11:12:20 +05:00 |
|
ngfrolov
|
94764d8669
|
Merge branch 'dev' into feature/detected_operations_change_algorithm
|
2023-12-05 11:11:20 +05:00 |
|
ngfrolov
|
6b1352e022
|
Add dailyReport LOST migration
|
2023-12-05 11:10:29 +05:00 |
|
ngfrolov
|
fdc615d343
|
DetectorAbstract добавлено определение включенных подсистем во время выполнения операции.
|
2023-12-05 10:56:49 +05:00 |
|
ngfrolov
|
948002955d
|
DetectorDrilling. Extract RefineEdges method from GetIdOperation.
Move detectedOperation helper data to ExtraData property
|
2023-12-04 17:36:00 +05:00 |
|
ngfrolov
|
fd8b0de5a0
|
Replace GetIdOperation delegate by method.
Add Mode to DetectableTelemetry
|
2023-12-04 11:11:25 +05:00 |
|
|
678b409ca6
|
Merge branch 'fix/#23919905-daily-diagram-create-report-from-signalr' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into fix/#23919905-daily-diagram-create-report-from-signalr
|
2023-12-04 09:43:28 +05:00 |
|
|
c426dbdd52
|
Убран ConfigureAwait(false)
|
2023-12-04 09:43:19 +05:00 |
|
|
4a13c1f4bd
|
Merge branch 'dev' into fix/#23919905-daily-diagram-create-report-from-signalr
|
2023-12-04 09:40:18 +05:00 |
|
|
82e7ff8cb4
|
Метод CreateReport внутри ReportsHub для скачивания отчета и одновременной подписки
|
2023-12-04 09:38:42 +05:00 |
|
|
4500d2e6de
|
Merge branch 'dev' into feature/detected_operations_change_algorithm
|
2023-12-04 09:03:28 +05:00 |
|
ngfrolov
|
e8bbff2d3c
|
fix doc
|
2023-12-01 17:41:39 +05:00 |
|
ngfrolov
|
7436cfd11a
|
MockController Add method testing sirnalR
|
2023-12-01 16:26:18 +05:00 |
|
|
6ef0d62cb9
|
Merge pull request '#19189208 Импорт операций по скважине' (#158) from feature/import_well_operations into dev
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/158
Reviewed-by: Никита Фролов <ng.frolov@digitaldrilling.ru>
|
2023-12-01 11:26:43 +05:00 |
|
ngfrolov
|
05181998b7
|
fix test
|
2023-12-01 11:25:52 +05:00 |
|
ngfrolov
|
149a036e85
|
merge from dev
|
2023-12-01 09:16:22 +05:00 |
|
|
c28ea98569
|
Merge pull request 'Импорт фактических траекторий' (#160) from feature/#13123485--import-fact-trajectories into dev
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/160
Reviewed-by: Никита Фролов <ng.frolov@digitaldrilling.ru>
|
2023-12-01 09:13:36 +05:00 |
|
|
6046b61ba1
|
Правки после ревью - 4
|
2023-11-30 15:20:22 +05:00 |
|
|
1acc94fad8
|
Правка по ревью-3
|
2023-11-30 15:08:58 +05:00 |
|
|
8fd9961da7
|
Правка по результатам ревью-3
|
2023-11-30 11:11:45 +05:00 |
|
|
5ed11d8b47
|
Локация файлов с тестами изменена
|
2023-11-30 10:27:38 +05:00 |
|
|
58a19f5b52
|
Merge branch 'feature/#13123485--import-fact-trajectories' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into feature/#13123485--import-fact-trajectories
|
2023-11-30 09:41:11 +05:00 |
|
|
6387aeeb17
|
Правки после ревью-2
|
2023-11-30 09:40:51 +05:00 |
|
|
a64cbeee03
|
Merge branch 'dev' into feature/#13123485--import-fact-trajectories
|
2023-11-29 12:07:27 +05:00 |
|
|
29171a6e47
|
Мердж с дев-веткой и правки по результатам этого мерджа
|
2023-11-29 12:06:57 +05:00 |
|
ngfrolov
|
15d329999b
|
fix BackgroundWorker single thread
|
2023-11-29 09:02:26 +05:00 |
|
ngfrolov
|
409e1be983
|
Split WorkSubsystemOperationTimeCalc to 2 background work for AKB and Oscillation
|
2023-11-28 17:32:14 +05:00 |
|
ngfrolov
|
75e7093af8
|
remove ISubsystemService (not used)
|
2023-11-28 16:57:01 +05:00 |
|
ngfrolov
|
dd99497e75
|
Fix PeriodicBackgroundWorker
|
2023-11-28 16:31:31 +05:00 |
|
|
d65d78e05d
|
Merge branch 'feature/#13123485--import-fact-trajectories' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into feature/#13123485--import-fact-trajectories
|
2023-11-28 15:54:56 +05:00 |
|
|
e6329b76da
|
правки после ревью
|
2023-11-28 15:54:47 +05:00 |
|
|
399dab884f
|
Merge pull request '#13686550 Рефакторинг тестов' (#162) from feature/tests into dev
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/162
|
2023-11-28 14:08:44 +05:00 |
|
ngfrolov
|
32f52e4ce7
|
Fix WorkTest
Add doc
Add todo
|
2023-11-28 14:08:13 +05:00 |
|
Степанов Дмитрий
|
a435dce308
|
Правки
1. Дополнения шаблона для отладки
1.2 Добавлен комментарии
2. Вернул определение операции удержание в клиньях
|
2023-11-28 11:23:30 +05:00 |
|
Степанов Дмитрий
|
2025c8c876
|
Merge branch 'dev' into feature/tests
|
2023-11-27 18:06:06 +05:00 |
|
Степанов Дмитрий
|
9f20113fd8
|
Удалил лишние зависимости
|
2023-11-27 17:50:31 +05:00 |
|
Степанов Дмитрий
|
7ded332478
|
Рефакторинг unit тестов доменных сервисов
|
2023-11-27 17:50:08 +05:00 |
|
Степанов Дмитрий
|
a2fd900cf1
|
Тесты фоновых задач
|
2023-11-27 17:47:27 +05:00 |
|
Степанов Дмитрий
|
4767335900
|
Справки по страницам
1. Поправил тесты
2. Поправил сервис, репозиторий и контроллер. Сделал небольшой рефакторинг
|
2023-11-27 17:44:55 +05:00 |
|
|
be2e654429
|
Merge pull request '#21747185 Суточный отчёт' (#150) from feature/daily_report into dev
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/150
Reviewed-by: Никита Фролов <ng.frolov@digitaldrilling.ru>
|
2023-11-27 12:02:17 +05:00 |
|
Степанов Дмитрий
|
1088092d2f
|
Merge branch 'dev' into feature/daily_report
# Conflicts:
# AsbCloudInfrastructure/DependencyInjection.cs
|
2023-11-27 11:23:40 +05:00 |
|
Степанов Дмитрий
|
71c9be6a73
|
Добавлено заполнение блока с фактическими операциями при формировании фиктивного списка суточных отчётов
|
2023-11-27 11:20:10 +05:00 |
|