Commit Graph

2418 Commits

Author SHA1 Message Date
Степанов Дмитрий
2aa897d3df Интеграционные тесты
1. Добавил Docker Compose
2. Добавил AppFactory
3. Добавлен базовый класс для интеграционных классов
4. Покрыл тестами контроллер AdminDeposit
2023-12-12 19:13:07 +05:00
ngfrolov
fd40a3b930
ContactDto Fix validation 2023-12-11 09:45:00 +05:00
b789951876 Merge pull request 'Фикс импорта ГГД' (#169) from fix/well_operation_import into dev
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/169
2023-12-08 16:00:40 +05:00
Степанов Дмитрий
a2da2c912f Фикс 2023-12-08 15:56:00 +05:00
9a7649d765 Merge pull request 'Фикс импорта операций по скважине' (#168) from fix/well_operation_import into dev
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/168
2023-12-08 13:30:34 +05:00
Степанов Дмитрий
f325accca1 Фикс импорта операций по скважине 2023-12-08 13:11:28 +05:00
ngfrolov
74463559b3
Merge branch 'dev' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into dev 2023-12-07 09:08:41 +05:00
ngfrolov
cea93f2541
Add Migration start message 2023-12-07 09:08:25 +05:00
1657bd36c1 Merge pull request 'Фикс шаблона суточного рапорта' (#166) from fix/daily_report_template into dev
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/166
2023-12-06 12:13:50 +05:00
db01288e62 Merge branch 'dev' into fix/daily_report_template 2023-12-06 12:12:34 +05:00
ngfrolov
d52dbf4036
Fix DetectorDrilling.IsValidOperationDetectorResult 2023-12-05 16:15:42 +05:00
ngfrolov
17c13b7a7b
spell
nit refactoring by VS recommendations
2023-12-05 14:48:56 +05:00
ngfrolov
e67e260f35
Fix WellOperationExportService remove useless asyncs 2023-12-05 14:14:20 +05:00
ngfrolov
3e6f43a4a6
Fix ReportController.GetReportsDateRangeAsync return 204 on default values 2023-12-05 14:07:56 +05:00
ngfrolov
ed67556742
Add ReportService.EnqueueCreateReportWork Add OnError handler 2023-12-05 14:05:51 +05:00
Степанов Дмитрий
51d2310772 Фикс шаблона суточного рапорта 2023-12-05 12:30:50 +05:00
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