on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity
559 Commits 1 Branch 0 Tags 37 MiB
6565957c34
Commit Graph

559 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Фролов
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
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
KharchenkoVladimir
e34bb4b554 Renamed DrillParamsController methods 2021-10-12 12:50:04 +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
Фролов
91c85c8fdc Remove obsolete dataService; remove db mdel dependendency from webApi 2021-10-12 11:03:05 +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
Фролов
b93ff717f2 Rename DrillingParam.TopDrive* to Rotor* 2021-10-11 16:39:40 +05:00
Фролов
e7a4164eaf Rename DrillingParam.Consumption to Flow 2021-10-11 16:20:07 +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
Фролов
674fe9586c nit Console1. Add some order to experiments 2021-10-08 11:30:57 +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