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 |
|
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
|
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 |
|
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 |
|
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 |
|
KharchenkoVV
|
bf823e1825
|
CS2-55: Moved file saving logic from File controller to service
|
2021-08-19 16:32:04 +05:00 |
|
Фролов
|
c5dedfc03e
|
WellOperationController.GetCategories() fix return type
|
2021-08-19 12:24:57 +05:00 |
|
Фролов
|
a685418cf0
|
rename WellOperationController.GetAllAsync(..) to GetOperationsAsync(..)
|
2021-08-18 17:25:40 +05:00 |
|
KharchenkoVV
|
154426a5fb
|
Changed WellOperation fileds names
|
2021-08-18 17:09:57 +05:00 |
|
Фролов
|
7b154abb66
|
CS2-61 WellOperationController.GetAllAsync(..) добавить параметры фильтрации
|
2021-08-18 16:57:20 +05:00 |
|
KharchenkoVV
|
977645e23a
|
CS2-54: Added Well section data calculation
|
2021-08-18 14:52:52 +05:00 |
|
KharchenkoVV
|
d6bf5d3252
|
Added IdUser claim to authenticated user claims
|
2021-08-17 13:03:17 +05:00 |
|
KharchenkoVV
|
b1495dda34
|
DataController route fix
|
2021-08-17 09:43:09 +05:00 |
|
KharchenkoVV
|
0e662d4868
|
Fixed controllers routes
|
2021-08-17 09:39:05 +05:00 |
|
KharchenkoVV
|
d1f67dc69c
|
WellOperation Controller and Service fix
|
2021-08-17 09:20:31 +05:00 |
|