|
|
bfc9376733
|
#7987467 +
|
2022-12-27 14:30:52 +05:00 |
|
|
|
90ee5d10d1
|
Merge branch 'dev' into feature/ProcessMapReport
|
2022-12-14 09:32:38 +05:00 |
|
|
|
bf3a910433
|
#7987467 fix
|
2022-12-14 09:10:01 +05:00 |
|
|
|
e9bd1e4789
|
#7987467 report
|
2022-12-14 08:41:19 +05:00 |
|
ngfrolov
|
54d68cc52d
|
Merge branch 'dev' into feature/8027597
|
2022-12-12 11:13:36 +05:00 |
|
ngfrolov
|
a4db3e56d3
|
#7796681 Добавление секций в шаблон файла импорта
|
2022-12-12 11:12:20 +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 |
|
|
|
feefd490e2
|
Добавление секций
|
2022-12-10 02:58:09 +05:00 |
|
|
|
652374ed5b
|
В условии наработок по подсистеме осциляция не учитывается режим подворотов
|
2022-12-09 20:22:54 +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 |
|
Фролов
|
9ebcfbcc28
|
add todo
|
2022-12-08 14:50:28 +05:00 |
|
|
|
252c45ac00
|
#7987467 token
|
2022-12-07 15:23:10 +05:00 |
|
|
|
07fe9fcc5a
|
#7987467 Исправления
|
2022-12-07 15:04:36 +05:00 |
|
|
|
ff16974312
|
Merge branch 'feature/7987467' of http://46.146.209.148:8080/DDrilling/AsbCloudServer into feature/7987467
|
2022-12-07 12:57:39 +05:00 |
|
|
|
1f743ad8b7
|
#7987467 route
|
2022-12-07 12:57:28 +05:00 |
|
ngfrolov
|
9493d68974
|
ProcessMapController fix description
|
2022-12-07 12:42:54 +05:00 |
|
ngfrolov
|
06e5b30f05
|
ProcessMapController Add GetByUidAsync, mark as obsolete GetByTelemetry
|
2022-12-07 12:41:20 +05:00 |
|
ngfrolov
|
151eaadcb9
|
ProcessMapController Add GetByUidAsync, mark as obsolete GetByTelemetry
|
2022-12-07 12:39:13 +05:00 |
|
ngfrolov
|
5a0b92a1ec
|
ProcessMapRepository enable nullable
|
2022-12-07 12:20:24 +05:00 |
|
|
|
ae9ee705b0
|
#7987467 method report file not implemented
|
2022-12-07 10:57:23 +05:00 |
|
|
|
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 |
|
|
|
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 |
|
ngfrolov
|
95f0c1935b
|
nit rename
|
2022-12-07 09:02:04 +05:00 |
|
|
|
9c9d01d24a
|
№7987467 fix
|
2022-12-07 08:49:21 +05:00 |
|
|
|
84cbff84cb
|
Merge branch 'feature/7987467' of http://46.146.209.148:8080/DDrilling/AsbCloudServer into feature/7987467
|
2022-12-07 08:48:10 +05:00 |
|
|
|
398a6d443e
|
#7987467 правки
|
2022-12-07 08:47:41 +05:00 |
|
|
|
1cf2d745b3
|
refact warnings to WellOperationService
|
2022-12-06 22:34:48 +05:00 |
|
ngfrolov
|
81d3ef3146
|
Merge branch 'dev' into WellOperationTree/refact_migration
|
2022-12-06 16:29:53 +05:00 |
|
ngfrolov
|
5e5559a517
|
Merge branch 'dev' into feature/7987467
|
2022-12-06 15:51:22 +05:00 |
|
|
|
52538a734a
|
refact
|
2022-12-06 13:36:41 +05:00 |
|
ngfrolov
|
e124c54ed7
|
Merge branch 'feature/7987467' of http://46.146.209.148:8080/DDrilling/AsbCloudServer into feature/7987467
|
2022-12-06 10:55:12 +05:00 |
|
|
|
4f100e6bc4
|
#7987467 Исправления
|
2022-12-06 10:41:13 +05:00 |
|
|
|
29d4121440
|
Получение списков ограничивающих параметров и подсистем
|
2022-12-06 10:03:24 +05:00 |
|
ngfrolov
|
d5bc886c22
|
Merge branch 'dev' into feature/7987467
|
2022-12-06 09:33:45 +05:00 |
|
ngfrolov
|
6ef633d607
|
Merge branch 'dev' of http://46.146.209.148:8080/DDrilling/AsbCloudServer into dev
|
2022-12-05 17:48:20 +05:00 |
|
ngfrolov
|
84dfa183d7
|
Decrease TelemetryDataCache size.
|
2022-12-05 17:48:15 +05:00 |
|
|
|
4b9cd6694b
|
#7987467
|
2022-12-05 12:44:46 +05:00 |
|
|
|
9b71b14048
|
#7987467
|
2022-12-05 12:43:16 +05:00 |
|
|
|
9b4f14a036
|
#7987467 Раздел РТК в ЕЦП
|
2022-12-05 12:39:25 +05:00 |
|
ngfrolov
|
8094c8b1b8
|
Decrease TelemetryDataCache size.
|
2022-12-05 10:53:24 +05:00 |
|
ngfrolov
|
289d1831b4
|
CacheBase makes cache for TEntity only. Converter moved to CrudCacheRepositoryBase
|
2022-12-05 09:38:23 +05:00 |
|
ngfrolov
|
a859c096d1
|
Merge branch 'dev' into feature/8101318
|
2022-12-05 09:28:38 +05:00 |
|
ngfrolov
|
7c31f7ce76
|
Merge branch 'dev' of http://46.146.209.148:8080/DDrilling/AsbCloudServer into dev
|
2022-12-05 08:49:45 +05:00 |
|
ngfrolov
|
85b99135e6
|
nit tests refactoring
|
2022-12-05 08:47:00 +05:00 |
|
|
|
685691ea6d
|
delete old category - migrations
|
2022-12-03 00:59:27 +05:00 |
|
|
|
6ed0dda96d
|
migration
-edit default Data
-edit model
-update WellOperation
|
2022-12-03 00:48:40 +05:00 |
|
