Фролов
|
91878bda5c
|
Fix WellComposite model FK; WellCompositeService automapping
Rename DrillFlowChartParams to DrillFlowChart
|
2021-10-14 14:46:20 +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
|
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 |
|
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 |
|
Фролов
|
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 |
|
Фролов
|
eac38b6139
|
Remove dead "DataController"
|
2021-10-11 16:00:52 +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 |
|
Фролов
|
d73cc9692f
|
Replace WellOperationImportTemplate.xltx to WellOperationImportTemplate.xlsx
|
2021-10-11 15:28:21 +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 |
|
Фролов
|
2868304546
|
Draft WellOperationImportService. incomplete
|
2021-10-08 17:00:30 +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 |
|
KharchenkoVV
|
eac35cd3e9
|
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
|
2021-10-08 11:12:57 +05:00 |
|
KharchenkoVV
|
47e62f395a
|
Removed Measures from db demo data
|
2021-10-08 11:12:43 +05:00 |
|
Фролов
|
4cec602678
|
refactor IFileService. Rename DeletedAsync method to DeleteAsync
|
2021-10-06 18:07:35 +05:00 |
|
Фролов
|
197142eca2
|
Fix tvd predict
|
2021-10-06 16:30:46 +05:00 |
|
KharchenkoVV
|
1f4a55c5df
|
Fixed Measure controller to return all measure history at once
|
2021-10-05 18:02:02 +05:00 |
|
Фролов
|
e1457471c8
|
unpatch cache path by permanent solution
|
2021-10-04 15:54:58 +05:00 |
|
Фролов
|
8e6384e46c
|
make cache sinchronized.
|
2021-10-04 15:52:22 +05:00 |
|
Фролов
|
cdfcb0b2f7
|
semaphore
|
2021-10-03 20:08:17 +05:00 |
|
Фролов
|
031ff8c747
|
Add migration. Set Telemetry forign keys on delete - cascade.
|
2021-10-01 17:37:44 +05:00 |
|
Фролов
|
ae9b23cc00
|
Refactor TelemetryAnalysis.
|
2021-10-01 15:44:56 +05:00 |
|
Фролов
|
8362aa6ffa
|
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
|
2021-09-30 18:03:34 +05:00 |
|
Фролов
|
427a713095
|
nit WellOperation.id = default on Add
|
2021-09-30 18:02:50 +05:00 |
|
KharchenkoVV
|
3c9745474a
|
Added drilling operations to Telemetry analytics calculation
|
2021-09-30 17:10:12 +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 |
|
Фролов
|
90bdb264cb
|
fix Get* methods. add orderBy, specify dateTimeKind and return value:)
|
2021-09-29 17:05:27 +05:00 |
|
KharchenkoVV
|
b60b84b45c
|
Fixed Telemetry analysis start depending on analyze start date
|
2021-09-29 12:20:19 +05:00 |
|