Фролов
|
00dd39b587
|
merge dev to this
|
2021-12-03 09:58:48 +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
|
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
|
d361c9a9b4
|
CS2-107: Added calculation of max and average Rop for cluster wells
|
2021-11-22 17:29:19 +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
|
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 |
|
Фролов
|
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
|
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
|
45b4d8bb23
|
CS2-106: Fixed Drilling program creation and preview logic
|
2021-10-29 12:47:18 +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 |
|
Фролов
|
83d1527039
|
Add IdWellOperationCategory to DrillFlowChartDto and doc.
|
2021-10-15 10:01:09 +05:00 |
|
KharchenkoVladimir
|
32732bf058
|
Fixed DrillFlowChart routes, model, dto names
|
2021-10-14 10:18:43 +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
|
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 |
|
Фролов
|
e05c291b2b
|
Add model WellComposite
|
2021-10-12 10:39:42 +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
|
afd2801715
|
CS2-94: Added main DrillParams controller and service methods
|
2021-10-11 15:21:26 +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 |
|
Фролов
|
4c08a2963f
|
Add fileDto to reportprops dto. For unification download mechanism.
|
2021-09-30 12:38:29 +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 |
|