Lyudmila Romanova
|
4bc07bc727
|
Merge conflict fix
|
2022-06-10 12:01:46 +05:00 |
|
Lyudmila Romanova
|
6c89c32ab3
|
Фиксация для слияния
|
2022-06-10 11:58:49 +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
|
e99ac84c46
|
Fix TimezoneId mapping, rename TimeZoneId to TimezoneId
|
2022-06-06 17:00:53 +05:00 |
|
ngfrolov
|
fa38c145e7
|
Add new Permissions
|
2022-05-31 17:54:43 +05:00 |
|
ngfrolov
|
4791ab6db1
|
Add migration
|
2022-05-31 16:36:46 +05:00 |
|
ngfrolov
|
3671dc12a1
|
Merge branch 'dev' into schedule_task
|
2022-05-26 14:09:14 +05:00 |
|
ngfrolov
|
339921b968
|
Rename models;
Fix cs8618 (nullables);
Add migration.
|
2022-05-26 13:28:16 +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 |
|
Lyudmila Romanova
|
192cf8e5b9
|
Добавление в контекст
|
2022-05-20 18:21:00 +05:00 |
|
Lyudmila Romanova
|
93f4fcf486
|
Создание модели и DTO для бурильщика
|
2022-05-20 18:19:52 +05:00 |
|
Lyudmila Romanova
|
e152ab8d24
|
Испрвление контекста что-бы запускался проект
|
2022-05-20 14:42:47 +05:00 |
|
ngfrolov
|
24ccc2a128
|
fix emails triggers and bodies
|
2022-05-18 11:07:39 +05:00 |
|
ngfrolov
|
09b39c14ea
|
split RefreshMaterializedViewAsync to 2 overload
|
2022-05-11 09:04:32 +05:00 |
|
ngfrolov
|
692517798b
|
Recreate migration Add_mw_telemetry_datas_saub_stat.
|
2022-05-06 10:58:52 +05:00 |
|
ngfrolov
|
7201f7ca63
|
merge detected operations
|
2022-05-05 10:22:51 +05:00 |
|
ngfrolov
|
24b40973bb
|
merge and fix
|
2022-05-05 10:06:21 +05:00 |
|
ngfrolov
|
93156ef6f8
|
Remove legacy telemetry analysis db model
|
2022-04-29 14:29:45 +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
|
45fb5ab8e8
|
Add Db store for detected operations.
Add backgroudService for periodically detect.
|
2022-04-25 17:41:18 +05:00 |
|
zikan
|
76ee379785
|
Added t_daily_report table and related migrations
|
2022-04-20 18:03:38 +05:00 |
|
ngfrolov
|
fa9486e44d
|
grouping services and controllers
|
2022-04-11 18:00:34 +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
|
102a0e4dbf
|
fix spell "RequerstTracker.get"
|
2022-03-29 09:51:24 +05:00 |
|
Фролов
|
8de73084f2
|
Add Mse to telemetryDataSaub
|
2022-03-10 17:18:30 +05:00 |
|
Фролов
|
433bc30316
|
fix default EF data.
|
2022-02-21 12:04:26 +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 |
|
Фролов
|
4c68045398
|
Rename_DrillingProgram_FileCategories
Add entity DrillingProgram parts
|
2022-02-09 14:25:22 +05:00 |
|
Фролов
|
696dbee375
|
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
|
2022-02-08 10:05:00 +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 |
|
Фролов
|
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 |
|
Харченко Владимир
|
87d7563ed3
|
CS2-27: Fixed ClusterService unit tests
|
2022-01-31 16:13:27 +05:00 |
|
Фролов
|
2192cdc242
|
Extract BeforeRunHandle method. It runs some procedures like Migrate() on startup.
|
2022-01-17 15:33:00 +05:00 |
|
Фролов
|
e09e358cd0
|
Add RelationUserRoleUserRole for multiple parents. INCOMPLETE
|
2022-01-12 16:33:53 +05:00 |
|
Фролов
|
345ca47f87
|
CS2-135. Db model uses DateTimeOffset. see about using DateTime[Offset].md
|
2022-01-05 17:50:45 +05:00 |
|
Фролов
|
7ffb6d96fd
|
Add_timeZone_to_IMapPoint
|
2022-01-02 12:33:18 +05:00 |
|
Фролов
|
4872b4a495
|
не доделано перед праздниками
|
2021-12-30 17:05:44 +05:00 |
|
Фролов
|
962d6e15b6
|
Fix spelling for defaults.
Replace DateTime to DateTimeOffset in models
|
2021-12-30 10:45:06 +05:00 |
|
Фролов
|
35e4b55e82
|
Fix Messure. Replace Dictionary<> by class.
Clean DbContext.
|
2021-12-28 16:34:11 +05:00 |
|
Фролов
|
e7d6aef6a6
|
Move logic from AsbCloudDbContext.GetDepthToIntervalAsync() to TelemetryAnalyticsService.GetWellDepthToIntervalAsync()
|
2021-12-27 13:49:29 +05:00 |
|
Фролов
|
ca969c99ad
|
Remove query datesRange from context.
Replace source for DatesRange from db to telemetry tracker.
|
2021-12-27 11:48:23 +05:00 |
|
Фролов
|
a30c8883a5
|
Fix DB Models. Specify TypeName = "timestamp with time zone" on DateTime.
|
2021-12-27 10:53:18 +05:00 |
|
Фролов
|
e29dbf49df
|
Reorder SectionsTypes to keep existing operations
|
2021-12-22 19:18:09 +05:00 |
|
Фролов
|
ecfdbfc394
|
Fix UserService.UpdateAsync() preserve users password.
|
2021-12-22 16:55:39 +05:00 |
|
Харченко Владимир
|
33c3e74e53
|
Added new well section types
|
2021-12-22 16:06:30 +05:00 |
|
Фролов
|
c5ed3c467f
|
fix and refactor WellService.
|
2021-12-22 11:41:18 +05:00 |
|
Фролов
|
6924a6bac7
|
start refactoring// fire alarm
|
2021-12-21 11:52:53 +05:00 |
|
Фролов
|
e99f0ff9c9
|
fix AsbCloudDbContext.RelationUserRolePermissions
|
2021-12-20 15:16:21 +05:00 |
|
Фролов
|
7c24d52fa2
|
Merge branch 'dev' into NewUserRoles
|
2021-12-20 15:13:36 +05:00 |
|
Фролов
|
852e13f140
|
Rename docs categories
|
2021-12-17 15:44:18 +05:00 |
|
Харченко Владимир
|
17db1218cc
|
CS2-133: Removed permission mask logic from permissions
|
2021-12-16 16:00:47 +05:00 |
|
Фролов
|
e05bdd2993
|
CS2-132 Рассмотреть возможность замены TelemetryInfoDto на Dictionary<string, object> или Dictionary<string, string>
|
2021-12-16 15:24:37 +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 |
|
Фролов
|
6dc3137627
|
update default WellOperationCategories
|
2021-12-08 15:38:38 +05:00 |
|
Фролов
|
00dd39b587
|
merge dev to this
|
2021-12-03 09:58:48 +05:00 |
|
Фролов
|
8c3c621c7b
|
hotfix rename t_well_сomposite (cyrilic c) to t_well_composite.
|
2021-12-02 11:44:45 +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
|
ad061bbca5
|
CS2-123: Renamed permission tables, removed roles from claims, etc
|
2021-11-30 17:22:38 +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 |
|
Фролов
|
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
|
88f9236b8a
|
CS2-119: Added Telemetry Timezone object and update timezone functionality
|
2021-11-16 13:14:31 +05:00 |
|
Фролов
|
496c24099d
|
Implement UPSERT extention method to fix TelemetryDataBaseService.UpdateDataAsync().
|
2021-11-15 14:56:11 +05:00 |
|
Фролов
|
a5eb4e5212
|
Fix db model TelemetryDataSpin. remove space in encoder_resolution column
|
2021-11-15 14:54:10 +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 |
|
Фролов
|
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
|
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 |
|
Фролов
|
fdef85a291
|
WARN mega long migration (~2h). uncomment timeout setter before run.
|
2021-10-31 18:01:32 +05:00 |
|
Фролов
|
6869e08105
|
Shrink models types for less db size.
|
2021-10-31 17:01:48 +05:00 |
|
cult
|
45b4d8bb23
|
CS2-106: Fixed Drilling program creation and preview logic
|
2021-10-29 12:47:18 +05:00 |
|
cult
|
ab13e97837
|
CS2-106: Added GoogleDriveService and .GetWebLink() to DrillingProgramController
|
2021-10-27 17:00:27 +05:00 |
|
Фролов
|
701f5b26d2
|
Rename Well.State to Well.IdState
|
2021-10-20 11:21:14 +05:00 |
|
Фролов
|
54d78ddd0e
|
Fix import WellOperations edit WellOperationCategory default data
|
2021-10-19 10:34:11 +05:00 |
|
KharchenkoVladimir
|
6e4c85843f
|
CS2-98: Added State to Well. Added .UpdateWell() in WellController.
|
2021-10-18 12:38:49 +05:00 |
|
KharchenkoVladimir
|
6886e86832
|
Added IdWellOperationCategory to DrillChart model
|
2021-10-14 17:02:20 +05:00 |
|
Фролов
|
91878bda5c
|
Fix WellComposite model FK; WellCompositeService automapping
Rename DrillFlowChartParams to DrillFlowChart
|
2021-10-14 14:46:20 +05:00 |
|
KharchenkoVladimir
|
32732bf058
|
Fixed DrillFlowChart routes, model, dto names
|
2021-10-14 10:18:43 +05:00 |
|
KharchenkoVladimir
|
911deb5b8b
|
CS2-97: Added DrillFlowChartParams infrastructure
|
2021-10-13 17:34:32 +05:00 |
|
Фролов
|
3bff1d0daf
|
Add WellCompositeController
|
2021-10-12 12:17:46 +05:00 |
|
Фролов
|
e05c291b2b
|
Add model WellComposite
|
2021-10-12 10:39:42 +05:00 |
|
Фролов
|
b93ff717f2
|
Rename DrillingParam.TopDrive* to Rotor*
|
2021-10-11 16:39:40 +05:00 |
|
Фролов
|
e7a4164eaf
|
Rename DrillingParam.Consumption to Flow
|
2021-10-11 16:20:07 +05:00 |
|
KharchenkoVladimir
|
4168e63dad
|
Merge branch 'DrillingModes' into dev
|
2021-10-11 15:31:17 +05:00 |
|
KharchenkoVladimir
|
afd2801715
|
CS2-94: Added main DrillParams controller and service methods
|
2021-10-11 15:21:26 +05:00 |
|
KharchenkoVV
|
c962374b6c
|
CS2-94: Added Drilling params controller, service and model
|
2021-10-10 13:35:43 +05:00 |
|
Фролов
|
2868304546
|
Draft WellOperationImportService. incomplete
|
2021-10-08 17:00:30 +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 |
|