Commit Graph

293 Commits

Author SHA1 Message Date
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
4750fe38d6
Merge branch 'dev' into feature/8879776_well_tree_with_stat 2023-02-17 09:50:37 +05:00
ngfrolov
d41cff84a9
Add WellInfoService 2023-02-16 16:27:14 +05:00
aa3b96b31b Плановые операции в суточном рапорте.
1. Добавлен столбец IdPlan в WellOperation
2. Перписан метод MergeArrays
3. Формирование списка плановых операций для сопоставления с фактическими (GetOperationsPlan в WellOperationController)
2023-02-15 17:02:43 +05:00
ngfrolov
f7afa8638e
8879776 new dtos 2023-02-07 16:20:36 +05:00
d8b131622f #7987467 fix 2023-01-24 09:59:18 +05:00
ngfrolov
49678c4973
fix TelemetryWirelineRunOut. make wellinfo optional for POST request. 2023-01-19 11:43:37 +05:00
ngfrolov
56e02ffdd8
fix WellInfoDto. Add well Id. 2023-01-18 15:05:11 +05:00
ngfrolov
f7f0f02c34
ProcessMapReport.
Добавлен ченовик всех рассчетов.
Добавлено формирования excel по dto.
2023-01-17 08:56:07 +05:00
ngfrolov
8fd3f3c290
LimitingParameterDataDto fix. DateTimeOffset -> DateTime 2023-01-16 10:29:52 +05:00
ngfrolov
9f996003eb
ProcessMapReport. Add GetTelemetryDataStatAsync(..) to TelemetryDataSaubService. 2023-01-13 16:08:38 +05:00
ngfrolov
1a7d643c50
merge dev to ProcessMapReport 2023-01-12 16:24:10 +05:00
68c227e7c6 Merge branch 'dev' into PlannedTrajectory_refact 2023-01-12 11:24:50 +05:00
ngfrolov
5948a762ba
#7963103 fixes 2023-01-11 16:00:11 +05:00
60a80745a9 #7963103 Замечания 2023-01-11 13:51:11 +05:00
5c00e996f5 Merge remote-tracking branch 'origin/dev' into PlannedTrajectory_refact 2023-01-10 15:54:11 +05:00
ngfrolov
ac1c9aedb2
ProcessMapService calculations draft 2023-01-10 12:31:01 +05:00
193b9ff9f6 #7963103 Отображение общей наработки тальканата по всем объектам 2023-01-10 10:49:27 +05:00
ngfrolov
f5becebbeb #7987467 Add telemetry statistic calc (not completed) 2022-12-30 15:30:12 +05:00
46453b3893 повторный рефакт
после ревью
2022-12-29 04:25:08 +05:00
ngfrolov
fb4bb375e1 Merge branch 'dev' into feature/ProcessMapReport 2022-12-28 15:22:50 +05:00
bfc9376733 #7987467 + 2022-12-27 14:30:52 +05:00
9819c2ac0d refct #3 2022-12-27 00:02:49 +05:00
ngfrolov
8e896a887d RequerstTracker Add nullable 2022-12-26 18:03:26 +05:00
ngfrolov
b91093b2e4 SubsystemActiveWellStatDto replace WellDto by WellInfoDto 2022-12-26 16:37:29 +05:00
3c84648eec refact #1 2022-12-25 23:16:36 +05:00
169968da44 Скорректированная версия
-добавлена миграция
-изменены методы
- добавлен CRUD
2022-12-22 18:08:58 +05:00
ngfrolov
1afbafdf81 remove dependency AsbCloudDb from AsbCloudApp 2022-12-21 18:00:52 +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
Фролов
9ebcfbcc28 add todo 2022-12-08 14:50:28 +05:00
07fe9fcc5a #7987467 Исправления 2022-12-07 15:04:36 +05:00
aaa5627680 Merge branch 'feature/7987467' of http://46.146.209.148:8080/DDrilling/AsbCloudServer into feature/7987467 2022-12-07 10:52:47 +05:00
102288f9e5 #7987467 fix 2022-12-07 10:52:35 +05:00
ngfrolov
60ab971cae Merge branch 'dev' into feature/7987467 2022-12-07 09:15:39 +05:00
9c9d01d24a №7987467 fix 2022-12-07 08:49:21 +05:00
398a6d443e #7987467 правки 2022-12-07 08:47:41 +05:00
ngfrolov
81d3ef3146 Merge branch 'dev' into WellOperationTree/refact_migration 2022-12-06 16:29:53 +05:00
4f100e6bc4 #7987467 Исправления 2022-12-06 10:41:13 +05:00
9b71b14048 #7987467 2022-12-05 12:43:16 +05:00
9b4f14a036 #7987467 Раздел РТК в ЕЦП 2022-12-05 12:39:25 +05:00
64e51915c8 all changes but database and but migrations 2022-12-02 15:54:55 +05:00
fb5483299d #8101318 Изменение работы кэша 2022-12-01 15:56:11 +05:00
481e87083f #7887519 Добавление параметров 2022-11-28 12:12:59 +05:00
ngfrolov
0d9f9296df Merge branch '7912198_WellCase_add_notification' into dev 2022-11-25 12:45:36 +05:00
ngfrolov
8209b61bad #7912198 Tests ok 2022-11-25 09:34:20 +05:00
40dac37aa4 #7887519 2022-11-23 15:38:47 +05:00
b00b4f3781 #7887519 2022-11-23 11:19:52 +05:00
5041b30686 #7798026 2022-11-23 08:23:08 +05:00
49cc9c2342 Merge branch 'dev' into feature/7887519 2022-11-18 14:30:34 +05:00
c5aef20dc0 #7887519 Статистика по ограничивающим параметрам backend 2022-11-18 14:29:29 +05:00