ngfrolov
ada2b36310
Refactor trajectory
2023-02-20 15:57:08 +05:00
ngfrolov
ff6c5d7751
Merge branch 'feature/8636739' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into feature/8636739
2023-02-20 15:29:06 +05:00
ngfrolov
01e94fc489
Merge branch 'dev' into feature/8636739
2023-02-20 15:28:54 +05:00
5a101b163a
Merge branch 'dev' into feature/filling-fact-operations-in-daily-report
2023-02-20 15:25:33 +05:00
146c84f0a7
Убраны лишние using
2023-02-20 15:23:16 +05:00
66f97678dd
1. На странице фактических операций убрана пагинация
...
2. Фильтрация фактических операций по дате
3. Переписан запрос, формируюший список плановых операций для сопоставления
2023-02-20 15:17:49 +05:00
ngfrolov
02a8db1a58
Enable nullable on Relation*, ReportProperty, SetpointRequest, WellFinalDocument.
2023-02-20 14:21:52 +05:00
aa2ca4cadf
Merge branch 'dev' into feature/8636739
2023-02-20 13:56:08 +05:00
ngfrolov
942b2bca74
Enable nullable on user, userRole
2023-02-20 12:18:45 +05:00
25cbdc911c
#8636739
2023-02-20 11:16:24 +05:00
d852fb3640
#8636739 data
2023-02-20 11:12:39 +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
4750fe38d6
Merge branch 'dev' into feature/8879776_well_tree_with_stat
2023-02-17 09:50:37 +05:00
ngfrolov
b8caa7451d
merge dev to 8879776
2023-02-17 09:33:00 +05:00
85c6b63c7a
изменен метод BuildQuery в WellOperationRepository: вначале фильтрация, далее - проекция
2023-02-17 09:25:34 +05:00
ngfrolov
d41cff84a9
Add WellInfoService
2023-02-16 16:27:14 +05:00
bd5260edd1
#8636739 tests
2023-02-16 11:54:05 +05:00
c7a6e38315
1. Возвращаемый тип списка плановых операций - IEnumerable<WellOperationDto>
...
2. Добавлен CancellationToken token
3. Рефактор запроса на получение списка плановых операций
4. Проверка на доступность скважины пользователю
5. Сортировка данных по дате в методе MergeArrays
2023-02-16 09:51:55 +05:00
ngfrolov
b3c1f0ae9e
Disable some operation detectors.
2023-02-15 18:03:23 +05:00
ngfrolov
7779116c8a
WellOperationRepository.GetCategories(..) add arg, to filter categories/
2023-02-15 18:02:36 +05:00
ngfrolov
eb18d73dd0
Fix CrudWellRelated*Repository.. Get* method returns nonNullable values.
2023-02-15 18:00:48 +05:00
ngfrolov
fda5385e46
IWellService refactor.
...
- Add #nullable,
- Add WellRequest,
- Remove obsolete method
2023-02-15 17:57:32 +05:00
ngfrolov
40076f0ec2
remove deprecated iTextSharp
2023-02-15 17:15:09 +05:00
aa3b96b31b
Плановые операции в суточном рапорте.
...
1. Добавлен столбец IdPlan в WellOperation
2. Перписан метод MergeArrays
3. Формирование списка плановых операций для сопоставления с фактическими (GetOperationsPlan в WellOperationController)
2023-02-15 17:02:43 +05:00
ngfrolov
707b8f8b3b
8543610 Add exceptions for badRequest
2023-02-15 14:00:46 +05:00
dbbd4d5603
если пользователь не найден в контексте
...
возвращается ArgumentInvalidException
2023-02-15 11:44:20 +05:00
d2729c3a80
remove package
2023-02-15 11:13:34 +05:00
96dae2f247
исправление ошибок в методах
2023-02-14 18:36:25 +05:00
2b02bdb0b8
правка метода редактирования пользователя
...
согласно код-ревью
2023-02-14 12:30:05 +05:00
2cc8abd767
рефакт
2023-02-14 12:20:29 +05:00
6bf992f1f6
доработка методов репозитория
2023-02-13 23:11:39 +05:00
95790af1f6
new change to cache methods
2023-02-13 16:11:31 +05:00
3f2febc022
#8636739 Визуализация траектории 3D
2023-02-13 12:39:45 +05:00
4192254072
#8636739 Визуализация траектории 3D
2023-02-13 09:11:28 +05:00
7127dfd9bb
#8636739 Визуализация траектории 3D
2023-02-13 09:10:48 +05:00
1694ef8569
Merge branch 'dev' into Task/8543610
2023-02-10 12:13:32 +05:00
d47fa1b09c
#8636739 Визуализация траектории 3D
2023-02-10 11:12:16 +05:00
ngfrolov
8b80fff126
Merge branch 'dev' into Task/8543610
2023-02-10 09:36:14 +05:00
f7a58cfa12
refact
2023-02-09 11:38:04 +05:00
f2362a4309
Merge branch 'feature/add-page-rtk-method' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into feature/add-page-rtk-method
2023-02-08 15:46:47 +05:00
8c579fe5b7
1. Убраны лишние юзинги + лишняя проверка на null
...
2. Поправлен шаблон документа для выгрузки данных
2023-02-08 15:46:16 +05:00
d35550380c
refact update role method
2023-02-08 15:12:46 +05:00
6a3a50fe98
Merge branch 'dev' into feature/add-page-rtk-method
2023-02-08 11:04:12 +05:00
d83555fd46
1. Добавлен api метод GetDrillProcessMap в ProcessMapController, который отдает данные для построения режимной карты по бурению
...
2. Фикс бага по ренедеру данных слайда
2023-02-08 10:42:54 +05:00
54178e8923
правка опечаток и "мусора" после дебага
2023-02-06 21:56:27 +05:00
973f1afb1b
refact ef update
2023-02-06 21:33:53 +05:00
d70cf25c0a
Приведение выгружаемого отчета РТК к актуальному состоянию (добавлен заголовок, частично изменена шапка отчета)
2023-02-06 13:13:23 +05:00
ff12c17496
кэш сменен на memoryCache
...
(стар)
2023-02-05 21:53:51 +05:00
ngfrolov
e548425b18
Add PredicateBuilder to build complex predicate expressions
2023-02-03 16:00:45 +05:00
ngfrolov
759d6125b5
Merge branch 'dev' into feature/8103063
2023-02-03 15:59:50 +05:00
2ba6a57975
Рефакторинг + уьраны лишние using
2023-02-03 11:15:14 +05:00
71bb74137b
Merge branch 'dev' into fix/add-sort-to-paginated-elements
2023-02-03 09:57:05 +05:00
c62d3adb18
Убрано лишнее
2023-02-02 17:51:27 +05:00
2746c94729
Рефактор метода GetMessagesAsync в MessageService
2023-02-02 16:07:41 +05:00
e81abc86e6
Рефактор
2023-02-02 15:58:07 +05:00
b70fa35ef6
bug fixing in UserRepositoty.UpdateAsync
2023-02-02 15:21:48 +05:00
ngfrolov
5956f8238f
#8103063 nit prettify
2023-02-02 14:30:27 +05:00
5644c06fac
#8103063 Замечания
2023-02-02 12:04:50 +05:00
a4ff666b97
Добавлена сортировка сообщений в MessageController
2023-02-02 11:08:25 +05:00
20b99011d1
Merge branch 'feature/8103063' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into feature/8103063
2023-02-02 11:05:02 +05:00
1f80e38c10
#8103063 BuildQuery
2023-02-02 11:04:53 +05:00
ngfrolov
e4b790abbd
Merge branch 'dev' into feature/8103063
2023-02-02 11:04:44 +05:00
e2948782fa
#8103063 BuildQuery
2023-02-02 10:32:53 +05:00
5d3b954171
Merge branch 'feature/WellFinalDocumentsRepository' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into feature/WellFinalDocumentsRepository
2023-01-31 10:13:40 +05:00
e58c292d30
#7065595 fix
2023-01-31 10:13:32 +05:00
ngfrolov
df11450216
Merge branch 'dev' into feature/8103063
2023-01-31 09:28:37 +05:00
ngfrolov
a2b2b98dac
nit WellFinalDocumentsService rename method
2023-01-30 17:44:05 +05:00
ngfrolov
e4becb18ff
Merge branch 'feature/WellFinalDocumentsRepository' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into feature/WellFinalDocumentsRepository
2023-01-30 17:27:11 +05:00
ngfrolov
a367dea6a8
Merge branch 'dev' into feature/WellFinalDocumentsRepository
2023-01-30 17:26:58 +05:00
ngfrolov
31aa5e6ca2
nit ConvertToPdf code formatiing
2023-01-30 17:06:22 +05:00
9505e159c0
Merge branch 'feature/WellFinalDocumentsRepository' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into feature/WellFinalDocumentsRepository
2023-01-30 14:32:24 +05:00
236c32b16c
#7065595 fix
2023-01-30 14:32:16 +05:00
9410508213
#8103063 fix
2023-01-30 10:52:12 +05:00
86c52f5256
refact readme
2023-01-27 18:17:42 +05:00
46074b6bd1
OS identification and build start process option
2023-01-27 17:31:43 +05:00
ngfrolov
1d618302f8
Format code.
2023-01-27 10:11:04 +05:00
d5fd53595e
Merge branch 'dev' into convertToPdf
2023-01-27 09:17:47 +05:00
7be6173f73
Merge branch 'feature/8103063' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into feature/8103063
2023-01-26 15:37:57 +05:00
ecdade0913
#8103063 fix
2023-01-26 15:37:46 +05:00
f0d316cf40
refact convert process command
2023-01-26 15:28:19 +05:00
b7f1962c6f
valid file extension
2023-01-26 15:25:09 +05:00
5d47652751
Merge branch 'dev' into feature/8103063
2023-01-26 11:07:44 +05:00
ccbc499754
#8103063 Подтягивание режимов при формировании композитной скважины
2023-01-26 10:59:24 +05:00
325c5054fe
cleaning up unnecessary dependencies
2023-01-25 05:41:29 +05:00
907fcc88e8
-refact path convert file
2023-01-25 05:33:02 +05:00
ngfrolov
05c238737d
fix SubsystemOperationTimeService. WelOperationCategories use valid constants.
2023-01-24 15:21:49 +05:00
ngfrolov
52a51aa137
Merge branch 'dev' into feature/WellFinalDocumentsRepository
2023-01-24 12:16:25 +05:00
d8b131622f
#7987467 fix
2023-01-24 09:59:18 +05:00
ngfrolov
be9168b4bf
Merge branch 'dev' into convertToPdf
2023-01-24 09:43:12 +05:00
ngfrolov
56be094b83
fix WellOperationTemplate sort operations names
2023-01-23 11:15:25 +05:00
703112d894
Merge branch 'dev' into feature/WellFinalDocumentsRepository
2023-01-20 10:48:17 +05:00
27cf27ed55
#7065595 Перенос сервиса "Дело скважины" в репозиторий
2023-01-20 10:47:39 +05:00
350759f1c6
-типы методов класса конвертации изменены на статические
...
-удаляются только преобразованные файлы
2023-01-20 08:32:22 +05:00
ngfrolov
4dced662e1
Fix TelemetryWirelineRunOut. AddOrUpdateAsync issue
2023-01-19 12:28:38 +05:00
ngfrolov
49678c4973
fix TelemetryWirelineRunOut. make wellinfo optional for POST request.
2023-01-19 11:43:37 +05:00
219fe450a1
Merge branch 'dev' into convertToPdf
2023-01-18 13:58:25 +05:00
11ccfc8be1
редактирование readme файла
2023-01-18 12:14:13 +05:00
e86e1bb854
refact
2023-01-18 11:31:58 +05:00
ngfrolov
aea67f43fe
fix WellOperationRepository day prop
2023-01-18 09:32:50 +05:00
22a662a1be
dev merge
2023-01-17 17:52:26 +05:00
ngfrolov
fa6fdc067e
WellFinalDocumentsService.ReNotifyPublishersAsync replace exception type by argumentInvalid
2023-01-17 15:40:49 +05:00
ngfrolov
595eca8e26
nit code format
2023-01-17 13:28:35 +05:00
5367f3e85f
rename DoMerged => MergeFiles
...
refact file extension validate
2023-01-17 12:09:58 +05:00
3e128c5cba
refact GetConverteAndMergedFileAsync
2023-01-17 11:11:40 +05:00
ngfrolov
e398beaaa1
ProcessMapReport. Add some todos.
2023-01-17 10:00:08 +05:00
ngfrolov
f7f0f02c34
ProcessMapReport.
...
Добавлен ченовик всех рассчетов.
Добавлено формирования excel по dto.
2023-01-17 08:56:07 +05:00
1b834e7752
Добавлено исключение некорректного формата файла
2023-01-17 05:14:04 +05:00
ngfrolov
8fd3f3c290
LimitingParameterDataDto fix. DateTimeOffset -> DateTime
2023-01-16 10:29:52 +05:00
c2afbf4d55
add ConvertToPdf class
...
add ReadMe
add test to ConsoleApp1
2023-01-13 17:28:04 +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
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
7d9d248bcb
правка замечаний
2023-01-12 10:32:54 +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
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
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
ec97b02480
небольшая корректировка
2022-12-28 02:52:09 +05:00
5a6ad78c21
refact finally
2022-12-27 21:45:03 +05:00
bfc9376733
#7987467 +
2022-12-27 14:30:52 +05:00
ff72a0cb88
refact
...
-query
-method name
2022-12-27 14:03:44 +05:00
9819c2ac0d
refct #3
2022-12-27 00:02:49 +05:00
e84d45693c
refact model DB and migrations
2022-12-26 19:22:29 +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
689872d1e5
WellOperationRepository DRAFT
2022-12-22 15:27:35 +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
ngfrolov
cc8a4fa200
Fix WellOperationService.GetOperationsAsync exception by call Min on empty collection
2022-12-20 15:58:35 +05:00
ngfrolov
ba0eaa8014
Merge branch 'master' into dev
2022-12-20 11:58:05 +05:00
ngfrolov
f6e79e51d7
nit Add detectedOperations diagnostic message;
...
add basic telemetry validation filter before analisys;
simplify Avg calc;
fix dbcontext refCount;
2022-12-20 11:57:29 +05:00
1f70868120
#8242403 fix
2022-12-14 10:38:44 +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
ngfrolov
54d68cc52d
Merge branch 'dev' into feature/8027597
2022-12-12 11:13:36 +05:00
ngfrolov
a4db3e56d3
#7796681 Добавление секций в шаблон файла импорта
2022-12-12 11:12:20 +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
652374ed5b
В условии наработок по подсистеме осциляция не учитывается режим подворотов
2022-12-09 20:22:54 +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
252c45ac00
#7987467 token
2022-12-07 15:23:10 +05:00
07fe9fcc5a
#7987467 Исправления
2022-12-07 15:04:36 +05:00
ngfrolov
5a0b92a1ec
ProcessMapRepository enable nullable
2022-12-07 12:20:24 +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
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
1cf2d745b3
refact warnings to WellOperationService
2022-12-06 22:34:48 +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
ngfrolov
e124c54ed7
Merge branch 'feature/7987467' of http://46.146.209.148:8080/DDrilling/AsbCloudServer into feature/7987467
2022-12-06 10:55:12 +05:00
4f100e6bc4
#7987467 Исправления
2022-12-06 10:41:13 +05:00
29d4121440
Получение списков ограничивающих параметров и подсистем
2022-12-06 10:03:24 +05:00
ngfrolov
d5bc886c22
Merge branch 'dev' into feature/7987467
2022-12-06 09:33:45 +05:00
ngfrolov
84dfa183d7
Decrease TelemetryDataCache size.
2022-12-05 17:48:15 +05:00
4b9cd6694b
#7987467
2022-12-05 12:44:46 +05:00
9b71b14048
#7987467
2022-12-05 12:43:16 +05:00
9b4f14a036
#7987467 Раздел РТК в ЕЦП
2022-12-05 12:39:25 +05:00
ngfrolov
8094c8b1b8
Decrease TelemetryDataCache size.
2022-12-05 10:53:24 +05:00
ngfrolov
289d1831b4
CacheBase makes cache for TEntity only. Converter moved to CrudCacheRepositoryBase
2022-12-05 09:38:23 +05:00
ngfrolov
a859c096d1
Merge branch 'dev' into feature/8101318
2022-12-05 09:28:38 +05:00
ngfrolov
7c31f7ce76
Merge branch 'dev' of http://46.146.209.148:8080/DDrilling/AsbCloudServer into dev
2022-12-05 08:49:45 +05:00
ngfrolov
b05aadccb4
Add memory monitor
2022-12-02 17:44:47 +05:00
ngfrolov
8e9baf22d8
BackgroundWorker Move periodic services
2022-12-02 17:18:16 +05:00
64e51915c8
all changes but database and but migrations
2022-12-02 15:54:55 +05:00
ngfrolov
71aff8d1ec
nit. comments and cleanup
2022-12-02 14:49:00 +05:00
ngfrolov
89e0495d09
BackgroundWorker adapt other services to this one.
2022-12-02 14:48:23 +05:00
ngfrolov
98c7599c4b
BackgroundWorker move to toplevel folder
2022-12-02 14:45:20 +05:00
ngfrolov
06fe0e09ff
BackgroundWorkerService cleanup and improve tests
2022-12-02 10:57:27 +05:00
ngfrolov
f61db91dd2
Add new background service.
2022-12-01 17:48:35 +05:00
fb5483299d
#8101318 Изменение работы кэша
2022-12-01 15:56:11 +05:00
fd69b4c80a
Merge branch 'feature/7759269' of http://46.146.209.148:8080/DDrilling/AsbCloudServer into feature/7759269
2022-11-29 12:11:38 +05:00
4a547d82ae
#7759269 Проверка ролей на зацикливание включенных ролей
2022-11-29 11:23:08 +05:00
a12906d558
#7759269 Проверка ролей на зацикливание включенных ролей
2022-11-29 11:22:34 +05:00
c9c60bce2b
#7759269 Проверка ролей на зацикливание включенных ролей
2022-11-29 11:22:09 +05:00
ba96645288
#7759269 Проверка ролей на зацикливание включенных ролей
2022-11-29 08:40:01 +05:00
481e87083f
#7887519 Добавление параметров
2022-11-28 12:12:59 +05:00
ngfrolov
3e0f2d0a75
##7739441 bit depth returns always LE well depth
2022-11-25 15:26:45 +05:00
ngfrolov
0d9f9296df
Merge branch '7912198_WellCase_add_notification' into dev
2022-11-25 12:45:36 +05:00
046a6a765d
#7887519 Замечания
2022-11-25 11:56:21 +05:00
ngfrolov
8209b61bad
#7912198 Tests ok
2022-11-25 09:34:20 +05:00
17cf2c6573
#7887519 test
2022-11-24 11:15:50 +05:00
40dac37aa4
#7887519
2022-11-23 15:38:47 +05:00
ngfrolov
4277850156
#7912198 implement ReNotifyPublishers
2022-11-23 14:03:08 +05:00
b00b4f3781
#7887519
2022-11-23 11:19:52 +05:00