Фролов
|
634bdee1e3
|
remove files of old projects
|
2021-12-03 17:36:31 +05:00 |
|
Фролов
|
fa3e47493b
|
Doc timascale backup and restore.
|
2021-12-03 17:34:24 +05:00 |
|
Фролов
|
eac44db77f
|
Merge branch 'RolesAndPermissionsMatrix' into dev
|
2021-12-03 15:05:41 +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
|
03f770b949
|
CS2-120: Deleted 'AsbCloudDemoData' project. Classes were moved to ConsoleApp1.
|
2021-12-02 15:36:51 +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 |
|
Фролов
|
8c3c621c7b
|
hotfix rename t_well_сomposite (cyrilic c) to t_well_composite.
|
2021-12-02 11:44:45 +05:00 |
|
Фролов
|
cdb8207c35
|
fix program args parsing
|
2021-12-02 11:24:54 +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 |
|
Фролов
|
06eb85e275
|
remove useless props "description" from ClusterDto, DepostDto
|
2021-12-02 09:53:30 +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 |
|
Фролов
|
a74a7cbf58
|
doc RequestTracker
|
2021-12-01 12:53:10 +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
|
1d078379b4
|
CS2-123: Renamed Permission collections in EF models
|
2021-11-30 17:25:08 +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
|
fd139079a4
|
CS2-123: Added [JsonIgnore] to UserRoleDto
|
2021-11-30 09:34:23 +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 |
|
Фролов
|
b292fd2a8d
|
Merge branch 'MaxAndAverageRop' of https://bitbucket.org/autodrilling/asbcloudserver into MaxAndAverageRop
|
2021-11-23 16:16:22 +05:00 |
|
Фролов
|
a74032eed5
|
Fix TelemetryTracker dbContext disposing.
|
2021-11-23 16:16:13 +05:00 |
|
Фролов
|
3d8154ca2d
|
Fix TelemetryTracker dbContext disposing.
|
2021-11-23 16:12:41 +05:00 |
|
KharchenkoVladimir
|
6412c24a3e
|
CS2-107: Fixed rop stat methods routes
|
2021-11-23 14:07:43 +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 |
|
Фролов
|
3dc7bc216e
|
Fix DateTime minValue exception.
|
2021-11-22 16:07:37 +05:00 |
|
Фролов
|
49eaa76bb0
|
Improve + fix TelemetryTracker. Now it keeps date range of telemetry data.
|
2021-11-22 16:02:15 +05:00 |
|
Фролов
|
0b66648267
|
fix AsbCloudWebApi.Controllers.WellOperationController.ExportAsync. NullRef in WellService.Convert().
|
2021-11-22 14:14:44 +05:00 |
|
Фролов
|
809ee137aa
|
fix TelemetryAnalyticsService.AnalyzeAndSaveTelemetriesAsync().
|
2021-11-22 14:04:05 +05:00 |
|
Фролов
|
f4f4974cdd
|
remove usless projects
|
2021-11-22 12:06:10 +05:00 |
|
Фролов
|
14bc1e12b4
|
Merge branch 'TelemetryTimeZone' into dev
|
2021-11-22 11:31:10 +05:00 |
|
Фролов
|
1eaa1efb03
|
Refactor. Extract TimezoneService.
|
2021-11-22 11:30:08 +05:00 |
|