0ad4cebdb8
#5998816 исправление замечаний
2022-09-08 12:05:56 +05:00
ngfrolov
a0ec08fac5
merge dev to subsystem
2022-09-08 09:46:32 +05:00
ngfrolov
79108c754a
fixed
2022-09-07 18:01:39 +05:00
896ba03589
#5998816 Дело скважины + тесты
2022-09-05 09:13:45 +05:00
20f79f461f
- В SubsystemStatDto свойство UsedTimeHours double. TimeSpan.
...
- В SubsystemDto свойство Subsystem переименовано в SubsystemName
- миграция для заполнения Subsystem
- метод bsystemOperationTimeService.GetSubsystemByIdWellAsync перенесен в SubsystemService.
2022-08-15 15:08:17 +05:00
62384b5673
-Доделан фоновый сервис
...
-добавлена модель для запроса в Data Spin фонового сервиса
-корректировка моделей (удаление пробелов и лишних библиотек)
-добавление данных по умолчанию о подсистемах (через Entity Filler)
- в методе Convert в SubsystemOperationTimeService сделана корректировка дат
2022-08-15 01:17:00 +05:00
ngfrolov
0eb9410ecc
remove file share service
2022-08-11 15:14:01 +05:00
ngfrolov
1dcfd93c0b
Add new operation - TemplatingWhileDrilling
2022-08-10 15:51:41 +05:00
ngfrolov
499f7cc4e2
Edit Detectors for rotor and slide.
...
Add reason of end detecting operation.
2022-08-09 18:00:22 +05:00
ngfrolov
a5a31d5d82
UserSettingsController replace value type to JsonDocument
2022-08-09 15:59:40 +05:00
ngfrolov
70e6ce766b
Rename WellOperations key param name
2022-08-09 11:09:52 +05:00
d1aec0ad2a
Add new Permissions
2022-08-08 17:03:26 +05:00
a20dbf72e0
merge dev to subsystems
2022-08-08 17:02:52 +05:00
ca261f1eb7
before merge
2022-08-08 16:53:01 +05:00
ngfrolov
623a64fa25
Rafactor DB context default data.
...
Modify WellOperation table (and defaults)
2022-08-08 16:45:20 +05:00
ngfrolov
fb12919d85
Split operation flash.
2022-08-05 17:17:07 +05:00
ngfrolov
5de4e43ad9
merge
2022-08-03 10:57:49 +05:00
9f23a45be7
#создана миграция новых таблиц подсистем и наработок
...
#дополнен SubsystemOperationTimeService
2022-08-02 15:26:33 +05:00
d3bbbd5bd6
наполнение сервисов
...
1)фоновый сервис
2)сервис работы с апи (OperationTimeService)
2022-08-01 13:55:51 +05:00
ngfrolov
8d3a8a5885
UserSettings_rename_idUser
2022-07-28 10:37:05 +05:00
ngfrolov
b7af07f995
Add UserSettingsController
2022-07-27 18:14:07 +05:00
ngfrolov
892b34f8b1
Merge
2022-07-25 18:03:25 +05:00
ngfrolov
cc5fd56f43
DailyReport. Rename dtos and entities. Remove time offset from DailyReportService.
2022-07-25 18:02:39 +05:00
ngfrolov
39b3753bd3
Add Detector Static Surveying MWD
2022-07-20 09:49:36 +05:00
ngfrolov
48cee90d91
Add DetectorFlashing
2022-07-19 10:29:38 +05:00
ngfrolov
7b99e0fc88
Rename WITS base table
2022-07-19 10:29:16 +05:00
421c706ca1
корректировка контроллеров и сервисов
2022-07-18 18:51:49 +05:00
7f4b434a8c
Добавлены модели БД ,модели ДТО, интерфейсы, сервисы
2022-07-14 03:47:11 +05:00
6bce8ee4e0
конечный вариант
...
-выставлено выравнивание строк
-корректировка модели блока SAUB
2022-07-06 15:04:03 +05:00
c5785fbb5f
корректировка скрипта миграции
...
корректировка стилей и блоков
2022-07-06 09:21:35 +05:00
73f804d3d6
добавление миграции - очистка таблицы t_daily_report
2022-07-05 14:27:23 +05:00
3518ad76ff
редактирование моделей блоков
2022-07-05 11:49:01 +05:00
7d9a969ca6
Правка работы сервиса
...
Исправление ошибок формирования документа
2022-07-05 11:30:25 +05:00
Фролов
91dd386ffc
nit improvements
2022-07-04 17:51:05 +05:00
Фролов
e634094738
fix nullable warnings
2022-07-04 17:48:14 +05:00
Фролов
12ff470d5f
add default valueComparer on blob fields
2022-07-04 17:24:59 +05:00
71ace34ec9
удаление старых моделей БД
2022-07-04 14:13:33 +05:00
61e2056eea
корректировка сервиса (изменение моделей)
2022-07-04 13:15:26 +05:00
ngfrolov
69ac4c74d5
Operation detection algorithm adapt.
2022-06-30 17:37:57 +05:00
e16df1f705
изменение моделей Dto
...
внесение корректировок в сервис DailyReport
Убраны лишние комментарии и лишний код :
-из классов создающих блоки отчета
-из метода MakerExcel
Добавлен блок Dimensionless
2022-06-30 16:01:46 +05:00
ngfrolov
d6b5a9507b
Add explicitly props conversion to json for other dbProviders.
2022-06-20 12:42:35 +05:00
94ebf6bfb9
Edit daily report MakerExcel - изменение логики построения отчета
...
модели ДТО и БД разбиты на 6 блоков
изменен сервис DailyReport
Тестовая таблица в консольном проекте
2022-06-17 13:20:48 +05:00
ngfrolov
c2608bb24b
Add OperationValue Permissions
2022-06-15 15:34:47 +05:00
ngfrolov
7080b3e855
autoclean.
2022-06-15 14:57:37 +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
805bb4f3ae
Fix migrations
2022-06-14 15:32:32 +05:00
Lyudmila Romanova
9764809c3a
Добавление показателя в операцию. Изменение структуры ответа
2022-06-10 18:36:14 +05:00
ngfrolov
04b085b2ec
Add upsert methods to EF. Not optimized implementation.
2022-06-10 17:30:42 +05:00
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
bf56fbf205
Manual fix migration
2022-05-05 11:46:18 +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
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
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
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
102a0e4dbf
fix spell "RequerstTracker.get"
2022-03-29 09:51:24 +05:00
Фролов
007f7ac62e
Fix UserService.GetNestedPermissions(). returns all permissions for all nested roles
2022-03-15 16:19:51 +05:00
Фролов
8de73084f2
Add Mse to telemetryDataSaub
2022-03-10 17:18:30 +05:00
Фролов
cee68bf4ee
DrillingProgramStateDto Add PermissionToEdit
2022-02-24 09:52:11 +05:00
Фролов
5d8afcd907
Add some useful sql scripts
2022-02-22 11:03:27 +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
Фролов
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
Фролов
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
Фролов
ab5f43edbe
Migrate projects to net 6.
...
Update nuget packadges.
2021-12-28 16:35:31 +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
Фролов
e0834e4720
add telemetry merge
2021-12-17 12:48:58 +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
Фролов
6565957c34
rider recomendations
2021-12-08 15:29:41 +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
Фролов
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
1d078379b4
CS2-123: Renamed Permission collections in EF models
2021-11-30 17:25:08 +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
Фролов
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
Фролов
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
Фролов
14bc1e12b4
Merge branch 'TelemetryTimeZone' into dev
2021-11-22 11:31:10 +05:00
Фролов
b6c2f60296
fix use fileshare only when needed.
2021-11-17 13:06:48 +05:00
Фролов
361aceed96
refactor built query with less mem allocation.
2021-11-17 10:52:03 +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
Фролов
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
Фролов
4d9dc72bd4
doc useful sql
2021-11-12 11:01:43 +05:00
Фролов
e1ba4e1777
fix CacheTable refresh throttling
2021-11-10 18:17: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
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
Фролов
a48f139d26
doc zipeed backup
2021-10-18 09:07: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
Фролов
1a36609d19
New well operation category
2021-10-06 18:06:07 +05:00
Фролов
3d1f96655a
doc. Add useful sql queries
2021-10-06 16:30:28 +05:00
Фролов
031ff8c747
Add migration. Set Telemetry forign keys on delete - cascade.
2021-10-01 17:37:44 +05:00
Фролов
ae9b23cc00
Refactor TelemetryAnalysis.
2021-10-01 15:44:56 +05:00
KharchenkoVV
3c9745474a
Added drilling operations to Telemetry analytics calculation
2021-09-30 17:10:12 +05:00
Фролов
2887327d5f
Doc backup db command
2021-09-29 10:09:40 +05:00
Фролов
dd1d24a7e3
Exctract TelemetryDataSpin into IAsbCloudDbContext
2021-09-29 09:59:10 +05:00
Фролов
a2345cc8f2
update EF
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
Фролов
a046194e35
Add default data (operations dictionary) migration
2021-09-13 09:39:11 +05:00
Фролов
c0a4716341
Merge branch 'master' of https://bitbucket.org/autodrilling/asbcloudserver
2021-09-10 11:30:10 +05:00
Фролов
30a59d0809
cleanup
2021-09-10 11:28:57 +05:00
KharchenkoVV
b022a4c1cb
Fixed return of .DepthToInterval() analytics method
2021-09-09 12:55:13 +05:00
Фролов
6a338403af
Add IId interface to all supported classes
2021-09-09 12:31:12 +05:00
KharchenkoVV
42b9849ae9
Added User model 'email', 'phone', 'position' columns
2021-09-07 14:42:56 +05:00
KharchenkoVV
5e757e9bbb
Added migrations.
2021-09-07 14:04:30 +05:00
KharchenkoVV
e7129f0148
Moved 'Company types' from Demo data to Data in EF context
2021-09-07 09:58:48 +05:00
Фролов
b471efc59e
File author is optional (for drillingProgram)
2021-09-01 15:55:10 +05:00
Фролов
41660af49f
FileController Add file size and fix search by file name
2021-08-31 12:29:27 +05:00
Фролов
e8bfe3b443
add new file categories
2021-08-31 09:52:32 +05:00
Фролов
14cf99a1dd
Add DrillingProgramController
2021-08-29 17:25:16 +05:00
Фролов
06a492a5e5
fix merge plan-fact in WellOperationsStatService
2021-08-29 11:59:20 +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
Фролов
fb914cc2b9
Fix Rop and RaceSpeed
2021-08-25 17:58:35 +05:00
Фролов
54d4a16d14
Add WellType into StatWellDto
2021-08-25 15:17:24 +05:00
Фролов
99d242101e
remove efModel wellSection. Cleanup. Split categories lastData and files
2021-08-24 10:59:10 +05:00
KharchenkoVV
31fd4bda1a
CS2-65: Fixed well section calculation
2021-08-23 14:52:34 +05:00
KharchenkoVV
791f72cbdb
CS2-65: United GetSectionsData() and GetWholeWellData() methods
2021-08-20 16:56:21 +05:00
KharchenkoVV
e45a693c92
CS2-54: Fixed default well operations in Db
2021-08-19 14:31:02 +05:00
KharchenkoVV
9bda8b986d
CS2-54: Added default Well operations data to Db
2021-08-19 14:12:29 +05:00
KharchenkoVV
09c47636d1
CS2-54: Fixed well section calculation for empty data
2021-08-19 10:42:09 +05:00
KharchenkoVV
154426a5fb
Changed WellOperation fileds names
2021-08-18 17:09:57 +05:00
Фролов
582629c8d7
Merge branch 'master' of https://bitbucket.org/frolovng/asbcloudserver
2021-08-18 17:01:16 +05:00
Фролов
7b154abb66
CS2-61 WellOperationController.GetAllAsync(..) добавить параметры фильтрации
2021-08-18 16:57:20 +05:00
KharchenkoVV
1ea6ea83aa
Added 1000 interval in WellOperations Ids
2021-08-18 16:51:41 +05:00
KharchenkoVV
ae3a5c1ac7
CS2-54: Added new well operation categories
2021-08-18 16:26:06 +05:00
KharchenkoVV
64e06daefd
Changed well operation category table name
2021-08-18 15:38:33 +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
KharchenkoVV
1db3a81d56
Renamed plural table names to singular
2021-08-16 10:38:48 +05:00
KharchenkoVV
e668b8c2ff
CS2-53: Model changes to Well/Operation/SectionType
2021-08-16 10:21:46 +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
fa63d18fa3
CS2-53: Added model for 'TVD' chart
2021-08-13 15:37:33 +05:00
KharchenkoVV
12a73a4e21
Renamed 'TelemetryOperation' model to 'Operation'
2021-08-13 15:35:03 +05:00
KharchenkoVV
5951953cb6
Merge branch 'master' of https://bitbucket.org/frolovng/asbcloudserver
2021-08-13 14:50:27 +05:00
KharchenkoVV
29ae60e962
CS2-53: Added operation type to TelemetryOperation model
2021-08-13 14:50:13 +05:00
Фролов
9497aaf7e3
Add WellSectionTypes dbSet
2021-08-13 12:33:05 +05:00
KharchenkoVV
f13b757a84
CS2-50: All controllers and services are made async
2021-08-11 16:54:42 +05:00
KharchenkoVV
4c4048865c
CS2-50: Controllers and some services are made async
2021-08-11 12:11:21 +05:00
KharchenkoVV
744266336e
CS2-50: Added .AsNoTracking() to services' queries.
2021-08-11 10:16:01 +05:00
Фролов
791d09ce2b
fix default entities ids
2021-08-10 16:02:33 +05:00
Фролов
ae5954e345
Rename some entities
2021-08-10 15:53:11 +05:00
Фролов
26f291806f
add default WellSectionTypes
2021-08-10 15:48:06 +05:00
Фролов
8102442f81
Add well related interface
2021-08-10 14:35:00 +05:00
Фролов
57dd3110b8
Add index by depth
2021-08-10 14:34:21 +05:00
Фролов
3a325f6c94
Очистка и анализ кода
2021-08-09 15:41:42 +05:00
Фролов
9e69ff4ce7
Add DbContext Set method into interface
2021-08-09 14:39:56 +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
KharchenkoVV
17c07f8c8e
CS2-43: Added save and get 'LastData' for Fluid
2021-08-03 17:55:28 +05:00
KharchenkoVV
543272ce7b
CS2-43: Added 'Last Data' tables saving to Db
2021-08-02 18:35:36 +05:00
KharchenkoVV
4d08e0e562
CS2-43: Доработанный контроллер, Dto и EF модели для 'Последних данных'
2021-08-02 12:23:18 +05:00
Фролов
77f1f54c30
IsCompanyOwnsWell rename to IsCompanyInvolvedInWell
2021-07-29 12:39:22 +05:00
Фролов
38b21d80f1
replace automapper to mapster
2021-07-28 09:46:58 +05:00
KharchenkoVV
165cabd5dd
Changed Reports to one of the Documents' category
2021-07-27 16:55:32 +05:00
Фролов
16e52cacf5
wellId rename to idWell
2021-07-27 14:43:30 +05:00
Фролов
b76687ecc2
Operation rename to TelemetryOperation
2021-07-27 14:03:08 +05:00
KharchenkoVV
9072abe152
CS2-38: Добавлена пагинация для таблицы с файлами
2021-07-26 11:54:50 +05:00
KharchenkoVV
99242f6995
CS2-38: Добавлены модель, контроллер и сервис для сохранения и отправки файлов по категориям
2021-07-23 17:40:31 +05:00
Фролов
e5a3e30183
CS2-36 В контроллер Deposit добавить метод получения "дерева" доступных пользователю месторождений->кустов->скважин для панели навигации фронта
2021-07-22 14:23:47 +05:00
KharchenkoVV
61205fa7c1
В классе контекста автозаполнение разбито на FillData() и FillDemoData
2021-07-21 17:59:18 +05:00
