ngfrolov
c2a691f224
Simplify dependencies
2022-03-16 16:07:37 +05:00
Фролов
007f7ac62e
Fix UserService.GetNestedPermissions(). returns all permissions for all nested roles
2022-03-15 16:19:51 +05:00
Фролов
8de73084f2
Add Mse to telemetryDataSaub
2022-03-10 17:18:30 +05:00
Фролов
b613cb5e1f
rename WellOperationDto.NptDays to NptHours
2022-03-10 17:17:52 +05:00
Фролов
3ebb0020f5
OperationsStatService add calc cumulative non productive time
2022-03-04 10:15:52 +05:00
Фролов
bafa372d66
rename some methods
2022-03-02 17:42:34 +05:00
Фролов
45cce481ee
Add emailService
2022-02-28 14:44:26 +05:00
Фролов
f286410eff
Add DrillingProgramCreateError
2022-02-28 14:44:15 +05:00
Фролов
cee68bf4ee
DrillingProgramStateDto Add PermissionToEdit
2022-02-24 09:52:11 +05:00
Фролов
29845aa36a
Add tests for DrillingProgramService
2022-02-21 17:55:50 +05:00
Фролов
4863b69cfe
DrillingProgram replace idPart by idFileCategory.
2022-02-18 14:16:35 +05:00
Фролов
7a77ff7904
Add backgroundService.
...
ReportService uses backgroundService.
Drilling program alpha
2022-02-17 15:37:27 +05:00
Фролов
e4e906c8d7
DrillingProgramService существенно переработан.
2022-02-12 11:28:16 +05:00
Фролов
4c68045398
Rename_DrillingProgram_FileCategories
...
Add entity DrillingProgram parts
2022-02-09 14:25:22 +05:00
Фролов
7a10d26ca6
CS2-145 Добавить специальный ArgumentInvalidException кастомной вылидации для замены ArgumentException
2022-01-18 11:04:44 +05:00
Фролов
f81dcf2a46
PermissionsMiddlware Add auto generate permissionsName
2022-01-13 17:08:07 +05:00
Фролов
0109e529f6
CS2-142 Изменить UserRole
2022-01-13 14:36:27 +05:00
Фролов
f3803c0622
Add companyTypeId
2022-01-13 14:34:58 +05:00
Фролов
7487dfb342
Merge branch 'dev' into RefactorRoles
2022-01-12 17:50:21 +05:00
Фролов
9eb1070941
Add Day to TVD
2022-01-12 17:46:33 +05:00
Фролов
e09e358cd0
Add RelationUserRoleUserRole for multiple parents. INCOMPLETE
2022-01-12 16:33:53 +05:00
Фролов
2c51c352b1
CS2-139 Добавить контроллер AdminCompanyType
2022-01-12 13:33:16 +05:00
Фролов
90a0aa9e5b
Add TryGetTimezone methods.
...
EnshureTimezonesIsSet() sets default timezone if can't find correct one.
Edit WellDto to fix exception by constr: FK_t_well_t_well_type_id_well_type. Make IdWellType optional.
2022-01-10 17:39:33 +05:00
Фролов
345ca47f87
CS2-135. Db model uses DateTimeOffset. see about using DateTime[Offset].md
2022-01-05 17:50:45 +05:00
Фролов
4872b4a495
не доделано перед праздниками
2021-12-30 17:05:44 +05:00
Фролов
ab5f43edbe
Migrate projects to net 6.
...
Update nuget packadges.
2021-12-28 16:35:31 +05:00
Фролов
e7d6aef6a6
Move logic from AsbCloudDbContext.GetDepthToIntervalAsync() to TelemetryAnalyticsService.GetWellDepthToIntervalAsync()
2021-12-27 13:49:29 +05:00
Фролов
ca969c99ad
Remove query datesRange from context.
...
Replace source for DatesRange from db to telemetry tracker.
2021-12-27 11:48:23 +05:00
Фролов
889a8a8757
refactor ITelemetryService. Rename FixDatesRangeByTimeZoneAsync to DatesRangeToTelemetryTimeZoneAsync
2021-12-24 11:36:20 +05:00
Фролов
dfacd04b47
fix UserService
2021-12-23 18:07:20 +05:00
Фролов
95df836155
Add WellOperationController.GetSectionTypes()
2021-12-22 17:09:26 +05:00
Фролов
ecfdbfc394
Fix UserService.UpdateAsync() preserve users password.
2021-12-22 16:55:39 +05:00
Фролов
ea26010719
fix MeasureController.GetHisoryAsync
2021-12-22 12:31:37 +05:00
Фролов
d40bced3a0
Merge branch 'dev' into RefactorWellService
2021-12-22 11:53:31 +05:00
Фролов
c5ed3c467f
fix and refactor WellService.
2021-12-22 11:41:18 +05:00
Харченко Владимир
1ec76e812f
CS2-99: Fixed well fact end date depending on well state
2021-12-21 16:36:28 +05:00
Фролов
6924a6bac7
start refactoring// fire alarm
2021-12-21 11:52:53 +05:00
Фролов
a0208f412e
refactor UserRoleService
2021-12-20 15:17:09 +05:00
Фролов
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
cult
2f2193da76
CS2-104: Added recreate of drilling program if new files were confirmed
2021-11-02 16:33:49 +05:00
cult
a53d557f2a
CS2-104: Added confirm of drilling program parts
2021-11-01 16:41:25 +05:00
Фролов
62a38aeeaf
Refactor TelemetryData*dtos for smaller size.
...
Add protobuf.
2021-10-31 16:35:09 +05:00
cult
e79cf9f5d1
CS2-106: Inserted logic from DrillingProgram controller in fileService.GetFileWebUrlAsync()
2021-10-29 16:03:24 +05:00
cult
07820a5042
Deleted Apache Service for Excel files union
2021-10-29 13:34:56 +05:00
cult
45b4d8bb23
CS2-106: Fixed Drilling program creation and preview logic
2021-10-29 12:47:18 +05:00
cult
e8ad17bc1d
CS2-106: Added .GetFileWebLinkAsync() in DrillingProgramController.cs
2021-10-28 16:59:00 +05:00
cult
c3be8bceea
CS2-106: Fixed .GetAsync() in DrillingProgramController to return file web url in cloud
2021-10-28 15:08:06 +05:00
Фролов
da9e94b4b9
Modify telemetry tracker to keep remote and server dates.
...
Update related services.
Small refactor TelemetryController: exclude dictionaries updates from tracker update. All tracker updates moved to services.
2021-10-28 10:56:18 +05:00
cult
ab13e97837
CS2-106: Added GoogleDriveService and .GetWebLink() to DrillingProgramController
2021-10-27 17:00:27 +05:00
KharchenkoVladimir
5b82229a94
Fixed WellDto creation in WellService (fixed LastTelemetryDate field)
2021-10-21 15:57:20 +05:00
KharchenkoVladimir
d19a62c041
Added Id well type field in WellDto
2021-10-20 16:57:35 +05:00
Фролов
4968ca4382
add IdState to StatWell
2021-10-20 14:15:53 +05:00
Фролов
eab95cb7a1
Refactor GetLastTelemetryDate(..) in services (single resp).
...
Add State and LastTelemetryDate into StatWellDto.
2021-10-20 12:52:31 +05:00
KharchenkoVladimir
387b01c44d
CS2-72: Added email, phone and position in UserDto.
2021-10-19 15:22:18 +05:00
KharchenkoVladimir
37e03b3f0d
CS2-98: Added WellUpdateParamsDto in WellController.UpdateWellAsync().
2021-10-18 16:30:14 +05:00
KharchenkoVladimir
6e4c85843f
CS2-98: Added State to Well. Added .UpdateWell() in WellController.
2021-10-18 12:38:49 +05:00
KharchenkoVladimir
3a6f5e7f5e
Added last received telemetry date in WellDto
2021-10-15 15:35:18 +05:00
KharchenkoVladimir
02f344569e
CS2-91: Moved TelemetryTracker from WellService to TelemetryService
2021-10-15 12:24:04 +05:00
Фролов
83d1527039
Add IdWellOperationCategory to DrillFlowChartDto and doc.
2021-10-15 10:01:09 +05:00
Фролов
caae2f970c
Add DrillParamsController.SaveAsync() it removes old records before add new ones.
2021-10-14 17:57:25 +05:00
KharchenkoVladimir
8e447a040f
Added method for returning wells with drill params only (in DepositController)
2021-10-14 12:04:21 +05:00
KharchenkoVladimir
32732bf058
Fixed DrillFlowChart routes, model, dto names
2021-10-14 10:18:43 +05:00
KharchenkoVladimir
7c41fc5b91
Added dtoId param in DrillParamsService.UpdateAsync()
2021-10-13 17:37:40 +05:00
KharchenkoVladimir
4f4eb4333a
Merge branch 'DrillingFlowChart' into dev
2021-10-13 17:35:14 +05:00
KharchenkoVladimir
911deb5b8b
CS2-97: Added DrillFlowChartParams infrastructure
2021-10-13 17:34:32 +05:00
Фролов
4878a8c25c
Add SpinPlcVersion to TelemetryInfoDto
2021-10-13 17:15:00 +05:00
KharchenkoVladimir
70ee22bccf
CS2-96: Added DrillParams methods to get composite well drill params
2021-10-13 12:27:40 +05:00
Фролов
50c3cca8b8
CS2-84 При формировании статистики по кусту нет фильтра по доступным скважинам
2021-10-12 18:06:47 +05:00
Фролов
b800759a09
CS2-95 В WellOperationStatController добавить метод получения статистики по скважинам и секциям по массиву id скважин
2021-10-12 16:07:08 +05:00
Фролов
f7fedb16e8
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
2021-10-12 12:17:58 +05:00
Фролов
3bff1d0daf
Add WellCompositeController
2021-10-12 12:17:46 +05:00
KharchenkoVladimir
2b77fdae98
CS2-94: Added .GetAll() method to DrillParamsService
2021-10-12 12:02:28 +05:00
KharchenkoVladimir
bf7c0895b3
Merge remote-tracking branch 'origin/dev' into dev
2021-10-12 11:30:21 +05:00
KharchenkoVladimir
99f8a36437
CS2-94: Fixed DrillParamsService and Dto
2021-10-12 11:30:07 +05:00
Фролов
638d8eb3da
Drop useless method
2021-10-12 11:26:41 +05:00
Фролов
e05c291b2b
Add model WellComposite
2021-10-12 10:39:42 +05:00
Фролов
97df21c58b
Remove WellService.GetOperationsAsync() redundant method
2021-10-12 10:31:17 +05:00
KharchenkoVladimir
a860bde21e
Merge branch 'DrillingModes' into dev
2021-10-11 16:43:48 +05:00
KharchenkoVladimir
32784c31f9
CS2-94: Edited DrillParamsService to extend CrudService
2021-10-11 16:43:10 +05:00
Фролов
e7a4164eaf
Rename DrillingParam.Consumption to Flow
2021-10-11 16:20:07 +05:00
KharchenkoVladimir
47397e4ad6
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
2021-10-11 15:32:06 +05:00
KharchenkoVladimir
4168e63dad
Merge branch 'DrillingModes' into dev
2021-10-11 15:31:17 +05:00
KharchenkoVladimir
afd2801715
CS2-94: Added main DrillParams controller and service methods
2021-10-11 15:21:26 +05:00
Фролов
9117471f82
WellOperationImportService Add GetTemplate(),
...
Improve error handling.
2021-10-11 13:45:06 +05:00
KharchenkoVV
c962374b6c
CS2-94: Added Drilling params controller, service and model
2021-10-10 13:35:43 +05:00
Фролов
e604d8a031
make WellOperations import and export. ExcelTemplate embedded to infrastructure.
2021-10-09 20:16:22 +05:00
Фролов
4fe570f3e9
Refactor WellOperation WellDepth split to DepthStart and DepthEnd.
...
Fix other services to use new model.
2021-10-08 11:30:06 +05:00
Фролов
4cec602678
refactor IFileService. Rename DeletedAsync method to DeleteAsync
2021-10-06 18:07:35 +05:00
KharchenkoVV
1f4a55c5df
Fixed Measure controller to return all measure history at once
2021-10-05 18:02:02 +05:00
Фролов
ae9b23cc00
Refactor TelemetryAnalysis.
2021-10-01 15:44:56 +05:00
KharchenkoVV
84cb9f6d3b
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
2021-09-30 16:41:16 +05:00
KharchenkoVV
a589775ceb
Fixed telemetry analytics calculation logic
2021-09-30 16:41:00 +05:00
Фролов
4c08a2963f
Add fileDto to reportprops dto. For unification download mechanism.
2021-09-30 12:38:29 +05:00
Фролов
fb38348618
Add DRAFT telemetry merge
2021-09-29 10:12:54 +05:00
Фролов
c2c9bad200
merge master (hotfix) to dev.
2021-09-27 16:53:54 +05:00
Фролов
eb3668a8ba
mark legacy as Obsolete. till panels full update.
2021-09-27 16:48:24 +05:00
KharchenkoVV
40b83826a4
CS2-88: Changed telemetry analysis start event.
2021-09-27 11:47:39 +05:00
KharchenkoVV
804bdc6175
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
2021-09-24 11:17:42 +05:00
KharchenkoVV
53ef4425c9
CS2-87: Added well depth display to messages table.
2021-09-24 11:17:31 +05:00
Фролов
86e929d920
comment
2021-09-23 17:58:56 +05:00
Фролов
214c4dc84b
Add IFileService.MoveAsync;
2021-09-23 11:55:25 +05:00
