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

468 Commits

Author SHA1 Message Date
ngfrolov
5bb6bd4e9e fix admin user role forbider 2022-07-06 17:24:46 +05:00
IvanovEugeniy
6bce8ee4e0 конечный вариант 
-выставлено выравнивание строк
-корректировка модели блока SAUB
 2022-07-06 15:04:03 +05:00
ngfrolov
31307ae283 Add new origins to CORS 2022-07-05 10:40:32 +05:00
Фролов
91dd386ffc nit improvements 2022-07-04 17:51:05 +05:00
ngfrolov
5cc3f50163 DetectedOperationController переделаны route. Добавлено 2 детектора 2022-06-17 17:21:32 +05:00
ngfrolov
ae34d17ae1 doc fix 2022-06-16 17:58:17 +05:00
ngfrolov
6512a7e752 doc 2022-06-16 17:37:10 +05:00
ngfrolov
cf98bd8a20 Crud services moved to Repository directory 2022-06-16 12:33:05 +05:00
ngfrolov
9146be1d3f merge 2022-06-15 16:21:28 +05:00
ngfrolov
9876edcb9f Fix AdminUserRoleController.*Forbid predicates. 2022-06-15 16:20:20 +05:00
ngfrolov
5f1de8581f Fix AdminUserRoleController.*Forbid predicates. 2022-06-15 16:01:50 +05:00
ngfrolov
7080b3e855 autoclean. 2022-06-15 14:57:37 +05:00
ngfrolov
553cecc84f Добавил сервер ГПН в cors. 2022-06-14 15:49:21 +05:00
ngfrolov
9db7a7303a Merge branch 'operation_grouping' into dev 2022-06-14 15:35:59 +05:00
ngfrolov
674a5e0e71 Замена базовых классов. Уточнения в задании по не заполненным целевым значениям. 2022-06-14 15:35:31 +05:00
ngfrolov
0ac16d37e9 EventService, MessageService, TelemetryUserService uses new cache model. 2022-06-10 17:36:03 +05:00
ngfrolov
12c97a4119 Merge branch 'operation_grouping' into dev 2022-06-10 10:42:37 +05:00
ngfrolov
dd2a777d3d Crud services, controllers refactoring. Not tested version of new API. 2022-06-09 11:19:52 +05:00
Lyudmila Romanova
6d44dadb27 Модель и сервисы для значений операций 2022-06-07 16:24:05 +05:00
ngfrolov
9ae268f4c5 Add ProtobufController 2022-06-07 11:14:26 +05:00
ngfrolov
e99ac84c46 Fix TimezoneId mapping, rename TimeZoneId to TimezoneId 2022-06-06 17:00:53 +05:00
ngfrolov
4db67113b4 CrudService очищен от неиспользуемого кода. 
CrudCacheService Адаптировано для новой схемы кеширования.
Убраны extention методы для mapster.
 2022-06-06 15:43:47 +05:00
ngfrolov
87391ad9b1 Add DateOnly, TimeOnly support 2022-05-31 16:18:31 +05:00
ngfrolov
c568fafa8f Add ScheduleController.GetByIdWellAsync(..) 2022-05-26 15:32:23 +05:00
ngfrolov
3671dc12a1 Merge branch 'dev' into schedule_task 2022-05-26 14:09:14 +05:00
ngfrolov
eabec7e7ee Добавил наследование от CrudController. 2022-05-26 13:34:40 +05:00
Lyudmila Romanova
80bad5bbe2 Правки по PR 2022-05-25 20:19:08 +05:00
Lyudmila Romanova
7bc977ada6 Добавление бурильщика и графика работы. Покрытие тестами. 2022-05-22 21:18:43 +05:00
ngfrolov
121f200b47 update react client 2022-05-20 14:02:49 +05:00
ngfrolov
1ea68f5605 fix email body links 2022-05-20 09:01:39 +05:00
ngfrolov
521131d27a Fix DrillingProgramController.AddFile error message text. 2022-05-18 17:02:03 +05:00
ngfrolov
24ccc2a128 fix emails triggers and bodies 2022-05-18 11:07:39 +05:00
ngfrolov
5458ac5414 debug and fix daily report 2022-05-05 15:14:29 +05:00
ngfrolov
5de01e5b5d remove permissions from wireline telemetryController 2022-05-05 13:32:14 +05:00
ngfrolov
f93849aba2 update react client 2022-05-05 13:27:38 +05:00
ngfrolov
7201f7ca63 merge detected operations 2022-05-05 10:22:51 +05:00
ngfrolov
7112ebc4f2 Merge branch 'DailyReport' into dev 2022-05-05 10:09:47 +05:00
ngfrolov
24b40973bb merge and fix 2022-05-05 10:06:21 +05:00
zikan
251cdb530a Correction of errors, formation of an excel file 2022-04-29 15:39:12 +05:00
ngfrolov
579b5f26da Remove legacy telemetry analysis, except db model 2022-04-29 12:27:12 +05:00
ngfrolov
be8287f041 Add detected operations controller 2022-04-28 15:04:13 +05:00
zikan
019c6a4db1 - Added t_daily_report table and related migrations; 
- Added request processing service for DailyReportController. Implemented all methods except DownloadAsync.
 2022-04-26 16:45:52 +05:00
