KharchenkoVladimir
|
6b2c4a359b
|
Added register params validation
|
2021-10-22 17:41:00 +05:00 |
|
KharchenkoVladimir
|
9fea1c94a6
|
Fixed Login. Users with State == 0 will not be authenticated
|
2021-10-21 17:24:25 +05:00 |
|
KharchenkoVladimir
|
d63573c67d
|
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
Conflicts:
AsbCloudInfrastructure/Services/WellService.cs
|
2021-10-21 15:59:16 +05:00 |
|
KharchenkoVladimir
|
5b82229a94
|
Fixed WellDto creation in WellService (fixed LastTelemetryDate field)
|
2021-10-21 15:57:20 +05:00 |
|
Фролов
|
41b07fe481
|
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
|
2021-10-20 17:56:56 +05:00 |
|
Фролов
|
395d164c92
|
Refactor WellService.GetAsync()
|
2021-10-20 17:56:36 +05:00 |
|
Фролов
|
8b54966876
|
Fix security in WellController
|
2021-10-20 17:55:50 +05:00 |
|
KharchenkoVladimir
|
d19a62c041
|
Added Id well type field in WellDto
|
2021-10-20 16:57:35 +05:00 |
|
KharchenkoVladimir
|
167dd3d5f5
|
Added Get well by id method in WellController
|
2021-10-20 16:18:07 +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 |
|
Фролов
|
701f5b26d2
|
Rename Well.State to Well.IdState
|
2021-10-20 11:21:14 +05:00 |
|
KharchenkoVladimir
|
16e17c0559
|
Fixed error text back in AuthController.Register().
|
2021-10-19 17:21:07 +05:00 |
|
KharchenkoVladimir
|
1d26c3dc9d
|
Auth controller very minor changes
|
2021-10-19 16:58:40 +05:00 |
|
KharchenkoVladimir
|
387b01c44d
|
CS2-72: Added email, phone and position in UserDto.
|
2021-10-19 15:22:18 +05:00 |
|
Фролов
|
e92859439e
|
nit refactor WellService.UpdateWellAsync(..) throw exception instad of return null
|
2021-10-19 11:17:16 +05:00 |
|
Фролов
|
54d78ddd0e
|
Fix import WellOperations edit WellOperationCategory default data
|
2021-10-19 10:34:11 +05:00 |
|
Фролов
|
aab6064153
|
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
|
2021-10-19 10:28:52 +05:00 |
|
Фролов
|
a50913f078
|
Fix DrillingProgramService sheet duplicate name resolver;
Fix FileSrvice.GetInfosByCategoryAsync(..) doesn't return deleted files;
Update Frontend;
|
2021-10-18 17:38:07 +05:00 |
|
KharchenkoVladimir
|
1a8e7bcb76
|
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
|
2021-10-18 16:30:25 +05:00 |
|
KharchenkoVladimir
|
37e03b3f0d
|
CS2-98: Added WellUpdateParamsDto in WellController.UpdateWellAsync().
|
2021-10-18 16:30:14 +05:00 |
|
Фролов
|
6e9ab38d47
|
nit some refactoring in DrillingProgramService
|
2021-10-18 16:23:58 +05:00 |
|
KharchenkoVladimir
|
64d6d8c8f8
|
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
|
2021-10-18 12:39:01 +05:00 |
|
KharchenkoVladimir
|
6e4c85843f
|
CS2-98: Added State to Well. Added .UpdateWell() in WellController.
|
2021-10-18 12:38:49 +05:00 |
|
Фролов
|
0a3891a332
|
fix CacheDb. Make cache ConcurrentDictionary
|
2021-10-18 11:06:42 +05:00 |
|
KharchenkoVladimir
|
589959c802
|
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
|
2021-10-18 10:45:18 +05:00 |
|
KharchenkoVladimir
|
ddf8f35214
|
Fixed .DetLastTelemetryDate() in TelemetryService
|
2021-10-18 10:44:53 +05:00 |
|
Фролов
|
11cf5ee8cf
|
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
|
2021-10-18 09:07:59 +05:00 |
|
Фролов
|
a48f139d26
|
doc zipeed backup
|
2021-10-18 09:07: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 |
|
Фролов
|
aed661f202
|
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
|
2021-10-14 17:14:11 +05:00 |
|
Фролов
|
b9eaf36a65
|
Fix CrudServiceBase.Insert*: set "Id" prop to 0 before inserrt.
|
2021-10-14 17:13:57 +05:00 |
|
KharchenkoVladimir
|
6886e86832
|
Added IdWellOperationCategory to DrillChart model
|
2021-10-14 17:02:20 +05:00 |
|
Фролов
|
2173f6593f
|
Fix DrillFlowChartController autorization.
Fix DrillFlowChartController.GetByTelemetryAsync() assertion
|
2021-10-14 16:16:35 +05:00 |
|
Фролов
|
91878bda5c
|
Fix WellComposite model FK; WellCompositeService automapping
Rename DrillFlowChartParams to DrillFlowChart
|
2021-10-14 14:46:20 +05:00 |
|
KharchenkoVladimir
|
aa977e4db5
|
Added WellCompositeService in DependencyInjection
|
2021-10-14 12:30:51 +05:00 |
|
KharchenkoVladimir
|
8e447a040f
|
Added method for returning wells with drill params only (in DepositController)
|
2021-10-14 12:04:21 +05:00 |
|
Фролов
|
03813b9403
|
DrillFlowChartController. Edit routes
|
2021-10-14 11:46:17 +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 |
|
Фролов
|
4892d76a90
|
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
|
2021-10-13 17:15:20 +05:00 |
|
Фролов
|
4878a8c25c
|
Add SpinPlcVersion to TelemetryInfoDto
|
2021-10-13 17:15:00 +05:00 |
|
KharchenkoVladimir
|
e31780571b
|
CS2-94: Fixed DrillParamsService queries
|
2021-10-13 15:56:23 +05:00 |
|
Фролов
|
80fdfce467
|
nit WellOperationsStatService Add companies to wells with no operations
|
2021-10-13 15:53:43 +05:00 |
|
Фролов
|
6439bba779
|
Fix WellOperationsStatService.GetStatClusterAsync() Add empty stat for wells with no operations
|
2021-10-13 15:45:24 +05:00 |
|