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

306 Commits

Author SHA1 Message Date
eugeniy_ivanov
9da19b2464 add manual sql - hypertable 2023-03-31 11:12:00 +05:00
eugeniy_ivanov
e4412d3b2a reviw db model and migration 2023-03-31 11:10:16 +05:00
eugeniy_ivanov
adb9d177bc new migration 2023-03-29 00:06:16 +05:00
eugeniy_ivanov
3df7437955 new db model 
remove migrations
 2023-03-28 21:47:34 +05:00
eugeniy_ivanov
b922ac245a add migration hypertable and chunks 2023-03-28 03:00:20 +05:00
eugeniy_ivanov
a53bf11900 add migration 2023-03-28 02:21:56 +05:00
ngfrolov
df6c423341
Merge branch 'dev' into feature/refactoring-daily-report-form 2023-03-23 11:07:10 +05:00
ngfrolov
14d8221917
Add usage to ProcessMap 2023-03-21 17:51:34 +05:00
eugeniy_ivanov
d27aa4e83a db change 2023-03-21 12:34:43 +05:00
Olga Nemt
a97fd12b74 Merge branch 'dev' into feature/refactoring-daily-report-form 2023-03-10 11:24:33 +05:00
ngfrolov
fb128c0eb1
Add root auto-permission 2023-03-07 15:33:06 +05:00
Olga Nemt
52a6b92824 Merge branch 'dev' into feature/refactoring-daily-report-form 2023-03-06 16:33:58 +05:00
Olga Nemt
b6181ab82f 1. Сохранение суточного рапорта по частям. 
2. Обновление типа данных поля "Дата отчета" в таблице "Суточный рапорт" (timestamp with time zone изменен на date)
 2023-03-06 16:30:36 +05:00
eugeniy_ivanov
21065efb22 rename column "name" (rotor and slide operation) 2023-03-01 12:08:34 +05:00
eugeniy_ivanov
927935a523 добавление новых категорий 2023-03-01 11:39:47 +05:00
ngfrolov
0c26c57d97
Enable nullable on DailyReport 2023-02-20 15:28:35 +05:00
ngfrolov
09d0d42688
Enable nullable on Telemetry* 2023-02-20 15:06:26 +05:00
ngfrolov
02a8db1a58
Enable nullable on Relation*, ReportProperty, SetpointRequest, WellFinalDocument. 2023-02-20 14:21:52 +05:00
ngfrolov
942b2bca74
Enable nullable on user, userRole 2023-02-20 12:18:45 +05:00
ngfrolov
1f8b7b7451
Enable nullable on Permission Measure LimitingParameter 2023-02-17 17:58:07 +05:00
ngfrolov
2b0e36d68c
Enable nullable on DetectedOperation DrillingProgramPart FileCategory FileInfo FileMark 2023-02-17 17:36:25 +05:00
ngfrolov
61bee21ad9
Enable nullable for ef models: Deposit, Cluster, Well, WellOperation, WellOperationCategory, Company, and corresponding dtos. 2023-02-17 15:30:17 +05:00
ngfrolov
3510af3628
Trim migrations history 2023-02-17 12:25:46 +05:00
ngfrolov
dcc3667e6a
Add migration Add_IX_FK_PlanOperation_to_WellOperation 2023-02-17 12:13:32 +05:00
Olga Nemt
aa3b96b31b Плановые операции в суточном рапорте. 
1. Добавлен столбец IdPlan в WellOperation
2. Перписан метод MergeArrays
3. Формирование списка плановых операций для сопоставления с фактическими (GetOperationsPlan в WellOperationController)
 2023-02-15 17:02:43 +05:00
ngfrolov
cfdadcb2d2
Merge master to dev 2023-02-03 09:17:14 +05:00
ngfrolov
e804f7de2b
Fix Add permissions for ProcessMap 2023-02-03 09:07:53 +05:00
ngfrolov
bce61f97da
Fix PlannedTrajectory permissions 2023-01-24 15:03:45 +05:00
ngfrolov
d9fcfd862e
fix permission migration 2023-01-18 13:57:21 +05:00
ngfrolov
c5131d0f07
Add new permissions 2023-01-18 10:44:40 +05:00
Никита Фролов
68c227e7c6 Merge branch 'dev' into PlannedTrajectory_refact 2023-01-12 11:24:50 +05:00
ai.astrakhantsev
60a80745a9 #7963103 Замечания 2023-01-11 13:51:11 +05:00
ai.astrakhantsev
193b9ff9f6 #7963103 Отображение общей наработки тальканата по всем объектам 2023-01-10 10:49:27 +05:00
eugeniy_ivanov
50d6143366 edit column migration 2022-12-26 21:50:33 +05:00
eugeniy_ivanov
2115a2b2c1 refact db model 
add migration
 2022-12-26 15:49:44 +05:00
eugeniy_ivanov
169968da44 Скорректированная версия 
-добавлена миграция
-изменены методы
- добавлен CRUD
 2022-12-22 18:08:58 +05:00
