Commit Graph

374 Commits

Author SHA1 Message Date
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
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
Фролов
1a36609d19 New well operation category 2021-10-06 18:06:07 +05:00
Фролов
197142eca2 Fix tvd predict 2021-10-06 16:30:46 +05:00
Фролов
3d1f96655a doc. Add useful sql queries 2021-10-06 16:30:28 +05:00
KharchenkoVV
22f13cdfcc Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev 2021-10-05 18:02:16 +05:00
KharchenkoVV
1f4a55c5df Fixed Measure controller to return all measure history at once 2021-10-05 18:02:02 +05:00
Фролов
3a8e985113 Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev 2021-10-05 09:24:40 +05:00
Фролов
81fc9ae131 Console1 nit 2021-10-05 09:24:25 +05:00
KharchenkoVV
5b41d017a1 Added new Measures in DemoData filler 2021-10-04 18:07:42 +05:00
Фролов
00fb84173b merge 2021-10-04 15:56:35 +05:00
Фролов
e1457471c8 unpatch cache path by permanent solution 2021-10-04 15:54:58 +05:00
Фролов
cc9896c062 fix ControllerLoadTester requests. 2021-10-04 15:54:01 +05:00
Фролов
8e6384e46c make cache sinchronized. 2021-10-04 15:52:22 +05:00
KharchenkoVV
343d8382d9 Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev 2021-10-04 15:42:06 +05:00
KharchenkoVV
fc32af3a91 Added demo values for Measures 2021-10-04 15:41:47 +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
Фролов
098e8743b0 Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev 2021-10-01 15:45:15 +05:00
Фролов
ae9b23cc00 Refactor TelemetryAnalysis. 2021-10-01 15:44:56 +05:00
KharchenkoVV
1ff5f3b6c8 Added telemetry info and data saub requests to ControllersLoadTester.cs 2021-10-01 15:27:54 +05:00
Фролов
28b60250be react client update 2021-09-30 18:04:46 +05:00
Фролов
a5894b05d4 another section options 2021-09-30 18:04:28 +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
Фролов
c0918652a3 Disable TelemetryAnalyticsBackgroundService 2021-09-29 10:44:11 +05:00
Фролов
093c1eafa3 Fix TelemetryAnalyticsBackgroundService inf loop 2021-09-29 10:27:49 +05:00
Фролов
11604d8157 Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev 2021-09-29 10:26:41 +05:00