on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

Commit Graph

  • 4d116769a8 disable open browser on debug start Фролов 2021-12-22 16:17:26 +0500
  • 774447e51f Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev Фролов 2021-12-22 16:07:17 +0500
  • 76e580179d fix https urls Фролов 2021-12-22 16:07:03 +0500
  • 525ccc67f8 Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev Харченко Владимир 2021-12-22 16:06:40 +0500
  • 33c3e74e53 Added new well section types Харченко Владимир 2021-12-22 16:06:30 +0500
  • a59b1897ce Restore https Фролов 2021-12-22 15:59:02 +0500
  • 2019386a71 fix AdminCompanyController.Get*(). Include CompanyType Фролов 2021-12-22 15:58:49 +0500
  • 13ac0557cf fix TelemetryTracker.SaveRequestDate Фролов 2021-12-22 12:34:59 +0500
  • ea26010719 fix MeasureController.GetHisoryAsync Фролов 2021-12-22 12:31:37 +0500
  • d40bced3a0 Merge branch 'dev' into RefactorWellService Фролов 2021-12-22 11:53:31 +0500
  • c5ed3c467f fix and refactor WellService. Фролов 2021-12-22 11:41:18 +0500
  • a9f03c2ecf refactor CacheTable. Includes IEnumerable replaced to ISet [unique values collection] Фролов 2021-12-22 11:40:29 +0500
  • 40145f7d5b Fix UserRole multiple permissions Фролов 2021-12-22 11:35:36 +0500
  • 1ec76e812f CS2-99: Fixed well fact end date depending on well state Харченко Владимир 2021-12-21 16:36:28 +0500
  • 6924a6bac7 start refactoring// fire alarm Фролов 2021-12-21 11:52:53 +0500
  • a0208f412e refactor UserRoleService Фролов 2021-12-20 15:17:09 +0500
  • e99f0ff9c9 fix AsbCloudDbContext.RelationUserRolePermissions Фролов 2021-12-20 15:16:21 +0500
  • 43bdc9e92e Add CrudCacheServiceBase Фролов 2021-12-20 15:15:20 +0500
  • 7c24d52fa2 Merge branch 'dev' into NewUserRoles Фролов 2021-12-20 15:13:36 +0500
  • c10c698cbe add return type description in RequerstTrackerController.GetUsersStat() Фролов 2021-12-17 16:30:00 +0500
  • 5d45eb7289 Adapt RequestLogUserDto for frontend usage Фролов 2021-12-17 16:24:54 +0500
  • 852e13f140 Rename docs categories Фролов 2021-12-17 15:44:18 +0500
  • 3aa7bac5e6 CS2-133: Removed mask from Permission property. Харченко Владимир 2021-12-17 14:26:19 +0500
  • 3128c8f701 Merge branch 'dev' into RefactorTelemetry Фролов 2021-12-17 13:08:07 +0500
  • 9bb1cc5abc Add some fields into dtos to make possible assign telemetry to well. Фролов 2021-12-17 13:07:45 +0500
  • 31b671a0c7 remove unused methods Фролов 2021-12-17 13:04:33 +0500
  • e0834e4720 add telemetry merge Фролов 2021-12-17 12:48:58 +0500
  • d94b2e685e CS2-133: Fixed CRUD operations over Permissions Харченко Владимир 2021-12-17 12:38:34 +0500
  • bc38e86b74 hotfix units. Фролов 2021-12-16 16:10:58 +0500
  • 17db1218cc CS2-133: Removed permission mask logic from permissions Харченко Владимир 2021-12-16 16:00:47 +0500
  • e05bdd2993 CS2-132 Рассмотреть возможность замены TelemetryInfoDto на Dictionary<string, object> или Dictionary<string, string> Фролов 2021-12-16 15:24:37 +0500
  • 888c28cdf8 CS2-133: Removed Value property from roles to permissions models and services Харченко Владимир 2021-12-15 16:21:52 +0500
  • dc636a1d8c nit refactor ControllerLoadTester Фролов 2021-12-12 17:10:09 +0500
  • 6925746da9 Add attribute and middleware for permissions autirization. Фролов 2021-12-11 16:47:28 +0500
  • 551c60c4ff Add/refactor services for permissions authorization model. Rename some fields in DB.permission. Фролов 2021-12-11 16:46:04 +0500
  • 1ec22744c3 Refactor cacheTable. Remove ConfigureAwait(false) for private methotds. Insert?() returns updated entity(ies). Фролов 2021-12-11 16:33:37 +0500
  • 6dc3137627 update default WellOperationCategories Фролов 2021-12-08 15:38:38 +0500
  • 6565957c34 rider recomendations Фролов 2021-12-08 15:29:41 +0500
  • 5752ad40b7 some rider recommendations and spelling Фролов 2021-12-07 18:27:52 +0500
  • 1e9078079a remove useless argument TelemetryService.GetTransmittingTelemetriesAsync() Фролов 2021-12-07 15:55:11 +0500
  • 9a7d2b4140 Remove ReportService.GetSuitableReportsAsync() Фролов 2021-12-07 13:55:39 +0500
  • 498489b231 fix tests Фролов 2021-12-07 13:44:00 +0500
  • 819bc82227 MeasureService.GetHisoryAsync(..) uses idCategory arg Фролов 2021-12-07 13:43:47 +0500
  • ee01ab30db Забрал домой Фролов 2021-12-07 11:34:06 +0500
  • 634bdee1e3 remove files of old projects Фролов 2021-12-03 17:36:31 +0500
  • fa3e47493b Doc timascale backup and restore. Фролов 2021-12-03 17:34:24 +0500
  • eac44db77f Merge branch 'RolesAndPermissionsMatrix' into dev Фролов 2021-12-03 15:05:41 +0500
  • 539905e8e0 Use cacheTable for roles and permissions Фролов 2021-12-03 15:03:33 +0500
  • 00dd39b587 merge dev to this Фролов 2021-12-03 09:58:48 +0500
  • 4aaac31c43 nit refacroring before merge Фролов 2021-12-03 09:44:10 +0500
  • 03f770b949 CS2-120: Deleted 'AsbCloudDemoData' project. Classes were moved to ConsoleApp1. KharchenkoVladimir 2021-12-02 15:36:51 +0500
  • aff16dc84b CS2-123: Returned parent user role permissions inheritance KharchenkoVladimir 2021-12-02 13:35:15 +0500
  • b655360835 CS2-123: Added AdminPermissionController methods KharchenkoVladimir 2021-12-02 12:03:30 +0500
  • 8c3c621c7b hotfix rename t_well_сomposite (cyrilic c) to t_well_composite. Фролов 2021-12-02 11:44:45 +0500
  • cdb8207c35 fix program args parsing Фролов 2021-12-02 11:24:54 +0500
  • fdf5a6ecd6 Add startup argument db_init to start just for migrate DB Фролов 2021-12-02 11:11:14 +0500
  • c55086bfee Fix ClusterService Фролов 2021-12-02 11:10:24 +0500
  • 06eb85e275 remove useless props "description" from ClusterDto, DepostDto Фролов 2021-12-02 09:53:30 +0500
  • 22c5d33b7e CS2-123: Added AdminPermissionController and Service KharchenkoVladimir 2021-12-01 17:10:17 +0500
  • cf517eabd5 CS2-123: Fixed role permissions create/update operations KharchenkoVladimir 2021-12-01 16:09:06 +0500
  • a74a7cbf58 doc RequestTracker Фролов 2021-12-01 12:53:10 +0500
  • 5c63c086ad CS2-127 Add lazy service registration. Фролов 2021-12-01 11:49:59 +0500
  • 04052af874 CS2-115 TelemetryDataBaseService.Get() прореживание выборки может работать не корректно Фролов 2021-12-01 11:08:25 +0500
  • 1d078379b4 CS2-123: Renamed Permission collections in EF models KharchenkoVladimir 2021-11-30 17:25:08 +0500
  • ad061bbca5 CS2-123: Renamed permission tables, removed roles from claims, etc KharchenkoVladimir 2021-11-30 17:22:38 +0500
  • bc77b128b0 Fix setpoints dictionary by Oleg's info. Update default client build Фролов 2021-11-30 15:25:29 +0500
  • fd139079a4 CS2-123: Added [JsonIgnore] to UserRoleDto KharchenkoVladimir 2021-11-30 09:34:23 +0500
  • 9280b28e10 CS2-123: Returned table for roles permissions. KharchenkoVladimir 2021-11-29 17:34:53 +0500
  • 2d9388cb2a Revert "CS2-123: Changed role permissions to bit collection" KharchenkoVladimir 2021-11-29 12:39:28 +0500
  • ee2172f64b fix SetpointsController. Add AllowAnonymous. fix doc for backup db. Фролов 2021-11-26 17:14:02 +0500
  • ad34e6445c CS2-123: Changed role permissions to bit collection KharchenkoVladimir 2021-11-26 17:05:41 +0500
  • c3c601c2a0 CS2-123: Added get of parent's permissions for new role KharchenkoVladimir 2021-11-25 17:44:07 +0500
  • 2f23fbce70 CS2-123: Fixed UserRoleController to user UserRoleService, not CRUD service KharchenkoVladimir 2021-11-25 12:24:53 +0500
  • 576d119674 CS2-123: Changed UserRoleService and controller to inherit CrudController/service KharchenkoVladimir 2021-11-25 11:55:52 +0500
  • 26ada6572b Add SetpointInfoDto Фролов 2021-11-24 17:58:53 +0500
  • 908c855463 CS2-123: Added CRUD over user roles and their permissions (controller + service) KharchenkoVladimir 2021-11-24 17:38:40 +0500
  • 18ad9fc91a CS2-124 Создать контроллер рекомендый новыйх уставок бурильщику Фролов 2021-11-24 16:16:17 +0500
  • 872598dcdd CS2-123: Added models for user roles and permissions. Fixed auth UserToken. KharchenkoVladimir 2021-11-24 11:30:29 +0500
  • b292fd2a8d Merge branch 'MaxAndAverageRop' of https://bitbucket.org/autodrilling/asbcloudserver into MaxAndAverageRop Фролов 2021-11-23 16:16:22 +0500
  • a74032eed5 Fix TelemetryTracker dbContext disposing. Фролов 2021-11-23 16:12:41 +0500
  • 3d8154ca2d Fix TelemetryTracker dbContext disposing. Фролов 2021-11-23 16:12:41 +0500
  • 6412c24a3e CS2-107: Fixed rop stat methods routes KharchenkoVladimir 2021-11-23 14:07:43 +0500
  • 2a4c76611c Returning 'using' to ef context creation KharchenkoVladimir 2021-11-23 11:43:58 +0500
  • e0a453a1f6 CS2-107: Added lost data after merge conflict resolve (with dev) KharchenkoVladimir 2021-11-23 11:41:27 +0500
  • cb52f96069 Merge branch 'dev' into MaxAndAverageRop KharchenkoVladimir 2021-11-23 11:35:11 +0500
  • 389b519f4b CS2-107: Small guard fix for default result of DB query KharchenkoVladimir 2021-11-23 11:31:47 +0500
  • d361c9a9b4 CS2-107: Added calculation of max and average Rop for cluster wells KharchenkoVladimir 2021-11-22 17:29:19 +0500
  • 3dc7bc216e Fix DateTime minValue exception. Фролов 2021-11-22 16:07:37 +0500
  • 49eaa76bb0 Improve + fix TelemetryTracker. Now it keeps date range of telemetry data. Фролов 2021-11-22 16:02:15 +0500
  • 0b66648267 fix AsbCloudWebApi.Controllers.WellOperationController.ExportAsync. NullRef in WellService.Convert(). Фролов 2021-11-22 14:14:44 +0500
  • 809ee137aa fix TelemetryAnalyticsService.AnalyzeAndSaveTelemetriesAsync(). Фролов 2021-11-22 14:04:05 +0500
  • f4f4974cdd remove usless projects Фролов 2021-11-22 12:06:10 +0500
  • 14bc1e12b4 Merge branch 'TelemetryTimeZone' into dev Фролов 2021-11-22 11:31:10 +0500
  • 1eaa1efb03 Refactor. Extract TimezoneService. Фролов 2021-11-22 11:30:08 +0500
  • 07f76afa35 CS107: Renamed Mse to Rop in Cluster rop stat KharchenkoVladimir 2021-11-19 11:17:45 +0500
  • 00798becb0 CS2-107: Added ClusterOperationStatController KharchenkoVladimir 2021-11-19 11:12:25 +0500
  • 6b7f589ddc CS2-119: Fixed incoming telemetry date transform KharchenkoVladimir 2021-11-18 14:25:11 +0500
  • e62ac96bd7 CS2-119: Added .FixDatesRangeByTimeZoneAsync() to fix dates ranges to well timezone everywhere KharchenkoVladimir 2021-11-18 12:03:59 +0500
  • 7b3e979bac Fix ClusterService.CreateDepositDto(). Add IdState into WellDto Фролов 2021-11-18 11:32:13 +0500
  • 4bed0623f1 CS2-119: Added dates change to well timezone if requested KharchenkoVladimir 2021-11-18 11:24:21 +0500