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

186 Commits

Author SHA1 Message Date
Фролов
7487dfb342 Merge branch 'dev' into RefactorRoles 2022-01-12 17:50:21 +05:00
Фролов
9eb1070941 Add Day to TVD 2022-01-12 17:46:33 +05:00
Фролов
e09e358cd0 Add RelationUserRoleUserRole for multiple parents. INCOMPLETE 2022-01-12 16:33:53 +05:00
Фролов
2c51c352b1 CS2-139 Добавить контроллер AdminCompanyType 2022-01-12 13:33:16 +05:00
Фролов
90a0aa9e5b Add TryGetTimezone methods. 
EnshureTimezonesIsSet() sets default timezone if can't find correct one.
Edit WellDto to fix exception by constr: FK_t_well_t_well_type_id_well_type. Make IdWellType optional.
 2022-01-10 17:39:33 +05:00
Фролов
345ca47f87 CS2-135. Db model uses DateTimeOffset. see about using DateTime[Offset].md 2022-01-05 17:50:45 +05:00
Фролов
4872b4a495 не доделано перед праздниками 2021-12-30 17:05:44 +05:00
Фролов
ecfdbfc394 Fix UserService.UpdateAsync() preserve users password. 2021-12-22 16:55:39 +05:00
Фролов
d40bced3a0 Merge branch 'dev' into RefactorWellService 2021-12-22 11:53:31 +05:00
Фролов
c5ed3c467f fix and refactor WellService. 2021-12-22 11:41:18 +05:00
Харченко Владимир
1ec76e812f CS2-99: Fixed well fact end date depending on well state 2021-12-21 16:36:28 +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
Фролов
5d45eb7289 Adapt RequestLogUserDto for frontend usage 2021-12-17 16:24:54 +05:00
Фролов
9bb1cc5abc Add some fields into dtos to make possible assign telemetry to well. 2021-12-17 13:07:45 +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
Харченко Владимир
888c28cdf8 CS2-133: Removed Value property from roles to permissions models and services 2021-12-15 16:21:52 +05:00
Фролов
551c60c4ff Add/refactor services for permissions authorization model. 
Rename some fields in DB.permission.
 2021-12-11 16:46:04 +05:00
Фролов
00dd39b587 merge dev to this 2021-12-03 09:58:48 +05:00
Фролов
06eb85e275 remove useless props "description" from ClusterDto, DepostDto 2021-12-02 09:53:30 +05:00
KharchenkoVladimir
22c5d33b7e CS2-123: Added AdminPermissionController and Service 2021-12-01 17:10:17 +05:00
KharchenkoVladimir
cf517eabd5 CS2-123: Fixed role permissions create/update operations 2021-12-01 16:09:06 +05:00
KharchenkoVladimir
fd139079a4 CS2-123: Added [JsonIgnore] to UserRoleDto 2021-11-30 09:34:23 +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
KharchenkoVladimir
ad34e6445c CS2-123: Changed role permissions to bit collection 2021-11-26 17:05:41 +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
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
Фролов
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
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
Фролов
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
Фролов
bfb76b9dc0 Add request tracker. it also track users activity. 2021-11-10 14:23:53 +05:00
Фролов
b643934411 Replace UserLogin string to userId in FilePublishInfo and some renames. In Model, no migrations needed. 2021-11-09 17:24:30 +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
45b4d8bb23 CS2-106: Fixed Drilling program creation and preview logic 2021-10-29 12:47:18 +05:00
KharchenkoVladimir
d19a62c041 Added Id well type field in WellDto 2021-10-20 16:57:35 +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
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
3a6f5e7f5e Added last received telemetry date in WellDto 2021-10-15 15:35:18 +05:00
Фролов
83d1527039 Add IdWellOperationCategory to DrillFlowChartDto and doc. 2021-10-15 10:01:09 +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
Фролов
4878a8c25c Add SpinPlcVersion to TelemetryInfoDto 2021-10-13 17:15:00 +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
Фролов
e05c291b2b Add model WellComposite 2021-10-12 10:39:42 +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
Фролов
e7a4164eaf Rename DrillingParam.Consumption to Flow 2021-10-11 16:20:07 +05:00
KharchenkoVladimir
afd2801715 CS2-94: Added main DrillParams controller and service methods 2021-10-11 15:21:26 +05:00
Фролов
4fe570f3e9 Refactor WellOperation WellDepth split to DepthStart and DepthEnd. 
Fix other services to use new model.
 2021-10-08 11:30:06 +05:00
Фролов
4c08a2963f Add fileDto to reportprops dto. For unification download mechanism. 2021-09-30 12:38:29 +05:00
KharchenkoVV
804bdc6175 Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev 2021-09-24 11:17:42 +05:00
KharchenkoVV
53ef4425c9 CS2-87: Added well depth display to messages table. 2021-09-24 11:17:31 +05:00
Фролов
86e929d920 comment 2021-09-23 17:58:56 +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
Фролов
30a59d0809 cleanup 2021-09-10 11:28:57 +05:00
Фролов
6a338403af Add IId interface to all supported classes 2021-09-09 12:31:12 +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
Фролов
14cf99a1dd Add DrillingProgramController 2021-08-29 17:25:16 +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
Фролов
54d4a16d14 Add WellType into StatWellDto 2021-08-25 15:17:24 +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
KharchenkoVV
791f72cbdb CS2-65: United GetSectionsData() and GetWholeWellData() methods 2021-08-20 16:56:21 +05:00
KharchenkoVV
fbff8e986a CS2-65: Added operations calculation for whole well 2021-08-20 13:56:01 +05:00
KharchenkoVV
b39f07821d CS2-58: Added files filtering by requested companies ids 2021-08-20 11:20:24 +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
72510cbcf3 Fixed WellOperation Type & Date fields 2021-08-16 16:27:09 +05:00
KharchenkoVV
d7e0eace47 CS2-53: Added WellOperations Controller, Service, Dtos and Models 2021-08-16 14:19:43 +05:00
Фролов
57afb6b7d2 Merge branch 'master' of https://bitbucket.org/frolovng/asbcloudserver 2021-08-13 17:26:32 +05:00
Фролов
2e01c4334f fix "order for skip/take" warning. some refactoring. 2021-08-13 17:26:19 +05:00
KharchenkoVV
bc1bcb2ee2 CS2-53: Added basics of WellOperation controller, service, model and dto 2021-08-13 17:25:06 +05:00
KharchenkoVV
b218187117 CS2-37: Fixed OperationsToInterval() analytics. Half done. 2021-08-13 12:32:43 +05:00
Фролов
3a325f6c94 Очистка и анализ кода 2021-08-09 15:41:42 +05:00
Фролов
0434ec4fd9 remove duplicate interface inh. 2021-08-09 14:39:23 +05:00
KharchenkoVV
91da4fa9c2 Deleted link to AsbCloudDb from AsbCloudApp + codefix 2021-08-09 14:01:57 +05:00
KharchenkoVV
433900a1ee CS2-43: Fixed 'Last data' tables saving issues 2021-08-04 14:22:00 +05:00