ngfrolov
|
cfab294945
|
nit. docfix
|
2023-01-12 16:22:36 +05:00 |
|
ngfrolov
|
7c6e00fe51
|
PlannedTrajectory fix
|
2023-01-12 12:07:31 +05:00 |
|
|
68c227e7c6
|
Merge branch 'dev' into PlannedTrajectory_refact
|
2023-01-12 11:24:50 +05:00 |
|
|
e950f40122
|
GetFileName -> async
|
2023-01-12 09:40:37 +05:00 |
|
ngfrolov
|
5948a762ba
|
#7963103 fixes
|
2023-01-11 16:00:11 +05:00 |
|
|
0b3825a531
|
finally refact
|
2023-01-11 14:59:54 +05:00 |
|
|
60a80745a9
|
#7963103 Замечания
|
2023-01-11 13:51:11 +05:00 |
|
|
5c00e996f5
|
Merge remote-tracking branch 'origin/dev' into PlannedTrajectory_refact
|
2023-01-10 15:54:11 +05:00 |
|
|
193b9ff9f6
|
#7963103 Отображение общей наработки тальканата по всем объектам
|
2023-01-10 10:49:27 +05:00 |
|
|
46453b3893
|
повторный рефакт
после ревью
|
2022-12-29 04:25:08 +05:00 |
|
ngfrolov
|
7585aefc4e
|
WellOperationService to WellOperationRepository
|
2022-12-28 17:38:53 +05:00 |
|
ngfrolov
|
fb4bb375e1
|
Merge branch 'dev' into feature/ProcessMapReport
|
2022-12-28 15:22:50 +05:00 |
|
|
5a6ad78c21
|
refact finally
|
2022-12-27 21:45:03 +05:00 |
|
|
bfc9376733
|
#7987467 +
|
2022-12-27 14:30:52 +05:00 |
|
|
9819c2ac0d
|
refct #3
|
2022-12-27 00:02:49 +05:00 |
|
ngfrolov
|
8e896a887d
|
RequerstTracker Add nullable
|
2022-12-26 18:03:26 +05:00 |
|
|
3c84648eec
|
refact #1
|
2022-12-25 23:16:36 +05:00 |
|
ngfrolov
|
4a4b7852b7
|
Remove ClusterController, ClusterService.
|
2022-12-23 14:35:23 +05:00 |
|
|
169968da44
|
Скорректированная версия
-добавлена миграция
-изменены методы
- добавлен CRUD
|
2022-12-22 18:08:58 +05:00 |
|
ngfrolov
|
9eead7a757
|
WellOperation* remove default cancellation tokens
|
2022-12-22 11:26:19 +05:00 |
|
ngfrolov
|
7b0e6ce23d
|
IWellOperationService/Controller replace arguments by request class
|
2022-12-21 18:02:22 +05:00 |
|
ngfrolov
|
7e9ec57e53
|
fix UserConnectionsLimitMiddlware - 429 message text.
|
2022-12-21 10:22:18 +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 |
|
|
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
|
06e5b30f05
|
ProcessMapController Add GetByUidAsync, mark as obsolete GetByTelemetry
|
2022-12-07 12:41:20 +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 |
|
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 |
|
|
29d4121440
|
Получение списков ограничивающих параметров и подсистем
|
2022-12-06 10:03:24 +05:00 |
|
|
9b71b14048
|
#7987467
|
2022-12-05 12:43:16 +05:00 |
|
|
9b4f14a036
|
#7987467 Раздел РТК в ЕЦП
|
2022-12-05 12:39:25 +05:00 |
|
ngfrolov
|
a859c096d1
|
Merge branch 'dev' into feature/8101318
|
2022-12-05 09:28:38 +05:00 |
|
|
64e51915c8
|
all changes but database and but migrations
|
2022-12-02 15:54:55 +05:00 |
|
ngfrolov
|
71aff8d1ec
|
nit. comments and cleanup
|
2022-12-02 14:49:00 +05:00 |
|
ngfrolov
|
89e0495d09
|
BackgroundWorker adapt other services to this one.
|
2022-12-02 14:48:23 +05:00 |
|
|
fb5483299d
|
#8101318 Изменение работы кэша
|
2022-12-01 15:56:11 +05:00 |
|
ngfrolov
|
ddcade44a3
|
#7912198 fix route
|
2022-11-25 15:27:35 +05:00 |
|
ngfrolov
|
0d9f9296df
|
Merge branch '7912198_WellCase_add_notification' into dev
|
2022-11-25 12:45:36 +05:00 |
|
|
046a6a765d
|
#7887519 Замечания
|
2022-11-25 11:56:21 +05:00 |
|
ngfrolov
|
4277850156
|
#7912198 implement ReNotifyPublishers
|
2022-11-23 14:03:08 +05:00 |
|
|
b00b4f3781
|
#7887519
|
2022-11-23 11:19:52 +05:00 |
|
|
5041b30686
|
#7798026
|
2022-11-23 08:23:08 +05:00 |
|
ngfrolov
|
9b06438935
|
GetDatesRange Fix handle exception "Well id: {idWell} does not contain telemetry."
|
2022-11-21 16:58:37 +05:00 |
|
|
cd025c6fdd
|
#7887519 Статистика по ограничивающим параметрам backend
|
2022-11-18 14:36:04 +05:00 |
|
|
49cc9c2342
|
Merge branch 'dev' into feature/7887519
|
2022-11-18 14:30:34 +05:00 |
|
|
c5aef20dc0
|
#7887519 Статистика по ограничивающим параметрам backend
|
2022-11-18 14:29:29 +05:00 |
|
ngfrolov
|
de6bbcfa72
|
TelemetryUserService добавлен microsoft cache
|
2022-11-18 12:58:53 +05:00 |
|
ngfrolov
|
c78246ca7d
|
fix some nit warnings
|
2022-11-17 17:54:25 +05:00 |
|
ngfrolov
|
7cfd60844e
|
fix TelemetryService. wrong cacheType.
update webclient
|
2022-11-16 12:49:11 +05:00 |
|
ngfrolov
|
eed8c3eeaa
|
#7579139 Tests
|
2022-11-15 17:46:58 +05:00 |
|
ngfrolov
|
698fb33651
|
fix #7582867
|
2022-11-10 13:59:48 +05:00 |
|
|
6ac073d59a
|
Merge branch 'dev' into feature/user_settings
|
2022-11-08 11:37:52 +05:00 |
|
Фролов
|
06428838c5
|
#7554801 Printify
|
2022-11-07 15:30:04 +05:00 |
|
|
f8502b68a1
|
изменение фильтрации запроса в методе получения интервалов глубин,
мелкие правки
|
2022-11-03 15:57:45 +05:00 |
|
ngfrolov
|
b5650dcd51
|
merge dev to user_settings
|
2022-11-03 15:34:03 +05:00 |
|
|
0880c3b75c
|
часть исправлений после код ревью
|
2022-11-02 15:51:09 +05:00 |
|
ngfrolov
|
f07b1535d2
|
Merge branch 'dev' into SubsystemStat/AllActiveWell
|
2022-11-02 09:00:32 +05:00 |
|
ngfrolov
|
c38730b7aa
|
#7582867 cleanup
|
2022-11-02 08:56:08 +05:00 |
|
ngfrolov
|
0d9f8b1819
|
#7582867 add UserConnectionsLimitMiddlware.
|
2022-11-01 17:14:19 +05:00 |
|
|
562bf5b348
|
редактирование метода в контроллере
изменение интерфейса наработки подсистем
|
2022-10-31 18:59:08 +05:00 |
|
|
3aa01ebe47
|
-добавлена модель статистики по активным скважинам
- метод расчета статистики
-шаблон метода в контроллере
|
2022-10-31 18:19:14 +05:00 |
|
ngfrolov
|
e185d8b82a
|
#7576630 refactor telemetryService.
Добавить nullable.
Заменить зависимость от CacheTable/CacheDb.
Удалить не используемые методы.
|
2022-10-31 15:29:47 +05:00 |
|
|
211f300973
|
#7205798 Перенос сервиса пользователей и ролей в репозиторий
|
2022-10-27 11:22:39 +05:00 |
|
|
5ea6919738
|
#7205798 Перенос сервиса пользователей и ролей в репозиторий
|
2022-10-26 15:36:49 +05:00 |
|
ngfrolov
|
0bab711eb8
|
Merge branch 'RangeDataOperationTime' into dev
|
2022-10-26 10:31:41 +05:00 |
|
ngfrolov
|
1a2806b273
|
nit
|
2022-10-26 10:30:59 +05:00 |
|
|
17c7392542
|
изменена модель возвращаемая методом
изменен алгоритм внутри метоа
|
2022-10-25 09:42:08 +05:00 |
|
ngfrolov
|
33dd020b7e
|
AuthController.RefreshAsync() returns full UserTokenDto
|
2022-10-24 10:36:53 +05:00 |
|
|
cc75bcf4f9
|
корректировка типа в контроллере
|
2022-10-21 15:58:33 +05:00 |
|
|
dd711c4aa5
|
добавлен контроллер для получения диапозона
изменен аргумент метода
перестроена логика работы метода и возвращаемое значение
|
2022-10-21 15:52:51 +05:00 |
|
|
25cd263598
|
Merge pull request '#7053070 Перенос справочника бурильщиков в репозиторий' (#8) from feature/driller_repository into dev
Reviewed-on: http://46.146.209.148:8080/DDrilling/AsbCloudServer/pulls/8
|
2022-10-19 16:00:35 +05:00 |
|
|
dd469a0f9a
|
#7053070 Перенос справочника бурильщиков в репозиторий
|
2022-10-19 15:31:53 +05:00 |
|
|
51d4e30100
|
#7051313 Перенос создания композитной скважины в репозиторий
|
2022-10-19 13:56:34 +05:00 |
|
ngfrolov
|
1f5867e4b3
|
Merge branch 'feature/removing_unnecessary_files' into dev
|
2022-10-17 14:43:10 +05:00 |
|
ngfrolov
|
8b68b8276a
|
#6385536 refactoring
|
2022-10-17 14:42:47 +05:00 |
|
|
8a83194187
|
#6385536 Удаление ненужных файлов. Замечания
|
2022-10-17 08:58:28 +05:00 |
|
ngfrolov
|
c4b818ea7f
|
Merge branch 'feature/spin_mater_db' into dev
|
2022-10-13 17:19:16 +05:00 |
|
ngfrolov
|
3a0a22616d
|
Merge branch 'dev' into feature/removing_unnecessary_files
|
2022-10-13 14:46:16 +05:00 |
|
|
b4372dde50
|
#6838390 Уменьшение хранимой модели данных SPIN master
|
2022-10-13 14:22:20 +05:00 |
|
ngfrolov
|
d86f3fc1de
|
Merge branch 'Redice_telemetry_sampling' into dev
|
2022-10-11 17:05:27 +05:00 |
|
ngfrolov
|
707f2a638a
|
Add ReduceSamplingController.
|
2022-10-11 17:04:26 +05:00 |
|
|
b54de8fe06
|
#6385536 Замечания
|
2022-10-11 14:42:04 +05:00 |
|
|
9de5f04fbc
|
#6385536 замечания
|
2022-10-11 09:08:25 +05:00 |
|
|
dbe5618a56
|
#6385536 Удаление ненужных файлов
|
2022-10-11 08:28:37 +05:00 |
|
ngfrolov
|
0f1b4285f5
|
Merge branch 'feature/file_repository' into dev
|
2022-10-06 14:56:12 +05:00 |
|
|
fe49c90e58
|
#6539681 file service refactor
|
2022-10-06 14:37:03 +05:00 |
|
ngfrolov
|
c891c78782
|
Merge branch 'feature/file_repository' into dev
|
2022-10-04 09:43:22 +05:00 |
|
ngfrolov
|
1e34f137cf
|
rename method
|
2022-10-03 16:04:25 +05:00 |
|