Commit Graph

937 Commits

Author SHA1 Message Date
25cbdc911c #8636739 2023-02-20 11:16:24 +05:00
d852fb3640 #8636739 data 2023-02-20 11:12:39 +05:00
bd5260edd1 #8636739 tests 2023-02-16 11:54:05 +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
d47fa1b09c #8636739 Визуализация траектории 3D 2023-02-10 11:12:16 +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
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
d70cf25c0a Приведение выгружаемого отчета РТК к актуальному состоянию (добавлен заголовок, частично изменена шапка отчета) 2023-02-06 13:13:23 +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
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