ngfrolov
6aae972aba another try to fast fix cors. 2022-04-25 09:37:10 +05:00
ngfrolov
e6910d0d5f Update cors settings. Add some ports. 2022-04-22 17:26:03 +05:00
zikan
76ee379785 Added t_daily_report table and related migrations 2022-04-20 18:03:38 +05:00
ngfrolov
f76cc52fc8 clean docs 2022-04-20 11:07:41 +05:00
ngfrolov
92371eaaf5 Set infrastructure assembly marker. 2022-04-19 13:35:20 +05:00
ngfrolov
9023aef984 Контроллер заглушка для суточного рапорта. 2022-04-19 12:14:03 +05:00
ngfrolov
7b957d0edb Add WitsControllerAbstract.GetLastDataAsync(..) 2022-04-15 14:45:49 +05:00
ngfrolov
091464a390 Set PersistAuthorization to swagger-ui 2022-04-15 14:45:04 +05:00
ngfrolov
e95c04c91e Doc wits info methods 2022-04-15 13:40:24 +05:00
ngfrolov
5359beb9aa doc 2022-04-14 16:07:29 +05:00
ngfrolov
fa9486e44d grouping services and controllers 2022-04-11 18:00:34 +05:00
ngfrolov
80434475db Add telemetryWireLine. 
Add InstantDataRepository
 2022-04-11 17:22:52 +05:00
ngfrolov
c96bf87f17 Reorganize dtos 2022-04-08 13:10:06 +05:00
ngfrolov
24b0bc9d8c Add WITS record tables 2022-04-01 17:55:44 +05:00
ngfrolov
3f2a7406d2 Add ScheduleReport 2022-03-17 16:56:13 +05:00
ngfrolov
c2a691f224 Simplify dependencies 2022-03-16 16:07:37 +05:00
Фролов
8de73084f2 Add Mse to telemetryDataSaub 2022-03-10 17:18:30 +05:00
Фролов
bafa372d66 rename some methods 2022-03-02 17:42:34 +05:00
Фролов
6a0289f216 fix drillingProgram permissions 2022-03-02 17:41:22 +05:00
Фролов
055e6daf85 Add drillingProgram doc dependency diagram 2022-03-02 09:38:34 +05:00
Фролов
7b8cbb71be Edit UserSrvice. UserRolesDto in UserDto is 1 level of nesting 2022-03-01 09:51:16 +05:00
Фролов
45cce481ee Add emailService 2022-02-28 14:44:26 +05:00
Фролов
f286410eff Add DrillingProgramCreateError 2022-02-28 14:44:15 +05:00
Фролов
4863b69cfe DrillingProgram replace idPart by idFileCategory. 2022-02-18 14:16:35 +05:00
Фролов
7a77ff7904 Add backgroundService. 
ReportService uses backgroundService.
Drilling program alpha
 2022-02-17 15:37:27 +05:00
