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

415 Commits

Author SHA1 Message Date
Фролов
bc77b128b0 Fix setpoints dictionary by Oleg's info. 
Update default client build
 2021-11-30 15:25:29 +05:00
KharchenkoVladimir
9280b28e10 CS2-123: Returned table for roles permissions. 2021-11-29 17:34:53 +05:00
KharchenkoVladimir
2d9388cb2a Revert "CS2-123: Changed role permissions to bit collection" 
This reverts commit ad34e6445c.
 2021-11-29 12:39:28 +05:00
Фролов
ee2172f64b fix SetpointsController. Add AllowAnonymous. 
fix doc for backup db.
 2021-11-26 17:14:02 +05:00
KharchenkoVladimir
ad34e6445c CS2-123: Changed role permissions to bit collection 2021-11-26 17:05:41 +05:00
KharchenkoVladimir
c3c601c2a0 CS2-123: Added get of parent's permissions for new role 2021-11-25 17:44:07 +05:00
KharchenkoVladimir
2f23fbce70 CS2-123: Fixed UserRoleController to user UserRoleService, not CRUD service 2021-11-25 12:24:53 +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
KharchenkoVladimir
872598dcdd CS2-123: Added models for user roles and permissions. Fixed auth UserToken. 2021-11-24 11:30:29 +05:00
Фролов
a74032eed5 Fix TelemetryTracker dbContext disposing. 2021-11-23 16:16:13 +05:00
KharchenkoVladimir
2a4c76611c Returning 'using' to ef context creation 2021-11-23 11:43:58 +05:00
KharchenkoVladimir
e0a453a1f6 CS2-107: Added lost data after merge conflict resolve (with dev) 2021-11-23 11:41:27 +05:00
KharchenkoVladimir
cb52f96069 Merge branch 'dev' into MaxAndAverageRop 
# Conflicts:
#	AsbCloudInfrastructure/Services/WellService.cs
 2021-11-23 11:35:11 +05:00
KharchenkoVladimir
389b519f4b CS2-107: Small guard fix for default result of DB query 2021-11-23 11:31:47 +05:00
KharchenkoVladimir
d361c9a9b4 CS2-107: Added calculation of max and average Rop for cluster wells 2021-11-22 17:29:19 +05:00
Фролов
3dc7bc216e Fix DateTime minValue exception. 2021-11-22 16:07:37 +05:00
Фролов
49eaa76bb0 Improve + fix TelemetryTracker. Now it keeps date range of telemetry data. 2021-11-22 16:02:15 +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
Фролов
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
6b7f589ddc CS2-119: Fixed incoming telemetry date transform 2021-11-18 14:25:11 +05:00
KharchenkoVladimir
e62ac96bd7 CS2-119: Added .FixDatesRangeByTimeZoneAsync() to fix dates ranges to well timezone everywhere 2021-11-18 12:03:59 +05:00
Фролов
7b3e979bac Fix ClusterService.CreateDepositDto(). Add IdState into WellDto 2021-11-18 11:32:13 +05:00
KharchenkoVladimir
4bed0623f1 CS2-119: Added dates change to well timezone if requested 2021-11-18 11:24:21 +05:00
KharchenkoVladimir
c273a9eb5c CS2-119: Added telemetry date fix method according to well timezone 2021-11-17 15:54:01 +05:00
Фролов
b6c2f60296 fix use fileshare only when needed. 2021-11-17 13:06:48 +05:00
Фролов
db0b430d93 Use configuration.GetConnectionString() in all infrastructure cases. 2021-11-17 10:50:57 +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
Фролов
496c24099d Implement UPSERT extention method to fix TelemetryDataBaseService.UpdateDataAsync(). 2021-11-15 14:56:11 +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
Фролов
1c91c31417 Refactor CacheDb. replace tuple by private class 2021-11-11 10:57:08 +05:00
Фролов
e1ba4e1777 fix CacheTable refresh throttling 2021-11-10 18:17:11 +05:00
Фролов
a1ea0d7cdd fix CacheDb 2021-11-10 17:05:57 +05:00
Фролов
fd74ae20a0 CS2-117, CS2-112 
Add exception handle middleware.
Move middlawares into separate files.
 2021-11-10 17:04:07 +05:00
