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

1498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ai.astrakhantsev
ecdade0913 #8103063 fix 2023-01-26 15:37:46 +05:00
eugeniy_ivanov
f0d316cf40 refact convert process command 2023-01-26 15:28:19 +05:00
eugeniy_ivanov
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
ai.astrakhantsev
ccbc499754 #8103063 Подтягивание режимов при формировании композитной скважины 2023-01-26 10:59:24 +05:00
eugeniy_ivanov
325c5054fe cleaning up unnecessary dependencies 2023-01-25 05:41:29 +05:00
eugeniy_ivanov
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
bce61f97da
Fix PlannedTrajectory permissions 2023-01-24 15:03:45 +05:00
ngfrolov
52a51aa137
Merge branch 'dev' into feature/WellFinalDocumentsRepository 2023-01-24 12:16:25 +05:00
ai.astrakhantsev
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
ai.astrakhantsev
0e5f41a073 Merge branch 'dev' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into dev 2023-01-23 11:45:03 +05:00
ai.astrakhantsev
b847b72008 #5703631 Не приходит сообщение на почту об ожидании загрузки или согласовании документов в программу на бурение ЕЦП 2023-01-23 11:44:50 +05:00
ngfrolov
56be094b83
fix WellOperationTemplate sort operations names 2023-01-23 11:15:25 +05:00
ai.astrakhantsev
703112d894 Merge branch 'dev' into feature/WellFinalDocumentsRepository 2023-01-20 10:48:17 +05:00
ai.astrakhantsev
27cf27ed55 #7065595 Перенос сервиса "Дело скважины" в репозиторий 2023-01-20 10:47:39 +05:00
ngfrolov
b178af93fb
fix protobuf model 2023-01-20 09:10:34 +05:00
eugeniy_ivanov
350759f1c6 -типы методов класса конвертации изменены на статические 
-удаляются только преобразованные файлы
 2023-01-20 08:32:22 +05:00
ngfrolov
4dced662e1
Fix TelemetryWirelineRunOut. AddOrUpdateAsync issue 2023-01-19 12:28:38 +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
56e02ffdd8
fix WellInfoDto. Add well Id. 2023-01-18 15:05:11 +05:00
Никита Фролов
219fe450a1 Merge branch 'dev' into convertToPdf 2023-01-18 13:58:25 +05:00
ngfrolov
d9fcfd862e
fix permission migration 2023-01-18 13:57:21 +05:00
eugeniy_ivanov
11ccfc8be1 редактирование readme файла 2023-01-18 12:14:13 +05:00
eugeniy_ivanov
e86e1bb854 refact 2023-01-18 11:31:58 +05:00
ngfrolov
c5131d0f07
Add new permissions 2023-01-18 10:44:40 +05:00
ngfrolov
aea67f43fe
fix WellOperationRepository day prop 2023-01-18 09:32:50 +05:00
eugeniy_ivanov
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
07f77f83d8
fix TelemetryDataSaubController 2023-01-17 15:39:36 +05:00
Никита Фролов
ae4e725cce Merge pull request 'feature/ProcessMapReport' (#19) from feature/ProcessMapReport into dev 
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/19
 2023-01-17 13:29:07 +05:00
ngfrolov
595eca8e26
nit code format 2023-01-17 13:28:35 +05:00
eugeniy_ivanov
5367f3e85f rename DoMerged => MergeFiles 
refact file extension validate
 2023-01-17 12:09:58 +05:00
eugeniy_ivanov
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
eugeniy_ivanov
1b834e7752 Добавлено исключение некорректного формата файла 2023-01-17 05:14:04 +05:00
ngfrolov
8fd3f3c290
LimitingParameterDataDto fix. DateTimeOffset -> DateTime 2023-01-16 10:29:52 +05:00
eugeniy_ivanov
c2afbf4d55 add ConvertToPdf class 
add ReadMe
add test to ConsoleApp1
 2023-01-13 17:28:04 +05:00
ngfrolov
7e5979c48a
ProcessMapReport inject ITelemetryDataSaubService 2023-01-13 16:12:37 +05:00
ngfrolov
9f996003eb
ProcessMapReport. Add GetTelemetryDataStatAsync(..) to TelemetryDataSaubService. 2023-01-13 16:08:38 +05:00
ngfrolov
9f51007622
ProcessMapReport. Add GetTelemetryDataStatAsync(..) to TelemetryDataSaubService. 2023-01-13 14:34:26 +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
Никита Фролов
2b258b8e74 Merge pull request 'PlannedTrajectory_refact' (#18) from PlannedTrajectory_refact into dev 
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/18
Reviewed-by: Никита Фролов <ng.frolov@digitaldrilling.ru>
 2023-01-12 11:25:28 +05:00
Никита Фролов
68c227e7c6 Merge branch 'dev' into PlannedTrajectory_refact 2023-01-12 11:24:50 +05:00
eugeniy_ivanov
7d9d248bcb правка замечаний 2023-01-12 10:32:54 +05:00