|
|
f00be8d368
|
Merge branch 'dev' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into dev
|
2023-04-18 09:38:39 +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 |
|
|
|
1202bf024e
|
new migration
|
2023-04-17 18:12:11 +05:00 |
|
|
|
f1b1b01012
|
fix convert
|
2023-04-17 18:10:25 +05:00 |
|
ngfrolov
|
fe29dae8f5
|
Email.BaseFactory.GetImageBase64() Возвращает пустую строку если файл не найден.
|
2023-04-17 18:04:38 +05:00 |
|
|
|
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 |
|
|
|
fb48eed1e7
|
Форматирование некоторых ячеек в ртк-отчете до одной цифры после запятой
|
2023-04-17 15:34:40 +05:00 |
|
|
|
577f7a110b
|
Merge pull request 'Получение телеметрии расхода БН' (#46) from feature/telemetry_pump into dev
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/46
Reviewed-by: Никита Фролов <ng.frolov@digitaldrilling.ru>
|
2023-04-17 14:51:33 +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
|
b97871bd46
|
hotfix WellOperationRepository.GetGroupOperationsStatAsync()
|
2023-04-17 12:33:54 +05:00 |
|
|
|
69567df3fe
|
Merge pull request 'Фикс бага при формировании данных (метод GetGroupOperationsStatAsync в WellOperationRepository)' (#47) from fix/tvd-statistics-data-for-chart into dev
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/47
|
2023-04-17 12:01:50 +05:00 |
|
ngfrolov
|
94a152388f
|
fix WellOperationRepository.GetGroupOperationsStatAsync()
|
2023-04-17 11:59:16 +05:00 |
|
|
|
20ae812363
|
Merge branch 'dev' into fix/tvd-statistics-data-for-chart
|
2023-04-17 11:33:00 +05:00 |
|
|
|
5961260ccd
|
Фикс бага при формировании данных (метод GetGroupOperationsStatAsync в WellOperationRepository)
|
2023-04-17 11:31:27 +05:00 |
|
|
|
4ac3afdabf
|
#nullable enable (устранение warnings)
|
2023-04-14 15:23:43 +05:00 |
|
|
|
7ce3d1de9c
|
Comment
|
2023-04-14 13:45:16 +05:00 |
|
|
|
63a7ba2034
|
using
|
2023-04-14 12:34:47 +05:00 |
|
|
|
7d0a214521
|
fix
|
2023-04-14 12:32:55 +05:00 |
|
|
|
8b271da299
|
Получение телеметрии расхода БН
|
2023-04-14 11:47:49 +05:00 |
|
|
|
e77f542207
|
Правка
|
2023-04-14 10:14:37 +05:00 |
|
|
|
b61808e062
|
nullable enable (часть 4)
|
2023-04-14 10:11:15 +05:00 |
|
|
|
cb9e8dd672
|
nullable enable (часть 3)
|
2023-04-14 10:02:38 +05:00 |
|
|
|
bbd28a0634
|
correct migration
|
2023-04-14 01:10:58 +05:00 |
|
|
|
edd22e47b9
|
remove incorrect migration
|
2023-04-14 01:05:57 +05:00 |
|
|
|
40747d05fd
|
delete using
|
2023-04-14 00:59:19 +05:00 |
|
|
|
4d5b8932a5
|
delete comment
|
2023-04-14 00:46:31 +05:00 |
|
|
|
9b1b1f9736
|
small correction
|
2023-04-14 00:40:38 +05:00 |
|
|
|
55e17f6955
|
refact GetAsync
|
2023-04-14 00:36:35 +05:00 |
|
|
|
5100a221e0
|
правка new TDto[] { } на Enumerable.Empty<TDto>()
|
2023-04-13 15:37:11 +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 |
|
|
|
b71022bb97
|
Merge branch 'dev' into featute/null-enabled
|
2023-04-13 11:17:27 +05:00 |
|
|
|
b8e5a8bf4c
|
#nullable enable
|
2023-04-13 11:15:45 +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 |
|
|
|
6100dd57ff
|
add dbSet
|
2023-04-12 00:40:40 +05:00 |
|
|
|
1da28fb18a
|
Merge pull request 'Иерархический список в плановых и фактических операциях' (#44) from feature/tree-select-in-operations into dev
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/44
|
2023-04-11 17:55:48 +05:00 |
|
|
|
84a783a76b
|
оптимизация метода Get
|
2023-04-11 13:49:51 +05:00 |
|
|
|
44f1b08f90
|
оптимизирован метод save
|
2023-04-11 13:27:42 +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 |
|
|
|
7e2b1e56c8
|
refact
|
2023-04-11 07:05:07 +05:00 |
|
