Commit Graph

431 Commits

Author SHA1 Message Date
907fcc88e8 -refact path convert file 2023-01-25 05:33:02 +05:00
ngfrolov
be9168b4bf
Merge branch 'dev' into convertToPdf 2023-01-24 09:43:12 +05:00
350759f1c6 -типы методов класса конвертации изменены на статические
-удаляются только преобразованные файлы
2023-01-20 08:32:22 +05:00
ngfrolov
f7654a95b6
fix TelemetryWirelineRunOutController.PostData. It`s async. 2023-01-19 12:05:47 +05:00
ngfrolov
49678c4973
fix TelemetryWirelineRunOut. make wellinfo optional for POST request. 2023-01-19 11:43:37 +05:00
ngfrolov
c5131d0f07
Add new permissions 2023-01-18 10:44:40 +05:00
ngfrolov
07f77f83d8
fix TelemetryDataSaubController 2023-01-17 15:39:36 +05:00
ngfrolov
595eca8e26
nit code format 2023-01-17 13:28:35 +05:00
ngfrolov
1a7d643c50
merge dev to ProcessMapReport 2023-01-12 16:24:10 +05:00
ngfrolov
cfab294945
nit. docfix 2023-01-12 16:22:36 +05:00
ngfrolov
7c6e00fe51
PlannedTrajectory fix 2023-01-12 12:07:31 +05:00
68c227e7c6 Merge branch 'dev' into PlannedTrajectory_refact 2023-01-12 11:24:50 +05:00
e950f40122 GetFileName -> async 2023-01-12 09:40:37 +05:00
ngfrolov
5948a762ba
#7963103 fixes 2023-01-11 16:00:11 +05:00
0b3825a531 finally refact 2023-01-11 14:59:54 +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
193b9ff9f6 #7963103 Отображение общей наработки тальканата по всем объектам 2023-01-10 10:49:27 +05:00
46453b3893 повторный рефакт
после ревью
2022-12-29 04:25:08 +05:00
ngfrolov
7585aefc4e WellOperationService to WellOperationRepository 2022-12-28 17:38:53 +05:00
ngfrolov
fb4bb375e1 Merge branch 'dev' into feature/ProcessMapReport 2022-12-28 15:22:50 +05:00
5a6ad78c21 refact finally 2022-12-27 21:45:03 +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
3c84648eec refact #1 2022-12-25 23:16:36 +05:00
ngfrolov
4a4b7852b7 Remove ClusterController, ClusterService. 2022-12-23 14:35:23 +05:00
169968da44 Скорректированная версия
-добавлена миграция
-изменены методы
- добавлен CRUD
2022-12-22 18:08:58 +05:00
ngfrolov
9eead7a757 WellOperation* remove default cancellation tokens 2022-12-22 11:26:19 +05:00
ngfrolov
7b0e6ce23d IWellOperationService/Controller replace arguments by request class 2022-12-21 18:02:22 +05:00
90ee5d10d1 Merge branch 'dev' into feature/ProcessMapReport 2022-12-14 09:32:38 +05:00
bf3a910433 #7987467 fix 2022-12-14 09:10:01 +05:00
e9bd1e4789 #7987467 report 2022-12-14 08:41:19 +05:00
252c45ac00 #7987467 token 2022-12-07 15:23:10 +05:00
07fe9fcc5a #7987467 Исправления 2022-12-07 15:04:36 +05:00
ff16974312 Merge branch 'feature/7987467' of http://46.146.209.148:8080/DDrilling/AsbCloudServer into feature/7987467 2022-12-07 12:57:39 +05:00
1f743ad8b7 #7987467 route 2022-12-07 12:57:28 +05:00
ngfrolov
06e5b30f05 ProcessMapController Add GetByUidAsync, mark as obsolete GetByTelemetry 2022-12-07 12:41:20 +05:00
ae9ee705b0 #7987467 method report file not implemented 2022-12-07 10:57:23 +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
ngfrolov
95f0c1935b nit rename 2022-12-07 09:02:04 +05:00
9c9d01d24a №7987467 fix 2022-12-07 08:49:21 +05:00
84cbff84cb Merge branch 'feature/7987467' of http://46.146.209.148:8080/DDrilling/AsbCloudServer into feature/7987467 2022-12-07 08:48:10 +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
ngfrolov
5e5559a517 Merge branch 'dev' into feature/7987467 2022-12-06 15:51:22 +05:00
29d4121440 Получение списков ограничивающих параметров и подсистем 2022-12-06 10:03:24 +05:00
9b71b14048 #7987467 2022-12-05 12:43:16 +05:00