Фролов
fccfd538fc throttle CacheTable refresh 2021-11-10 17:01:18 +05:00
Фролов
f881a2eb55 Refactor TelemetryTracker initialization 2021-11-10 16:59:48 +05:00
Фролов
69ed4c5fb8 Refactor TelemetryDataBaseService.UpdateDataAsync() simplify query. 2021-11-10 16:56:41 +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
Фролов
0f04fbe7b7 clean and update nuget. 2021-11-09 17:19:29 +05:00
cult
dd0385c4dd CS2-104: Added .Include() filemarks to fileInfoDto queries 2021-11-03 15:53:31 +05:00
cult
8d73f0e471 Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev 2021-11-03 14:13:07 +05:00
cult
e716c6fbeb CS2-104: Added deleting of existing drilling program on file marks actions 2021-11-03 14:12:39 +05:00
Фролов
f62ec98ea9 Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev 2021-11-02 17:50:52 +05:00
Фролов
647bb3b106 fix query in DrillFlowChartService.GetAllAsync() 2021-11-02 17:50:43 +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
e396066a68 CF2-104: Added drilling program creation only from approved files 2021-11-02 13:44:45 +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
96fdd02ca7 CS2-106: Made GoogleDriveService disposable 2021-10-29 15:01:55 +05:00
cult
3e00dac818 CS2-106: Fixed Google drive service disposing 2021-10-29 14:40:15 +05:00
cult
ee1c368f8d CS2-106: Removed unnecessary comments from GoogleDriveService 2021-10-29 14:22:39 +05:00
cult
07820a5042 Deleted Apache Service for Excel files union 2021-10-29 13:34:56 +05:00
cult
3c2a9f13a2 Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev 2021-10-29 12:47:37 +05:00
cult
45b4d8bb23 CS2-106: Fixed Drilling program creation and preview logic 2021-10-29 12:47:18 +05:00
Фролов
ffda19c431 Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev 2021-10-28 17:11:42 +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
Фролов
3484d7bc99 CS2-113 В TelemetryTracker сохранять не только системную дату, но и дату из данных панели. 2021-10-28 11:12:03 +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
ab13e97837 CS2-106: Added GoogleDriveService and .GetWebLink() to DrillingProgramController 2021-10-27 17:00:27 +05:00
KharchenkoVladimir
896f2dd9b8 Added crud operation on files at Google drive 2021-10-26 17:22:32 +05:00
KharchenkoVladimir
f800e23aab Deleted .DeleteOldRequests() from TelemetryTracker 2021-10-25 16:36:45 +05:00
KharchenkoVladimir
4d8780dabc Changed way of retrieving last telemetry date for wells 2021-10-25 16:32:55 +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
KharchenkoVladimir
5b82229a94 Fixed WellDto creation in WellService (fixed LastTelemetryDate field) 2021-10-21 15:57:20 +05:00
KharchenkoVladimir
167dd3d5f5 Added Get well by id method in WellController 2021-10-20 16:18:07 +05:00
Фролов
4968ca4382 add IdState to StatWell 2021-10-20 14:15:53 +05:00
Фролов
eab95cb7a1 Refactor GetLastTelemetryDate(..) in services (single resp). 
Add State and LastTelemetryDate into StatWellDto.
 2021-10-20 12:52:31 +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
Фролов
e92859439e nit refactor WellService.UpdateWellAsync(..) throw exception instad of return null 2021-10-19 11:17:16 +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
1a8e7bcb76 Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev 2021-10-18 16:30:25 +05:00
KharchenkoVladimir
37e03b3f0d CS2-98: Added WellUpdateParamsDto in WellController.UpdateWellAsync(). 2021-10-18 16:30:14 +05:00
Фролов
6e9ab38d47 nit some refactoring in DrillingProgramService 2021-10-18 16:23:58 +05:00
KharchenkoVladimir
64d6d8c8f8 Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev 2021-10-18 12:39:01 +05:00
KharchenkoVladimir
6e4c85843f CS2-98: Added State to Well. Added .UpdateWell() in WellController. 2021-10-18 12:38:49 +05:00
Фролов
0a3891a332 fix CacheDb. Make cache ConcurrentDictionary 2021-10-18 11:06:42 +05:00
KharchenkoVladimir
ddf8f35214 Fixed .DetLastTelemetryDate() in TelemetryService 2021-10-18 10:44:53 +05:00
KharchenkoVladimir
3a6f5e7f5e Added last received telemetry date in WellDto 2021-10-15 15:35:18 +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
Фролов
b9eaf36a65 Fix CrudServiceBase.Insert*: set "Id" prop to 0 before inserrt. 2021-10-14 17:13:57 +05:00
Фролов
91878bda5c Fix WellComposite model FK; WellCompositeService automapping 
Rename DrillFlowChartParams to DrillFlowChart
 2021-10-14 14:46:20 +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