Фролов
e4e906c8d7 DrillingProgramService существенно переработан. 2022-02-12 11:28:16 +05:00
Фролов
def7868b9a spelling 2022-02-08 13:03:56 +05:00
Фролов
4d89f3785b CS2-147 При отсутствии файла выдавать 404 2022-02-08 10:25:05 +05:00
Фролов
4c19186158 Add UserRole related matrix defaults 2022-02-03 09:58:42 +05:00
Фролов
d0d0200679 Add some permissions, new web client 2022-02-03 08:23:52 +05:00
Фролов
2598738c46 Add Permissions to base crud controller. Add optional custom forbid check on edit methods. 2022-02-01 17:58:31 +05:00
Фролов
9e546a4cfd Add role type ids 2022-02-01 15:07:06 +05:00
Фролов
3aef211b94 Add Roles Related Dictionaries 2022-02-01 14:31:36 +05:00
Фролов
366a61cae5 Enable permissions middleware 2022-01-31 11:06:36 +05:00
Харченко Владимир
eaf7cb85b2 Disabled PermissionMiddleware and removed [Permission] from TelemetryController 2022-01-27 13:21:12 +05:00
Фролов
e1afec1810 Add Permissions 'generator' file 2022-01-21 17:58:02 +05:00
Фролов
e6ac04c6bc fix DrillFlowChartController.EditAsync() wrong service method 2022-01-21 17:34:23 +05:00
Фролов
c6bfeb4e04 PermissionsMiddlware Add ulimate admin? check by idUser == 1 2022-01-21 17:33:28 +05:00
Харченко Владимир
b46a7c33a2 Added Permission attribute to non-anonymous controller methods 2022-01-19 11:42:26 +05:00
Фролов
f5ec155bbb AdminPermissionController.GetAutogenerated() change generation algorithm. 2022-01-18 17:21:05 +05:00
Фролов
7a10d26ca6 CS2-145 Добавить специальный ArgumentInvalidException кастомной вылидации для замены ArgumentException 2022-01-18 11:04:44 +05:00
Фролов
2192cdc242 Extract BeforeRunHandle method. It runs some procedures like Migrate() on startup. 2022-01-17 15:33:00 +05:00
Фролов
e0bfc8d420 AdminPermissionController. Add method to generate names of auto-permissions. 2022-01-14 17:59:07 +05:00
Фролов
f81dcf2a46 PermissionsMiddlware Add auto generate permissionsName 2022-01-13 17:08:07 +05:00
Фролов
2c51c352b1 CS2-139 Добавить контроллер AdminCompanyType 2022-01-12 13:33:16 +05:00
Фролов
f7b09c8124 update js - client 2022-01-11 11:46:28 +05:00
Фролов
0050427ccf Doc. 
Remove https config.
Default timezone on create new telemetry by data received.
 2022-01-10 18:12:31 +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
Фролов
ab5f43edbe Migrate projects to net 6. 
Update nuget packadges.
 2021-12-28 16:35:31 +05:00
Фролов
e7d6aef6a6 Move logic from AsbCloudDbContext.GetDepthToIntervalAsync() to TelemetryAnalyticsService.GetWellDepthToIntervalAsync() 2021-12-27 13:49:29 +05:00
Фролов
896e5dc8db update packs Swashbuckle.AspNetCore*. 
Fix optional param MeasureController.GetHisoryAsync()
 2021-12-24 15:50:30 +05:00
Фролов
03ded4e6cf TelemetryDataBaseController doesn't await sending to SignalR 2021-12-24 12:59:17 +05:00
Фролов
dfacd04b47 fix UserService 2021-12-23 18:07:20 +05:00
Фролов
a8e1c4bd06 comments for https 2021-12-23 18:07:00 +05:00
Фролов
9233b45966 Handle ArgumentException in SimplifyExceptionsMiddleware. It replaces StatusCode 500 (server error) to StatusCode 400 (bad request) 2021-12-23 17:15:05 +05:00
Фролов
95df836155 Add WellOperationController.GetSectionTypes() 2021-12-22 17:09:26 +05:00
Фролов
4d116769a8 disable open browser on debug start 2021-12-22 16:17:26 +05:00
Фролов
76e580179d fix https urls 2021-12-22 16:07:03 +05:00
Фролов
a59b1897ce Restore https 2021-12-22 15:59:02 +05:00
Фролов
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