Фролов
|
7c24d52fa2
|
Merge branch 'dev' into NewUserRoles
|
2021-12-20 15:13:36 +05:00 |
|
Фролов
|
5d45eb7289
|
Adapt RequestLogUserDto for frontend usage
|
2021-12-17 16:24:54 +05:00 |
|
Фролов
|
3128c8f701
|
Merge branch 'dev' into RefactorTelemetry
|
2021-12-17 13:08:07 +05:00 |
|
Фролов
|
9bb1cc5abc
|
Add some fields into dtos to make possible assign telemetry to well.
|
2021-12-17 13:07:45 +05:00 |
|
Фролов
|
31b671a0c7
|
remove unused methods
|
2021-12-17 13:04:33 +05:00 |
|
Фролов
|
e0834e4720
|
add telemetry merge
|
2021-12-17 12:48:58 +05:00 |
|
Харченко Владимир
|
d94b2e685e
|
CS2-133: Fixed CRUD operations over Permissions
|
2021-12-17 12:38:34 +05:00 |
|
Фролов
|
bc38e86b74
|
hotfix units.
|
2021-12-16 16:10:58 +05:00 |
|
Харченко Владимир
|
17db1218cc
|
CS2-133: Removed permission mask logic from permissions
|
2021-12-16 16:00:47 +05:00 |
|
Харченко Владимир
|
888c28cdf8
|
CS2-133: Removed Value property from roles to permissions models and services
|
2021-12-15 16:21:52 +05:00 |
|
Фролов
|
551c60c4ff
|
Add/refactor services for permissions authorization model.
Rename some fields in DB.permission.
|
2021-12-11 16:46:04 +05:00 |
|
Фролов
|
1ec22744c3
|
Refactor cacheTable.
Remove ConfigureAwait(false) for private methotds.
Insert?() returns updated entity(ies).
|
2021-12-11 16:33:37 +05:00 |
|
Фролов
|
6dc3137627
|
update default WellOperationCategories
|
2021-12-08 15:38:38 +05:00 |
|
Фролов
|
6565957c34
|
rider recomendations
|
2021-12-08 15:29:41 +05:00 |
|
Фролов
|
5752ad40b7
|
some rider recommendations and spelling
|
2021-12-07 18:27:52 +05:00 |
|
Фролов
|
1e9078079a
|
remove useless argument TelemetryService.GetTransmittingTelemetriesAsync()
|
2021-12-07 15:55:11 +05:00 |
|
Фролов
|
9a7d2b4140
|
Remove ReportService.GetSuitableReportsAsync()
|
2021-12-07 13:55:39 +05:00 |
|
Фролов
|
819bc82227
|
MeasureService.GetHisoryAsync(..) uses idCategory arg
|
2021-12-07 13:43:47 +05:00 |
|
Фролов
|
ee01ab30db
|
Забрал домой
|
2021-12-07 11:34:06 +05:00 |
|
Фролов
|
fa3e47493b
|
Doc timascale backup and restore.
|
2021-12-03 17:34:24 +05:00 |
|
Фролов
|
539905e8e0
|
Use cacheTable for roles and permissions
|
2021-12-03 15:03:33 +05:00 |
|
Фролов
|
00dd39b587
|
merge dev to this
|
2021-12-03 09:58:48 +05:00 |
|
Фролов
|
4aaac31c43
|
nit refacroring before merge
|
2021-12-03 09:44:10 +05:00 |
|
KharchenkoVladimir
|
aff16dc84b
|
CS2-123: Returned parent user role permissions inheritance
|
2021-12-02 13:35:15 +05:00 |
|
KharchenkoVladimir
|
b655360835
|
CS2-123: Added AdminPermissionController methods
|
2021-12-02 12:03:30 +05:00 |
|
Фролов
|
fdf5a6ecd6
|
Add startup argument db_init to start just for migrate DB
|
2021-12-02 11:11:14 +05:00 |
|
Фролов
|
c55086bfee
|
Fix ClusterService
|
2021-12-02 11:10:24 +05:00 |
|
KharchenkoVladimir
|
22c5d33b7e
|
CS2-123: Added AdminPermissionController and Service
|
2021-12-01 17:10:17 +05:00 |
|
KharchenkoVladimir
|
cf517eabd5
|
CS2-123: Fixed role permissions create/update operations
|
2021-12-01 16:09:06 +05:00 |
|
Фролов
|
5c63c086ad
|
CS2-127 Add lazy service registration.
|
2021-12-01 11:49:59 +05:00 |
|
Фролов
|
04052af874
|
CS2-115 TelemetryDataBaseService.Get() прореживание выборки может работать не корректно
|
2021-12-01 11:08:25 +05:00 |
|
KharchenkoVladimir
|
ad061bbca5
|
CS2-123: Renamed permission tables, removed roles from claims, etc
|
2021-11-30 17:22:38 +05:00 |
|
Фролов
|
bc77b128b0
|
Fix setpoints dictionary by Oleg's info.
Update default client build
|
2021-11-30 15:25:29 +05:00 |
|
KharchenkoVladimir
|
9280b28e10
|
CS2-123: Returned table for roles permissions.
|
2021-11-29 17:34:53 +05:00 |
|
KharchenkoVladimir
|
2d9388cb2a
|
Revert "CS2-123: Changed role permissions to bit collection"
This reverts commit ad34e6445c.
|
2021-11-29 12:39:28 +05:00 |
|
Фролов
|
ee2172f64b
|
fix SetpointsController. Add AllowAnonymous.
fix doc for backup db.
|
2021-11-26 17:14:02 +05:00 |
|
KharchenkoVladimir
|
ad34e6445c
|
CS2-123: Changed role permissions to bit collection
|
2021-11-26 17:05:41 +05:00 |
|
KharchenkoVladimir
|
c3c601c2a0
|
CS2-123: Added get of parent's permissions for new role
|
2021-11-25 17:44:07 +05:00 |
|
KharchenkoVladimir
|
2f23fbce70
|
CS2-123: Fixed UserRoleController to user UserRoleService, not CRUD service
|
2021-11-25 12:24:53 +05:00 |
|
KharchenkoVladimir
|
576d119674
|
CS2-123: Changed UserRoleService and controller to inherit CrudController/service
|
2021-11-25 11:55:52 +05:00 |
|
Фролов
|
26ada6572b
|
Add SetpointInfoDto
|
2021-11-24 17:58:53 +05:00 |
|
KharchenkoVladimir
|
908c855463
|
CS2-123: Added CRUD over user roles and their permissions (controller + service)
|
2021-11-24 17:38:40 +05:00 |
|
Фролов
|
18ad9fc91a
|
CS2-124 Создать контроллер рекомендый новыйх уставок бурильщику
|
2021-11-24 16:16:17 +05:00 |
|
KharchenkoVladimir
|
872598dcdd
|
CS2-123: Added models for user roles and permissions. Fixed auth UserToken.
|
2021-11-24 11:30:29 +05:00 |
|
Фролов
|
a74032eed5
|
Fix TelemetryTracker dbContext disposing.
|
2021-11-23 16:16:13 +05:00 |
|
KharchenkoVladimir
|
2a4c76611c
|
Returning 'using' to ef context creation
|
2021-11-23 11:43:58 +05:00 |
|
KharchenkoVladimir
|
e0a453a1f6
|
CS2-107: Added lost data after merge conflict resolve (with dev)
|
2021-11-23 11:41:27 +05:00 |
|
KharchenkoVladimir
|
cb52f96069
|
Merge branch 'dev' into MaxAndAverageRop
# Conflicts:
# AsbCloudInfrastructure/Services/WellService.cs
|
2021-11-23 11:35:11 +05:00 |
|
KharchenkoVladimir
|
389b519f4b
|
CS2-107: Small guard fix for default result of DB query
|
2021-11-23 11:31:47 +05:00 |
|
KharchenkoVladimir
|
d361c9a9b4
|
CS2-107: Added calculation of max and average Rop for cluster wells
|
2021-11-22 17:29:19 +05:00 |
|