Commit Graph

143 Commits

Author SHA1 Message Date
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
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
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
KharchenkoVV
1f4a55c5df Fixed Measure controller to return all measure history at once 2021-10-05 18:02:02 +05:00
Фролов
90bdb264cb fix Get* methods. add orderBy, specify dateTimeKind and return value:) 2021-09-29 17:05:27 +05:00
Фролов
fb38348618 Add DRAFT telemetry merge 2021-09-29 10:12:54 +05:00
Фролов
eb3668a8ba mark legacy as Obsolete. till panels full update. 2021-09-27 16:48:24 +05:00
Фролов
956e564f56 переименовал ряд методов для лучшего понимания 2021-09-23 15:26:55 +05:00
Фролов
83e592ba86 CS2-60 ReportGenerator выдает неправильные значения при отсутствии данных в БД. 2021-09-23 15:26:55 +05:00
Фролов
0b1f9683b9 fix jsonSerializer settings;
reafctor TelemetryHub;
Add wellDepth into TelemetryMessage
2021-09-17 16:24:01 +05:00
Фролов
35cd538b1d Refactor DataSaubBase to TelemetryDataSaub;
Add generic TelemetryDataController;
Add TelemetryDataSpin and model;
Add migration;
2021-09-14 17:17:33 +05:00
KharchenkoVV
e8063057d7 Added .GetOperationsDateRangeAsync() to Telemetry analytics controller 2021-09-10 15:23:36 +05:00
Фролов
30a59d0809 cleanup 2021-09-10 11:28:57 +05:00
Фролов
73fab69b76 AuthController Добавлена регистрация пользователя и смена пароля 2021-09-07 09:49:25 +05:00
Фролов
b471efc59e File author is optional (for drillingProgram) 2021-09-01 15:55:10 +05:00
Фролов
a7962492af fileController search by companyName (not by companyId).
Add UserDto into FileInfoDto.
Add CompanyDto into UserDto.
2021-08-31 18:01:26 +05:00
Фролов
41660af49f FileController Add file size and fix search by file name 2021-08-31 12:29:27 +05:00
Фролов
e87e959bca CS2-58 FileController doc 2021-08-31 10:02:04 +05:00
Фролов
b3b1230c0a CS2-58 FileController Add filter by filename 2021-08-31 09:59:23 +05:00
Фролов
e8bfe3b443 add new file categories 2021-08-31 09:52:32 +05:00
Фролов
ebd3e4ec4c rename lastDataService to measureService 2021-08-31 09:52:15 +05:00
Фролов
4e0e9b93d7 fix route in DrillingProgramController 2021-08-29 17:29:24 +05:00
Фролов
14cf99a1dd Add DrillingProgramController 2021-08-29 17:25:16 +05:00
Фролов
80d74067c0 MeasureService Add GetLastAsync 2021-08-28 22:34:57 +05:00
Фролов
9724b24d98 LastData rename to Measure. Implement MeasureService 2021-08-28 20:00:04 +05:00
Фролов
843dd276a3 NotCompleted LasdData Weekend 2021-08-27 17:55:22 +05:00
Фролов
ac57a69670 Add CalcTvd to WellOperationsStatService 2021-08-27 12:15:04 +05:00
Фролов
85ff9a5903 StatController mathod renames 2021-08-25 11:30:50 +05:00
Фролов
e55f505ea7 Refactor Stat* models 2021-08-25 11:13:56 +05:00
Фролов
94b7dd3ef7 All statisstic moved to WellOperationStatService.
Stats reorganized
2021-08-24 16:47:10 +05:00
Фролов
99d242101e remove efModel wellSection. Cleanup. Split categories lastData and files 2021-08-24 10:59:10 +05:00
KharchenkoVV
a0856fad25 CS2-66: Added well depth filter to .GetOperationsAsync() 2021-08-23 16:59:26 +05:00
KharchenkoVV
791f72cbdb CS2-65: United GetSectionsData() and GetWholeWellData() methods 2021-08-20 16:56:21 +05:00
Фролов
cec8e92d77 Clean and doc 2021-08-20 14:17:53 +05:00
KharchenkoVV
fbff8e986a CS2-65: Added operations calculation for whole well 2021-08-20 13:56:01 +05:00
KharchenkoVV
0e586edcc5 CS2-58: Added [FromQuery] to 'companies' param 2021-08-20 11:46:14 +05:00
KharchenkoVV
b39f07821d CS2-58: Added files filtering by requested companies ids 2021-08-20 11:20:24 +05:00
KharchenkoVV
d0deefe74f CS2-56: Changed tuple to FileInfoDto 2021-08-19 17:32:22 +05:00
KharchenkoVV
8b5af8d32e CS2-59: Added Delete() to File controller 2021-08-19 16:58:26 +05:00
KharchenkoVV
e8d98a0887 CS2-55: Renamed SaveFileProperties...() to SaveFileInfos() 2021-08-19 16:34:36 +05:00