Фролов
2019386a71
fix AdminCompanyController.Get*(). Include CompanyType
2021-12-22 15:58:49 +05:00
Фролов
ea26010719
fix MeasureController.GetHisoryAsync
2021-12-22 12:31:37 +05:00
Фролов
6924a6bac7
start refactoring// fire alarm
2021-12-21 11:52:53 +05:00
Фролов
a0208f412e
refactor UserRoleService
2021-12-20 15:17:09 +05:00
Фролов
7c24d52fa2
Merge branch 'dev' into NewUserRoles
2021-12-20 15:13:36 +05:00
Фролов
c10c698cbe
add return type description in RequerstTrackerController.GetUsersStat()
2021-12-17 16:30:00 +05:00
Харченко Владимир
3aa7bac5e6
CS2-133: Removed mask from Permission property.
2021-12-17 14:26:19 +05:00
Фролов
31b671a0c7
remove unused methods
2021-12-17 13:04:33 +05:00
Фролов
e0834e4720
add telemetry merge
2021-12-17 12:48:58 +05:00
Харченко Владимир
d94b2e685e
CS2-133: Fixed CRUD operations over Permissions
2021-12-17 12:38:34 +05:00
Харченко Владимир
17db1218cc
CS2-133: Removed permission mask logic from permissions
2021-12-16 16:00:47 +05:00
Фролов
6925746da9
Add attribute and middleware for permissions autirization.
2021-12-11 16:47:28 +05:00
Фролов
551c60c4ff
Add/refactor services for permissions authorization model.
...
Rename some fields in DB.permission.
2021-12-11 16:46:04 +05:00
Фролов
5752ad40b7
some rider recommendations and spelling
2021-12-07 18:27:52 +05:00
Фролов
9a7d2b4140
Remove ReportService.GetSuitableReportsAsync()
2021-12-07 13:55:39 +05:00
Фролов
819bc82227
MeasureService.GetHisoryAsync(..) uses idCategory arg
2021-12-07 13:43:47 +05:00
Фролов
ee01ab30db
Забрал домой
2021-12-07 11:34:06 +05:00
Фролов
fa3e47493b
Doc timascale backup and restore.
2021-12-03 17:34:24 +05:00
Фролов
539905e8e0
Use cacheTable for roles and permissions
2021-12-03 15:03:33 +05:00
Фролов
00dd39b587
merge dev to this
2021-12-03 09:58:48 +05:00
Фролов
4aaac31c43
nit refacroring before merge
2021-12-03 09:44:10 +05:00
KharchenkoVladimir
b655360835
CS2-123: Added AdminPermissionController methods
2021-12-02 12:03:30 +05:00
Фролов
cdb8207c35
fix program args parsing
2021-12-02 11:24:54 +05:00
Фролов
fdf5a6ecd6
Add startup argument db_init to start just for migrate DB
2021-12-02 11:11:14 +05:00
KharchenkoVladimir
22c5d33b7e
CS2-123: Added AdminPermissionController and Service
2021-12-01 17:10:17 +05:00
Фролов
a74a7cbf58
doc RequestTracker
2021-12-01 12:53:10 +05:00
Фролов
bc77b128b0
Fix setpoints dictionary by Oleg's info.
...
Update default client build
2021-11-30 15:25:29 +05:00
Фролов
ee2172f64b
fix SetpointsController. Add AllowAnonymous.
...
fix doc for backup db.
2021-11-26 17:14:02 +05:00
KharchenkoVladimir
576d119674
CS2-123: Changed UserRoleService and controller to inherit CrudController/service
2021-11-25 11:55:52 +05:00
Фролов
26ada6572b
Add SetpointInfoDto
2021-11-24 17:58:53 +05:00
KharchenkoVladimir
908c855463
CS2-123: Added CRUD over user roles and their permissions (controller + service)
2021-11-24 17:38:40 +05:00
Фролов
18ad9fc91a
CS2-124 Создать контроллер рекомендый новыйх уставок бурильщику
2021-11-24 16:16:17 +05:00
Фролов
a74032eed5
Fix TelemetryTracker dbContext disposing.
2021-11-23 16:16:13 +05:00
KharchenkoVladimir
6412c24a3e
CS2-107: Fixed rop stat methods routes
2021-11-23 14:07:43 +05:00
KharchenkoVladimir
cb52f96069
Merge branch 'dev' into MaxAndAverageRop
...
# Conflicts:
# AsbCloudInfrastructure/Services/WellService.cs
2021-11-23 11:35:11 +05:00
KharchenkoVladimir
d361c9a9b4
CS2-107: Added calculation of max and average Rop for cluster wells
2021-11-22 17:29:19 +05:00
Фролов
0b66648267
fix AsbCloudWebApi.Controllers.WellOperationController.ExportAsync. NullRef in WellService.Convert().
2021-11-22 14:14:44 +05:00
Фролов
809ee137aa
fix TelemetryAnalyticsService.AnalyzeAndSaveTelemetriesAsync().
2021-11-22 14:04:05 +05:00
Фролов
f4f4974cdd
remove usless projects
2021-11-22 12:06:10 +05:00
Фролов
14bc1e12b4
Merge branch 'TelemetryTimeZone' into dev
2021-11-22 11:31:10 +05:00
Фролов
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
