on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity
2,883 Commits 1 Branch 0 Tags 37 MiB
9723ee3b9e
Commit Graph

478 Commits

Author SHA1 Message Date
Фролов
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
Фролов
1a36609d19 New well operation category 2021-10-06 18:06:07 +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
Фролов
dd1d24a7e3 Exctract TelemetryDataSpin into IAsbCloudDbContext 2021-09-29 09:59:10 +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
KharchenkoVV
eaafc7fd04 Изменены некоторые имена полей TelemetryAnalysis 2021-07-21 17:57:59 +05:00
KharchenkoVV
e447473a71 CS2-34: Добавлена пагинация в метод, возвращающий список событий на скважине 2021-07-21 16:49:24 +05:00
Фролов
beab5a39a1 explicit many to many relation 2021-07-21 16:30:57 +05:00
Фролов
6abbf476b1 авточистка проекта 2021-07-21 15:29:19 +05:00
Фролов
d0378e4f1d Customer to company. Db model opt. 2021-07-21 15:22:58 +05:00
Фролов
28a1295332 CS2-30 Создать контроллер куста и контроллер месторождения. 
Разработана модель данных
 2021-07-21 12:48:37 +05:00
Фролов
11f5bd00f1 CS2-30 Создать контроллер куста и контроллер месторождения. 
Разработана модель данных
 2021-07-21 12:30:51 +05:00
KharchenkoVV
2586bacaf6 CS2-31: Добавлены параметры id_feed_regulator и MSE в передачу и сохранение в БД (в DataSaubBase) 2021-07-20 13:42:07 +05:00
KharchenkoVV
faaa4bedda CS2-33: Сохранение аналитики целой операцией с продолжительностью. 2021-07-20 09:36:40 +05:00
Фролов
5c783b332b Merge branch 'master' of https://bitbucket.org/frolovng/asbcloudserver 2021-07-19 17:46:00 +05:00
KharchenkoVV
e3c4b262d9 CS2-29: Изменены имя и поля модели DrillingAnalysis (на TelemetryAnalysis) 2021-07-19 15:57:38 +05:00
KharchenkoVV
41111a5535 CS2-29: Изменены имя и поля модели DrillingAnalysis (на TelemetryAnalysis) 2021-07-19 15:31:50 +05:00
Фролов
f30cafcb1e CS2-30 Создать контроллер куста и контроллер месторождения 2021-07-19 15:11:01 +05:00
KharchenkoVV
fd5871a9ec CS2-24: Добавлены данные аналитики по операциям 2021-06-30 10:16:06 +05:00
KharchenkoVV
5259a1c730 CS2-24: Правки к предыдущим 3 коммитам 2021-06-25 15:10:05 +05:00
KharchenkoVV
9aa78e9e2c CS2-24: Добавлено распознавание операции по телеметрии 2021-06-24 13:02:31 +05:00
KharchenkoVV
5409f5a38f CS2-24: Исправлены либо заменены заглушками данные для графиков аналитики. 2021-06-22 09:49:53 +05:00
KharchenkoVV
1bc374523a CS2-3: Добавлено получение отчетов с сервера и оповещение о прогрессе получения 2021-06-07 16:31:14 +05:00
KharchenkoVV
6803f836b4 CS2-10: Добавлен поиск по имеющимся отчетам, которые удовлетворяют заданным параметрам 2021-05-31 12:33:17 +05:00
Фролов
7e1ccc21ab fix report model error 2021-05-24 16:31:02 +05:00
KharchenkoVV
1358f7fc11 CS2-3: Дополнен класс Report для контекста EF Core 2021-05-20 14:30:25 +05:00
KharchenkoVV
e3c916bc42 Очистка кода 2021-05-19 15:21:19 +05:00
KharchenkoVV
35b24176ff CS2-3: Добавлена инфраструктура для работы с репортами 2021-05-18 12:33:23 +05:00
KharchenkoVV
583866d75d CS2-1: Убран лишний параметр из метода GetDatesRange() 2021-05-17 14:04:33 +05:00
KharchenkoVV
abbc461330 CS2-1: Добавлена возможность получения диапазона дат архива 2021-05-17 12:53:30 +05:00
Фролов
7d8974a8e5 Заработала синхронизация с панели 2021-04-30 17:35:35 +05:00
Фролов
fce20a2a10 autocleanup 2021-04-23 10:21:25 +05:00
Фролов
24e0bed979 настроил разделение по группас в signalR, отправку из веб апи. доработал кеш. 2021-04-09 17:59:07 +05:00
Фролов
ef9bb8f39f среда:) 2021-04-07 18:01:56 +05:00
Фролов
31a2e1e878 Добавьте файлы проекта. 2021-04-02 17:28:07 +05:00