ngfrolov
d2c638f667 Merge branch 'dev' into feature/7796681 2022-12-12 11:02:59 +05:00
ngfrolov
6c204c49dc Merge branch 'dev' of http://46.146.209.148:8080/DDrilling/AsbCloudServer into dev 2022-12-12 10:59:30 +05:00
eugeniy_ivanov
feefd490e2 Добавление секций 2022-12-10 02:58:09 +05:00
Фролов
39a2ddc3a5 Fix operations ids in services 2022-12-09 18:32:18 +05:00
Фролов
af43cb7588 WellOperationCategory ids ordering 2022-12-09 14:36:45 +05:00
Фролов
c2b003bf8a fix db 2022-12-08 18:00:01 +05:00
ngfrolov
60ab971cae Merge branch 'dev' into feature/7987467 2022-12-07 09:15:39 +05:00
ai.astrakhantsev
398a6d443e #7987467 правки 2022-12-07 08:47:41 +05:00
eugeniy_ivanov
52538a734a refact 2022-12-06 13:36:41 +05:00
ai.astrakhantsev
4f100e6bc4 #7987467 Исправления 2022-12-06 10:41:13 +05:00
ai.astrakhantsev
9b4f14a036 #7987467 Раздел РТК в ЕЦП 2022-12-05 12:39:25 +05:00
eugeniy_ivanov
685691ea6d delete old category - migrations 2022-12-03 00:59:27 +05:00
eugeniy_ivanov
6ed0dda96d migration 
-edit default Data
-edit model
-update WellOperation
 2022-12-03 00:48:40 +05:00
ai.astrakhantsev
b00b4f3781 #7887519 2022-11-23 11:19:52 +05:00
ai.astrakhantsev
c5aef20dc0 #7887519 Статистика по ограничивающим параметрам backend 2022-11-18 14:29:29 +05:00
ai.astrakhantsev
b4372dde50 #6838390 Уменьшение хранимой модели данных SPIN master 2022-10-13 14:22:20 +05:00
eugeniy_ivanov
174be9b35f migration change (Subsystem) 2022-09-18 22:30:18 +05:00
eugeniy_ivanov
edb53fb4e7 Merge branch 'dev' into SubsystemsOperationTime 2022-09-18 21:12:03 +05:00
eugeniy_ivanov
43f3a12651 -changing background subsystem service logic 
-add migration, delete all subsystem table data
-edit EntityFillerSubsystem (new subsystem)
 2022-09-14 12:34:24 +05:00
ngfrolov
4cbe71f8ca merge 2022-09-13 13:34:52 +05:00
ai.astrakhantsev
d42a5ee544 #5998816 Permission, Controllers 2022-09-13 10:06:56 +05:00
ai.astrakhantsev
44be18f5ed #5998816 WellFinalDocument edit publisher 2022-09-13 09:22:49 +05:00
ai.astrakhantsev
c4d88401fd #5998816 дело скважины, исправления 2022-09-12 08:22:46 +05:00
ngfrolov
a0ec08fac5 merge dev to subsystem 2022-09-08 09:46:32 +05:00
ai.astrakhantsev
896ba03589 #5998816 Дело скважины + тесты 2022-09-05 09:13:45 +05:00
eugeniy_ivanov
20f79f461f - В SubsystemStatDto свойство UsedTimeHours double. TimeSpan. 
- В SubsystemDto свойство Subsystem переименовано в SubsystemName
- миграция для заполнения Subsystem
- метод bsystemOperationTimeService.GetSubsystemByIdWellAsync перенесен в SubsystemService.
 2022-08-15 15:08:17 +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
eugeniy_ivanov
a20dbf72e0 merge dev to subsystems 2022-08-08 17:02:52 +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
eugeniy_ivanov
9f23a45be7 #создана миграция новых таблиц подсистем и наработок 
#дополнен SubsystemOperationTimeService
 2022-08-02 15:26:33 +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
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
IvanovEugeniy
c5785fbb5f корректировка скрипта миграции 
корректировка стилей и блоков
 2022-07-06 09:21:35 +05:00
eugeniy_ivanov
73f804d3d6 добавление миграции - очистка таблицы t_daily_report 2022-07-05 14:27:23 +05:00
ngfrolov
69ac4c74d5 Operation detection algorithm adapt. 2022-06-30 17:37:57 +05:00
IvanovEugeniy
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
805bb4f3ae Fix migrations 2022-06-14 15:32:32 +05:00
Lyudmila Romanova
9764809c3a Добавление показателя в операцию. Изменение структуры ответа 2022-06-10 18:36:14 +05:00
Lyudmila Romanova
6c89c32ab3 Фиксация для слияния 2022-06-10 11:58:49 +05:00
Lyudmila Romanova
6d44dadb27 Модель и сервисы для значений операций 2022-06-07 16:24:05 +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
339921b968 Rename models; 
Fix cs8618 (nullables);
Add migration.
 2022-05-26 13:28:16 +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
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
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
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
Фролов
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
Фролов
4c19186158 Add UserRole related matrix defaults 2022-02-03 09:58:42 +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
Фролов
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
Фролов
962d6e15b6 Fix spelling for defaults. 
Replace DateTime to DateTimeOffset in models
 2021-12-30 10:45:06 +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
Харченко Владимир
33c3e74e53 Added new well section types 2021-12-22 16:06:30 +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
Харченко Владимир
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
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
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
Фролов
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
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
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
911deb5b8b CS2-97: Added DrillFlowChartParams infrastructure 2021-10-13 17:34:32 +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
Фролов
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
Фролов
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
Фролов
30a59d0809 cleanup 2021-09-10 11:28:57 +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