Commit Graph

639 Commits

Author SHA1 Message Date
9806df01ae Метод GetAsync переименова в GetAllAsync 2023-04-20 17:18:00 +05:00
49611d45f3 Merge branch 'dev' into feature/faq 2023-04-20 15:09:34 +05:00
4c57268433 Мелкие правки 2023-04-20 15:07:03 +05:00
860da5c35e FAQ controller и бизнес-логика по работе с вопросами 2023-04-20 15:01:19 +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
8b9dee1609 uncomment 2023-04-17 20:59:27 +05:00
f81f092c64 fix controller 2023-04-17 20:58:20 +05:00
33ebaf39c1 fix JsonValue 2023-04-17 18:13:36 +05:00
ngfrolov
1289d782cf
Merge branch 'dev' into featute/null-enabled 2023-04-17 15:51:22 +05:00
ngfrolov
6a48e1c7f4
Merge branch 'dev' into feature/telemetry_pump 2023-04-17 14:47:37 +05:00
ngfrolov
b6cb2d8efc
Merge branch 'dev' into gtr 2023-04-17 14:43:46 +05:00
ngfrolov
94a152388f
fix WellOperationRepository.GetGroupOperationsStatAsync() 2023-04-17 11:59:16 +05:00
8b271da299 Получение телеметрии расхода БН 2023-04-14 11:47:49 +05:00
40747d05fd delete using 2023-04-14 00:59:19 +05:00
4d5b8932a5 delete comment 2023-04-14 00:46:31 +05:00
5e29ef5e01 Merge branch 'featute/null-enabled' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into featute/null-enabled 2023-04-13 15:34:29 +05:00
2431557539 #nullable enable (part 2) 2023-04-13 15:34:16 +05:00
ngfrolov
c989e449c2
Merge branch 'dev' into gtr 2023-04-12 13:34:10 +05:00
ngfrolov
cea14deddc
Update PublishProfiles 2023-04-12 13:32:59 +05:00
f14b0064ed Merge branch 'dev' into gtr 2023-04-12 00:43:04 +05:00
27ee40816f refact save method 2023-04-11 12:06:05 +05:00
c490b29007 Merge branch 'feature/tree-select-in-operations' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into feature/tree-select-in-operations 2023-04-11 10:43:06 +05:00
b93c5e4299 Параметр includeParents контроллера WellOperationController в методе GetCategories 2023-04-11 10:42:56 +05:00
5fb5151ccd Merge branch 'dev' into feature/tree-select-in-operations 2023-04-11 09:26:13 +05:00
9e9e7a6f5a Иерархический список в плановых и фактических операциях 2023-04-11 09:25:35 +05:00
7c827f4fae rework get method in rep 2023-04-11 00:32:06 +05:00
ngfrolov
312d653aec
fix #9844930;
Enable nullable for OperationsStatService.
2023-04-07 16:49:28 +05:00
8e663e7bef edit generic 2023-04-07 05:32:03 +05:00
e26c5d98a7 delete manual timescale script (error index)
edit generic repository
2023-04-07 04:51:30 +05:00
ngfrolov
af72eceb47
nit report design fixes 2023-04-06 16:20:21 +05:00
ngfrolov
40a3d3ab50
Debugged 2023-04-06 10:25:51 +05:00
ngfrolov
0457f8dd98
Merge branch 'dev' into feature/rtc-calc 2023-04-05 10:56:29 +05:00
f1dc52c768 Merge branch 'dev' into feature/set-user-editor-to-operation 2023-04-04 12:54:42 +05:00
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
7cb16c7df9
Merge branch 'dev' into feature/refactoring-dtos-for-rtk-report 2023-03-31 16:58:11 +05:00
ngfrolov
225d6ef827
Незначительные переименования 2023-03-31 16:57:20 +05:00
ngfrolov
4d32b57390
Add Example.http 2023-03-31 16:45:56 +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
e4412d3b2a reviw db model and migration 2023-03-31 11:10:16 +05:00
91c87ee70e Фикс 2023-03-30 16:44:59 +05:00
f17cea0f7a Настройка в AddSwaggerGen cтрокового формата данных для DateOnly 2023-03-30 16:41:06 +05:00
6f08629966 Настройка в AddSwaggerGen cтрокового формата данных для DateOnly 2023-03-30 16:39:51 +05:00
bf77e2a2c7 Настройка в AddSwaggerGen cтрокового формата данных для DateOnly 2023-03-30 13:01:01 +05:00
ngfrolov
9066ff9b04
DailyReport. Незначительные исправления 2023-03-29 16:05:57 +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
ngfrolov
464678a3db
nit deleting an outdated tasks 2023-03-27 09:40:51 +05:00