on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity
385 Commits 1 Branch 0 Tags 38 MiB
b800759a09
Commit Graph

171 Commits

Author SHA1 Message Date
Фролов
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
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
KharchenkoVV
1f4a55c5df Fixed Measure controller to return all measure history at once 2021-10-05 18:02:02 +05:00
Фролов
031ff8c747 Add migration. Set Telemetry forign keys on delete - cascade. 2021-10-01 17:37:44 +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
Фролов
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
KharchenkoVV
8d3abf0fed New front 2021-09-23 16:07:23 +05:00
KharchenkoVV
059475e96a CS2-74: Changed using NPOI library to ClosedXML 2021-09-23 15:26:55 +05:00
Фролов
956e564f56 переименовал ряд методов для лучшего понимания 2021-09-23 15:26:55 +05:00
Фролов
83e592ba86 CS2-60 ReportGenerator выдает неправильные значения при отсутствии данных в БД. 2021-09-23 15:26:55 +05:00
Фролов
404c52b001 Add linkFile for panel. //After copy make it executable 2021-09-23 15:26:54 +05:00
Фролов
38e7f624b1 fix reports. 2021-09-20 15:25:08 +05:00
Фролов
711dfa681d Fix fail messageController on telemetry user is null. 2021-09-20 10:33:15 +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
Фролов
787627d439 Update react client build 2021-09-13 16:04:46 +05:00
Фролов
cb1ab8c842 hotfix Configure System.Text.Json.JsonSerializer to handle inf, -inf, NaN 2021-09-13 11:02:54 +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
Фролов
f2adaaa377 make .service file part of the build 2021-09-06 10:10:36 +05:00
Фролов
2555b7f490 nit doc 2021-09-03 18:02:50 +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