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

1552 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Никита Фролов
6a3a50fe98 Merge branch 'dev' into feature/add-page-rtk-method 2023-02-08 11:04:12 +05:00
Olga Nemt
d83555fd46 1. Добавлен api метод GetDrillProcessMap в ProcessMapController, который отдает данные для построения режимной карты по бурению 
2. Фикс бага по ренедеру данных слайда
 2023-02-08 10:42:54 +05:00
ngfrolov
f7afa8638e
8879776 new dtos 2023-02-07 16:20:36 +05:00
eugeniy_ivanov
54178e8923 правка опечаток и "мусора" после дебага 2023-02-06 21:56:27 +05:00
eugeniy_ivanov
973f1afb1b refact ef update 2023-02-06 21:33:53 +05:00
Olga Nemt
d70cf25c0a Приведение выгружаемого отчета РТК к актуальному состоянию (добавлен заголовок, частично изменена шапка отчета) 2023-02-06 13:13:23 +05:00
eugeniy_ivanov
ff12c17496 кэш сменен на memoryCache 
(стар)
 2023-02-05 21:53:51 +05:00
ngfrolov
d9279a7703
Merge branch 'feature/8103063' into dev 2023-02-03 16:01:39 +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
Никита Фролов
952ce59e60 Merge pull request 'fix/add-sort-to-paginated-elements' (#24) from fix/add-sort-to-paginated-elements into dev 
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/24
 2023-02-03 11:52:07 +05:00
ngfrolov
fccdbff868
Merge branch 'fix/add-sort-to-paginated-elements' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into fix/add-sort-to-paginated-elements 2023-02-03 11:47:41 +05:00
Olga Nemt
2ba6a57975 Рефакторинг + уьраны лишние using 2023-02-03 11:15:14 +05:00
ngfrolov
ee8e36af94
Merge branch 'dev' into fix/add-sort-to-paginated-elements 2023-02-03 10:27:40 +05:00
ngfrolov
7396be4d6a
fix permission default data. 2023-02-03 10:27:16 +05:00
Никита Фролов
71bb74137b Merge branch 'dev' into fix/add-sort-to-paginated-elements 2023-02-03 09:57:05 +05:00
Olga Nemt
d9684f6985 добавление необходимых полей в конструктор MessageRequest 2023-02-03 09:38:56 +05:00
ngfrolov
cfdadcb2d2
Merge master to dev 2023-02-03 09:17:14 +05:00
Olga Nemt
479cf72f0c Документирующие комментарии в MessageRequestBase 2023-02-03 09:09:55 +05:00
Olga Nemt
0b7f53997a Документирующие комментарии в MessageRequestBase 2023-02-03 09:08:25 +05:00
ngfrolov
e804f7de2b
Fix Add permissions for ProcessMap 2023-02-03 09:07:53 +05:00
Olga Nemt
c62d3adb18 Убрано лишнее 2023-02-02 17:51:27 +05:00
Olga Nemt
2746c94729 Рефактор метода GetMessagesAsync в MessageService 2023-02-02 16:07:41 +05:00
Olga Nemt
e81abc86e6 Рефактор 2023-02-02 15:58:07 +05:00
eugeniy_ivanov
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
ai.astrakhantsev
5644c06fac #8103063 Замечания 2023-02-02 12:04:50 +05:00
Olga Nemt
a4ff666b97 Добавлена сортировка сообщений в MessageController 2023-02-02 11:08:25 +05:00
ai.astrakhantsev
20b99011d1 Merge branch 'feature/8103063' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into feature/8103063 2023-02-02 11:05:02 +05:00
ai.astrakhantsev
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
ai.astrakhantsev
e2948782fa #8103063 BuildQuery 2023-02-02 10:32:53 +05:00
ngfrolov
00a6a333e4
WellFinalDocumentsController remove CancellationToken default value 2023-02-01 14:38:59 +05:00
ai.astrakhantsev
5d3b954171 Merge branch 'feature/WellFinalDocumentsRepository' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into feature/WellFinalDocumentsRepository 2023-01-31 10:13:40 +05:00
ai.astrakhantsev
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
Никита Фролов
d8cbec34eb Merge pull request 'convertToPdf' (#20) from convertToPdf into dev 
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/20
Reviewed-by: Никита Фролов <ng.frolov@digitaldrilling.ru>
 2023-01-30 17:02:54 +05:00
ngfrolov
6affefae90
Merge branch 'dev' into convertToPdf 2023-01-30 15:37:46 +05:00
ai.astrakhantsev
89e5cbcf9a # TelemetryWirelineRunOutDto 2023-01-30 15:07:36 +05:00
ai.astrakhantsev
9505e159c0 Merge branch 'feature/WellFinalDocumentsRepository' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into feature/WellFinalDocumentsRepository 2023-01-30 14:32:24 +05:00
ai.astrakhantsev
236c32b16c #7065595 fix 2023-01-30 14:32:16 +05:00
ai.astrakhantsev
dc2d20bef7 Merge branch 'dev' into feature/8103063 2023-01-30 10:53:34 +05:00
ai.astrakhantsev
9410508213 #8103063 fix 2023-01-30 10:52:12 +05:00
eugeniy_ivanov
86c52f5256 refact readme 2023-01-27 18:17:42 +05:00
eugeniy_ivanov
dd0e49be0a added light console app for test "OS detection" 2023-01-27 18:16:25 +05:00
eugeniy_ivanov
46074b6bd1 OS identification and build start process option 2023-01-27 17:31:43 +05:00