Commit Graph

276 Commits

Author SHA1 Message Date
Фролов
1eaa1efb03 Refactor. Extract TimezoneService. 2021-11-22 11:30:08 +05:00
KharchenkoVladimir
07f76afa35 CS107: Renamed Mse to Rop in Cluster rop stat 2021-11-19 11:17:45 +05:00
KharchenkoVladimir
00798becb0 CS2-107: Added ClusterOperationStatController 2021-11-19 11:12:25 +05:00
KharchenkoVladimir
e62ac96bd7 CS2-119: Added .FixDatesRangeByTimeZoneAsync() to fix dates ranges to well timezone everywhere 2021-11-18 12:03:59 +05:00
KharchenkoVladimir
4bed0623f1 CS2-119: Added dates change to well timezone if requested 2021-11-18 11:24:21 +05:00
Фролов
b6c2f60296 fix use fileshare only when needed. 2021-11-17 13:06:48 +05:00
KharchenkoVladimir
53dbb2d959 CS2-119: Added timezone info receive method in TelemetryService 2021-11-16 17:14:36 +05:00
KharchenkoVladimir
88f9236b8a CS2-119: Added Telemetry Timezone object and update timezone functionality 2021-11-16 13:14:31 +05:00
Фролов
212989b3b6 fix analyze recomendations 2021-11-15 16:52:12 +05:00
Фролов
864d851b6a BIG. Add timescaleDB into DB.
Adapt contect to use hypertables.
Refactor TelemetryDataBaseService to avoid duplicate keys and try to save as more as posible
2021-11-13 18:47:11 +05:00
Фролов
9c2f0fed9c Remove trace monitors. 2021-11-11 15:59:29 +05:00
Фролов
fd74ae20a0 CS2-117, CS2-112
Add exception handle middleware.
Move middlawares into separate files.
2021-11-10 17:04:07 +05:00
Фролов
bfb76b9dc0 Add request tracker. it also track users activity. 2021-11-10 14:23:53 +05:00
Фролов
170693f445 Refactor:
FilesService move FileSharing functions to GoogleDriveService;
FilesService.CreateFileMarkAsync() Move drillingProgram related logic into DrillingProgramService.CreateFileMarkAsync();
FilesService.MarkFileMarkAsDeletedAsync() Move drillingProgram related logic into DrillingProgramService.MarkFileMarkAsDeletedAsync();
IGoogleDriveService cleanup and rename to IFileShareService;
GoogleDriveService check token before usage and resresh it id needeed;
DrillingProgramController move logic to service;
DrillingProgramController use dto;
FileController remove unused method;
2021-11-09 17:36:44 +05:00
Фролов
1fd6d3e062 doc. 2021-11-09 17:26:47 +05:00
cult
e716c6fbeb CS2-104: Added deleting of existing drilling program on file marks actions 2021-11-03 14:12:39 +05:00
cult
2f2193da76 CS2-104: Added recreate of drilling program if new files were confirmed 2021-11-02 16:33:49 +05:00
cult
a53d557f2a CS2-104: Added confirm of drilling program parts 2021-11-01 16:41:25 +05:00
Фролов
62a38aeeaf Refactor TelemetryData*dtos for smaller size.
Add protobuf.
2021-10-31 16:35:09 +05:00
cult
e79cf9f5d1 CS2-106: Inserted logic from DrillingProgram controller in fileService.GetFileWebUrlAsync() 2021-10-29 16:03:24 +05:00
cult
45b4d8bb23 CS2-106: Fixed Drilling program creation and preview logic 2021-10-29 12:47:18 +05:00
cult
e8ad17bc1d CS2-106: Added .GetFileWebLinkAsync() in DrillingProgramController.cs 2021-10-28 16:59:00 +05:00
cult
c3be8bceea CS2-106: Fixed .GetAsync() in DrillingProgramController to return file web url in cloud 2021-10-28 15:08:06 +05:00
Фролов
da9e94b4b9 Modify telemetry tracker to keep remote and server dates.
Update related services.
Small refactor TelemetryController: exclude dictionaries updates  from tracker update. All tracker updates moved to services.
2021-10-28 10:56:18 +05:00
Фролов
5966920019 nit refactoring 2021-10-27 17:48:19 +05:00
cult
2ab29df231 CS2-106: Added description that web url for drilling program file is created only if such file was created. 2021-10-27 17:23:43 +05:00
cult
ab13e97837 CS2-106: Added GoogleDriveService and .GetWebLink() to DrillingProgramController 2021-10-27 17:00:27 +05:00
KharchenkoVladimir
488107a804 CS2-106: Added google drive publish files manual 2021-10-26 18:03:18 +05:00
KharchenkoVladimir
b553f74a50 Added return type descriptions for BaseControllers classes 2021-10-25 17:38:52 +05:00
KharchenkoVladimir
23a467639a Merge branch 'NewRegister' into dev 2021-10-25 12:05:44 +05:00
KharchenkoVladimir
2ce110ea8f Added 'User already exists' check in .Register() 2021-10-25 12:04:34 +05:00
KharchenkoVladimir
6b2c4a359b Added register params validation 2021-10-22 17:41:00 +05:00
KharchenkoVladimir
9fea1c94a6 Fixed Login. Users with State == 0 will not be authenticated 2021-10-21 17:24:25 +05:00
Фролов
8b54966876 Fix security in WellController 2021-10-20 17:55:50 +05:00
KharchenkoVladimir
167dd3d5f5 Added Get well by id method in WellController 2021-10-20 16:18:07 +05:00
Фролов
eab95cb7a1 Refactor GetLastTelemetryDate(..) in services (single resp).
Add State and LastTelemetryDate into StatWellDto.
2021-10-20 12:52:31 +05:00
KharchenkoVladimir
16e17c0559 Fixed error text back in AuthController.Register(). 2021-10-19 17:21:07 +05:00
KharchenkoVladimir
1d26c3dc9d Auth controller very minor changes 2021-10-19 16:58:40 +05:00
KharchenkoVladimir
387b01c44d CS2-72: Added email, phone and position in UserDto. 2021-10-19 15:22:18 +05:00
Фролов
aab6064153 Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev 2021-10-19 10:28:52 +05:00
Фролов
a50913f078 Fix DrillingProgramService sheet duplicate name resolver;
Fix FileSrvice.GetInfosByCategoryAsync(..) doesn't return deleted files;
Update Frontend;
2021-10-18 17:38:07 +05:00
KharchenkoVladimir
37e03b3f0d CS2-98: Added WellUpdateParamsDto in WellController.UpdateWellAsync(). 2021-10-18 16:30:14 +05:00
KharchenkoVladimir
6e4c85843f CS2-98: Added State to Well. Added .UpdateWell() in WellController. 2021-10-18 12:38:49 +05:00
KharchenkoVladimir
02f344569e CS2-91: Moved TelemetryTracker from WellService to TelemetryService 2021-10-15 12:24:04 +05:00
Фролов
caae2f970c Add DrillParamsController.SaveAsync() it removes old records before add new ones. 2021-10-14 17:57:25 +05:00
Фролов
2173f6593f Fix DrillFlowChartController autorization.
Fix DrillFlowChartController.GetByTelemetryAsync() assertion
2021-10-14 16:16:35 +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
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
KharchenkoVladimir
e31780571b CS2-94: Fixed DrillParamsService queries 2021-10-13 15:56:23 +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
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