Commit Graph

223 Commits

Author SHA1 Message Date
Фролов
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
Фролов
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
Харченко Владимир
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
Фролов
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
Фролов
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
b655360835 CS2-123: Added AdminPermissionController methods 2021-12-02 12:03:30 +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
KharchenkoVladimir
ad061bbca5 CS2-123: Renamed permission tables, removed roles from claims, etc 2021-11-30 17:22:38 +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
KharchenkoVladimir
ad34e6445c CS2-123: Changed role permissions to bit collection 2021-11-26 17:05:41 +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
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
Фролов
49eaa76bb0 Improve + fix TelemetryTracker. Now it keeps date range of telemetry data. 2021-11-22 16:02:15 +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
KharchenkoVladimir
07f76afa35 CS107: Renamed Mse to Rop in Cluster rop stat 2021-11-19 11:17:45 +05:00
KharchenkoVladimir
00798becb0 CS2-107: Added ClusterOperationStatController 2021-11-19 11:12:25 +05:00
KharchenkoVladimir
6b7f589ddc CS2-119: Fixed incoming telemetry date transform 2021-11-18 14:25:11 +05:00
KharchenkoVladimir
e62ac96bd7 CS2-119: Added .FixDatesRangeByTimeZoneAsync() to fix dates ranges to well timezone everywhere 2021-11-18 12:03:59 +05:00
KharchenkoVladimir
4bed0623f1 CS2-119: Added dates change to well timezone if requested 2021-11-18 11:24:21 +05:00
KharchenkoVladimir
c273a9eb5c CS2-119: Added telemetry date fix method according to well timezone 2021-11-17 15:54:01 +05:00
Фролов
b6c2f60296 fix use fileshare only when needed. 2021-11-17 13:06:48 +05:00
KharchenkoVladimir
53dbb2d959 CS2-119: Added timezone info receive method in TelemetryService 2021-11-16 17:14:36 +05:00
KharchenkoVladimir
88f9236b8a CS2-119: Added Telemetry Timezone object and update timezone functionality 2021-11-16 13:14:31 +05:00
Фролов
864d851b6a BIG. Add timescaleDB into DB.
Adapt contect to use hypertables.
Refactor TelemetryDataBaseService to avoid duplicate keys and try to save as more as posible
2021-11-13 18:47:11 +05:00
Фролов
bfb76b9dc0 Add request tracker. it also track users activity. 2021-11-10 14:23:53 +05:00
Фролов
170693f445 Refactor:
FilesService move FileSharing functions to GoogleDriveService;
FilesService.CreateFileMarkAsync() Move drillingProgram related logic into DrillingProgramService.CreateFileMarkAsync();
FilesService.MarkFileMarkAsDeletedAsync() Move drillingProgram related logic into DrillingProgramService.MarkFileMarkAsDeletedAsync();
IGoogleDriveService cleanup and rename to IFileShareService;
GoogleDriveService check token before usage and resresh it id needeed;
DrillingProgramController move logic to service;
DrillingProgramController use dto;
FileController remove unused method;
2021-11-09 17:36:44 +05:00
Фролов
b643934411 Replace UserLogin string to userId in FilePublishInfo and some renames. In Model, no migrations needed. 2021-11-09 17:24:30 +05:00
cult
e716c6fbeb CS2-104: Added deleting of existing drilling program on file marks actions 2021-11-03 14:12:39 +05:00