66f97678dd
1. На странице фактических операций убрана пагинация
...
2. Фильтрация фактических операций по дате
3. Переписан запрос, формируюший список плановых операций для сопоставления
2023-02-20 15:17:49 +05:00
ngfrolov
2b0e36d68c
Enable nullable on DetectedOperation DrillingProgramPart FileCategory FileInfo FileMark
2023-02-17 17:36:25 +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
c7a6e38315
1. Возвращаемый тип списка плановых операций - IEnumerable<WellOperationDto>
...
2. Добавлен CancellationToken token
3. Рефактор запроса на получение списка плановых операций
4. Проверка на доступность скважины пользователю
5. Сортировка данных по дате в методе MergeArrays
2023-02-16 09:51:55 +05:00
ngfrolov
7779116c8a
WellOperationRepository.GetCategories(..) add arg, to filter categories/
2023-02-15 18:02:36 +05:00
ngfrolov
fda5385e46
IWellService refactor.
...
- Add #nullable,
- Add WellRequest,
- Remove obsolete method
2023-02-15 17:57:32 +05:00
aa3b96b31b
Плановые операции в суточном рапорте.
...
1. Добавлен столбец IdPlan в WellOperation
2. Перписан метод MergeArrays
3. Формирование списка плановых операций для сопоставления с фактическими (GetOperationsPlan в WellOperationController)
2023-02-15 17:02:43 +05:00
ngfrolov
2e59d97dcd
Add test
2023-02-15 13:35:18 +05:00
3f2febc022
#8636739 Визуализация траектории 3D
2023-02-13 12:39:45 +05:00
7d94945c9f
#8636739 Изменение контроллера
2023-02-13 09:19:11 +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
ngfrolov
759d6125b5
Merge branch 'dev' into feature/8103063
2023-02-03 15:59:50 +05:00
71bb74137b
Merge branch 'dev' into fix/add-sort-to-paginated-elements
2023-02-03 09:57:05 +05:00
5644c06fac
#8103063 Замечания
2023-02-02 12:04:50 +05:00
a4ff666b97
Добавлена сортировка сообщений в MessageController
2023-02-02 11:08:25 +05:00
ngfrolov
e4b790abbd
Merge branch 'dev' into feature/8103063
2023-02-02 11:04:44 +05:00
ngfrolov
00a6a333e4
WellFinalDocumentsController remove CancellationToken default value
2023-02-01 14:38:59 +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
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
6affefae90
Merge branch 'dev' into convertToPdf
2023-01-30 15:37:46 +05:00
236c32b16c
#7065595 fix
2023-01-30 14:32:16 +05:00
dc2d20bef7
Merge branch 'dev' into feature/8103063
2023-01-30 10:53:34 +05:00
ngfrolov
7fcb77f5b4
Fix return types
2023-01-27 11:59:51 +05:00
ecdade0913
#8103063 fix
2023-01-26 15:37:46 +05:00
ccbc499754
#8103063 Подтягивание режимов при формировании композитной скважины
2023-01-26 10:59:24 +05:00
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
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
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
9b4f14a036
#7987467 Раздел РТК в ЕЦП
2022-12-05 12:39:25 +05:00
ngfrolov
a859c096d1
Merge branch 'dev' into feature/8101318
2022-12-05 09:28:38 +05:00
64e51915c8
all changes but database and but migrations
2022-12-02 15:54:55 +05:00
ngfrolov
89e0495d09
BackgroundWorker adapt other services to this one.
2022-12-02 14:48:23 +05:00
fb5483299d
#8101318 Изменение работы кэша
2022-12-01 15:56:11 +05:00
ngfrolov
ddcade44a3
#7912198 fix route
2022-11-25 15:27:35 +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
4277850156
#7912198 implement ReNotifyPublishers
2022-11-23 14:03:08 +05:00
b00b4f3781
#7887519
2022-11-23 11:19:52 +05:00
5041b30686
#7798026
2022-11-23 08:23:08 +05:00
ngfrolov
9b06438935
GetDatesRange Fix handle exception "Well id: {idWell} does not contain telemetry."
2022-11-21 16:58:37 +05:00
cd025c6fdd
#7887519 Статистика по ограничивающим параметрам backend
2022-11-18 14:36:04 +05:00
49cc9c2342
Merge branch 'dev' into feature/7887519
2022-11-18 14:30:34 +05:00
c5aef20dc0
#7887519 Статистика по ограничивающим параметрам backend
2022-11-18 14:29:29 +05:00
ngfrolov
de6bbcfa72
TelemetryUserService добавлен microsoft cache
2022-11-18 12:58:53 +05:00
ngfrolov
c78246ca7d
fix some nit warnings
2022-11-17 17:54:25 +05:00
ngfrolov
eed8c3eeaa
#7579139 Tests
2022-11-15 17:46:58 +05:00
6ac073d59a
Merge branch 'dev' into feature/user_settings
2022-11-08 11:37:52 +05:00
Фролов
06428838c5
#7554801 Printify
2022-11-07 15:30:04 +05:00
f8502b68a1
изменение фильтрации запроса в методе получения интервалов глубин,
...
мелкие правки
2022-11-03 15:57:45 +05:00
ngfrolov
b5650dcd51
merge dev to user_settings
2022-11-03 15:34:03 +05:00
0880c3b75c
часть исправлений после код ревью
2022-11-02 15:51:09 +05:00
ngfrolov
f07b1535d2
Merge branch 'dev' into SubsystemStat/AllActiveWell
2022-11-02 09:00:32 +05:00
562bf5b348
редактирование метода в контроллере
...
изменение интерфейса наработки подсистем
2022-10-31 18:59:08 +05:00
3aa01ebe47
-добавлена модель статистики по активным скважинам
...
- метод расчета статистики
-шаблон метода в контроллере
2022-10-31 18:19:14 +05:00
ngfrolov
e185d8b82a
#7576630 refactor telemetryService.
...
Добавить nullable.
Заменить зависимость от CacheTable/CacheDb.
Удалить не используемые методы.
2022-10-31 15:29:47 +05:00
211f300973
#7205798 Перенос сервиса пользователей и ролей в репозиторий
2022-10-27 11:22:39 +05:00
5ea6919738
#7205798 Перенос сервиса пользователей и ролей в репозиторий
2022-10-26 15:36:49 +05:00
ngfrolov
0bab711eb8
Merge branch 'RangeDataOperationTime' into dev
2022-10-26 10:31:41 +05:00
ngfrolov
1a2806b273
nit
2022-10-26 10:30:59 +05:00
17c7392542
изменена модель возвращаемая методом
...
изменен алгоритм внутри метоа
2022-10-25 09:42:08 +05:00
ngfrolov
33dd020b7e
AuthController.RefreshAsync() returns full UserTokenDto
2022-10-24 10:36:53 +05:00
cc75bcf4f9
корректировка типа в контроллере
2022-10-21 15:58:33 +05:00
dd711c4aa5
добавлен контроллер для получения диапозона
...
изменен аргумент метода
перестроена логика работы метода и возвращаемое значение
2022-10-21 15:52:51 +05:00
25cd263598
Merge pull request ' #7053070 Перенос справочника бурильщиков в репозиторий' ( #8 ) from feature/driller_repository into dev
...
Reviewed-on: http://46.146.209.148:8080/DDrilling/AsbCloudServer/pulls/8
2022-10-19 16:00:35 +05:00
dd469a0f9a
#7053070 Перенос справочника бурильщиков в репозиторий
2022-10-19 15:31:53 +05:00
51d4e30100
#7051313 Перенос создания композитной скважины в репозиторий
2022-10-19 13:56:34 +05:00
ngfrolov
8b68b8276a
#6385536 refactoring
2022-10-17 14:42:47 +05:00
8a83194187
#6385536 Удаление ненужных файлов. Замечания
2022-10-17 08:58:28 +05:00
ngfrolov
3a0a22616d
Merge branch 'dev' into feature/removing_unnecessary_files
2022-10-13 14:46:16 +05:00
ngfrolov
d86f3fc1de
Merge branch 'Redice_telemetry_sampling' into dev
2022-10-11 17:05:27 +05:00
ngfrolov
707f2a638a
Add ReduceSamplingController.
2022-10-11 17:04:26 +05:00
b54de8fe06
#6385536 Замечания
2022-10-11 14:42:04 +05:00
9de5f04fbc
#6385536 замечания
2022-10-11 09:08:25 +05:00
dbe5618a56
#6385536 Удаление ненужных файлов
2022-10-11 08:28:37 +05:00
fe49c90e58
#6539681 file service refactor
2022-10-06 14:37:03 +05:00
ngfrolov
1e34f137cf
rename method
2022-10-03 16:04:25 +05:00
f9e566cfef
#6539681 Исправления
2022-09-30 10:49:40 +05:00
ead3e860ba
#6539681 Файловый репозиторий
2022-09-28 11:17:33 +05:00
863749cfe1
##6539681 Файловый репозиторий
2022-09-28 10:46:12 +05:00
ngfrolov
e8789df59e
SubsystemOperationTimeController изменен валидатор. null - валидное значение для nullable свойств запроса. SubsystemOperationTimeService.BuildQuery изменен по тем же причинам.
2022-09-22 17:44:31 +05:00
1613f9a9f4
- корректировка модели SubsystemStatDto
...
- корректировка метода GetDepthInterval
- корректировка валидатора в контроллере SubsystemOperationTime
2022-09-21 13:06:40 +05:00
0e4c2c9eb3
- в контроллер наработки подсистем добавлен валидатор согласно постановки задачи
...
- изменения алгоритма наработки подсистем САУБ
2022-09-20 22:24:51 +05:00
ngfrolov
4cbe71f8ca
merge
2022-09-13 13:34:52 +05:00
1fe48ee03f
#5998816 commit
2022-09-13 12:43:22 +05:00
5bb2d3ea10
#5998816
2022-09-13 11:54:45 +05:00
ngfrolov
698803fbf8
"красивости"
2022-09-13 11:47:12 +05:00
d42a5ee544
#5998816 Permission, Controllers
2022-09-13 10:06:56 +05:00
44be18f5ed
#5998816 WellFinalDocument edit publisher
2022-09-13 09:22:49 +05:00
7918bfc678
#5998816 PermissionToSetPubliher and PermissionToUpload
2022-09-12 15:05:36 +05:00
5b9afa09fa
#5998816 add IdCategory
2022-09-12 12:05:19 +05:00
c4d88401fd
#5998816 дело скважины, исправления
2022-09-12 08:22:46 +05:00
ngfrolov
d3daef5b17
Fix dependencies
2022-09-08 14:02:49 +05:00
0ad4cebdb8
#5998816 исправление замечаний
2022-09-08 12:05:56 +05:00
ngfrolov
a0ec08fac5
merge dev to subsystem
2022-09-08 09:46:32 +05:00
ngfrolov
79108c754a
fixed
2022-09-07 18:01:39 +05:00
896ba03589
#5998816 Дело скважины + тесты
2022-09-05 09:13:45 +05:00
20f79f461f
- В SubsystemStatDto свойство UsedTimeHours double. TimeSpan.
...
- В SubsystemDto свойство Subsystem переименовано в SubsystemName
- миграция для заполнения Subsystem
- метод bsystemOperationTimeService.GetSubsystemByIdWellAsync перенесен в SubsystemService.
2022-08-15 15:08:17 +05:00
ngfrolov
b95891823d
IUserSettingsRepository replace insert and update to upsert.
2022-08-15 13:19:44 +05:00
62384b5673
-Доделан фоновый сервис
...
-добавлена модель для запроса в Data Spin фонового сервиса
-корректировка моделей (удаление пробелов и лишних библиотек)
-добавление данных по умолчанию о подсистемах (через Entity Filler)
- в методе Convert в SubsystemOperationTimeService сделана корректировка дат
2022-08-15 01:17:00 +05:00
ngfrolov
87e594f5c0
Fix UserSettings. remove permissions
2022-08-12 09:49:55 +05:00
ngfrolov
0486dd9462
Rename ICrudWellRelatedService to IRepositoryWellRelated, and related services
2022-08-11 14:21:28 +05:00
ngfrolov
a5a31d5d82
UserSettingsController replace value type to JsonDocument
2022-08-09 15:59:40 +05:00
a20dbf72e0
merge dev to subsystems
2022-08-08 17:02:52 +05:00
1e694216a9
доделан сервис наработок и статистики.
...
в контроллере доделан экшн получения списка подсистем и добавлена проверка доступа пользователя к скважине
2022-08-05 17:10:56 +05:00
ngfrolov
d2b98d3a77
Add internal DetectedOperationExportService.
...
Add DetectedOperation statistics
2022-08-04 15:06:17 +05:00
2c4d6a9a53
дополнен фоновый сервис наработок
...
доработан контроллер наработок подсистем
переименованы модели ДТО
2022-08-03 16:35:21 +05:00
ngfrolov
5de4e43ad9
merge
2022-08-03 10:57:49 +05:00
9f23a45be7
#создана миграция новых таблиц подсистем и наработок
...
#дополнен SubsystemOperationTimeService
2022-08-02 15:26:33 +05:00
d3bbbd5bd6
наполнение сервисов
...
1)фоновый сервис
2)сервис работы с апи (OperationTimeService)
2022-08-01 13:55:51 +05:00
ngfrolov
b7af07f995
Add UserSettingsController
2022-07-27 18:14:07 +05:00
ngfrolov
892b34f8b1
Merge
2022-07-25 18:03:25 +05:00
ngfrolov
cc5fd56f43
DailyReport. Rename dtos and entities. Remove time offset from DailyReportService.
2022-07-25 18:02:39 +05:00
ngfrolov
ed364112cb
fix AdminUserRoleController forbidder
2022-07-20 13:23:49 +05:00
421c706ca1
корректировка контроллеров и сервисов
2022-07-18 18:51:49 +05:00
7f4b434a8c
Добавлены модели БД ,модели ДТО, интерфейсы, сервисы
2022-07-14 03:47:11 +05:00
ngfrolov
5bb6bd4e9e
fix admin user role forbider
2022-07-06 17:24:46 +05:00
6bce8ee4e0
конечный вариант
...
-выставлено выравнивание строк
-корректировка модели блока SAUB
2022-07-06 15:04:03 +05:00
Фролов
91dd386ffc
nit improvements
2022-07-04 17:51:05 +05:00
ngfrolov
5cc3f50163
DetectedOperationController переделаны route. Добавлено 2 детектора
2022-06-17 17:21:32 +05:00
ngfrolov
ae34d17ae1
doc fix
2022-06-16 17:58:17 +05:00
ngfrolov
6512a7e752
doc
2022-06-16 17:37:10 +05:00
ngfrolov
cf98bd8a20
Crud services moved to Repository directory
2022-06-16 12:33:05 +05:00
ngfrolov
9146be1d3f
merge
2022-06-15 16:21:28 +05:00
ngfrolov
9876edcb9f
Fix AdminUserRoleController.*Forbid predicates.
2022-06-15 16:20:20 +05:00
ngfrolov
5f1de8581f
Fix AdminUserRoleController.*Forbid predicates.
2022-06-15 16:01:50 +05:00
ngfrolov
7080b3e855
autoclean.
2022-06-15 14:57:37 +05:00
ngfrolov
9db7a7303a
Merge branch 'operation_grouping' into dev
2022-06-14 15:35:59 +05:00
ngfrolov
674a5e0e71
Замена базовых классов. Уточнения в задании по не заполненным целевым значениям.
2022-06-14 15:35:31 +05:00
ngfrolov
0ac16d37e9
EventService, MessageService, TelemetryUserService uses new cache model.
2022-06-10 17:36:03 +05:00
ngfrolov
12c97a4119
Merge branch 'operation_grouping' into dev
2022-06-10 10:42:37 +05:00
ngfrolov
dd2a777d3d
Crud services, controllers refactoring. Not tested version of new API.
2022-06-09 11:19:52 +05:00
Lyudmila Romanova
6d44dadb27
Модель и сервисы для значений операций
2022-06-07 16:24:05 +05:00
ngfrolov
9ae268f4c5
Add ProtobufController
2022-06-07 11:14:26 +05:00
ngfrolov
4db67113b4
CrudService очищен от неиспользуемого кода.
...
CrudCacheService Адаптировано для новой схемы кеширования.
Убраны extention методы для mapster.
2022-06-06 15:43:47 +05:00
ngfrolov
c568fafa8f
Add ScheduleController.GetByIdWellAsync(..)
2022-05-26 15:32:23 +05:00
ngfrolov
3671dc12a1
Merge branch 'dev' into schedule_task
2022-05-26 14:09:14 +05:00
ngfrolov
eabec7e7ee
Добавил наследование от CrudController.
2022-05-26 13:34:40 +05:00
Lyudmila Romanova
80bad5bbe2
Правки по PR
2022-05-25 20:19:08 +05:00
Lyudmila Romanova
7bc977ada6
Добавление бурильщика и графика работы. Покрытие тестами.
2022-05-22 21:18:43 +05:00
ngfrolov
521131d27a
Fix DrillingProgramController.AddFile error message text.
2022-05-18 17:02:03 +05:00
ngfrolov
24ccc2a128
fix emails triggers and bodies
2022-05-18 11:07:39 +05:00
ngfrolov
5458ac5414
debug and fix daily report
2022-05-05 15:14:29 +05:00
ngfrolov
5de01e5b5d
remove permissions from wireline telemetryController
2022-05-05 13:32:14 +05:00
ngfrolov
7201f7ca63
merge detected operations
2022-05-05 10:22:51 +05:00
ngfrolov
24b40973bb
merge and fix
2022-05-05 10:06:21 +05:00
zikan
251cdb530a
Correction of errors, formation of an excel file
2022-04-29 15:39:12 +05:00
ngfrolov
579b5f26da
Remove legacy telemetry analysis, except db model
2022-04-29 12:27:12 +05:00
ngfrolov
be8287f041
Add detected operations controller
2022-04-28 15:04:13 +05:00
zikan
019c6a4db1
- Added t_daily_report table and related migrations;
...
- Added request processing service for DailyReportController. Implemented all methods except DownloadAsync.
2022-04-26 16:45:52 +05:00
zikan
76ee379785
Added t_daily_report table and related migrations
2022-04-20 18:03:38 +05:00
ngfrolov
92371eaaf5
Set infrastructure assembly marker.
2022-04-19 13:35:20 +05:00
ngfrolov
9023aef984
Контроллер заглушка для суточного рапорта.
2022-04-19 12:14:03 +05:00
ngfrolov
7b957d0edb
Add WitsControllerAbstract.GetLastDataAsync(..)
2022-04-15 14:45:49 +05:00
ngfrolov
e95c04c91e
Doc wits info methods
2022-04-15 13:40:24 +05:00
ngfrolov
5359beb9aa
doc
2022-04-14 16:07:29 +05:00
ngfrolov
fa9486e44d
grouping services and controllers
2022-04-11 18:00:34 +05:00
ngfrolov
80434475db
Add telemetryWireLine.
...
Add InstantDataRepository
2022-04-11 17:22:52 +05:00
ngfrolov
c96bf87f17
Reorganize dtos
2022-04-08 13:10:06 +05:00
ngfrolov
24b0bc9d8c
Add WITS record tables
2022-04-01 17:55:44 +05:00
ngfrolov
3f2a7406d2
Add ScheduleReport
2022-03-17 16:56:13 +05:00
ngfrolov
c2a691f224
Simplify dependencies
2022-03-16 16:07:37 +05:00
Фролов
bafa372d66
rename some methods
2022-03-02 17:42:34 +05:00
Фролов
6a0289f216
fix drillingProgram permissions
2022-03-02 17:41:22 +05:00
Фролов
f286410eff
Add DrillingProgramCreateError
2022-02-28 14:44:15 +05:00
Фролов
4863b69cfe
DrillingProgram replace idPart by idFileCategory.
2022-02-18 14:16:35 +05:00
Фролов
7a77ff7904
Add backgroundService.
...
ReportService uses backgroundService.
Drilling program alpha
2022-02-17 15:37:27 +05:00
Фролов
e4e906c8d7
DrillingProgramService существенно переработан.
2022-02-12 11:28:16 +05:00
Фролов
def7868b9a
spelling
2022-02-08 13:03:56 +05:00
Фролов
4d89f3785b
CS2-147 При отсутствии файла выдавать 404
2022-02-08 10:25:05 +05:00
Фролов
d0d0200679
Add some permissions, new web client
2022-02-03 08:23:52 +05:00
Фролов
2598738c46
Add Permissions to base crud controller. Add optional custom forbid check on edit methods.
2022-02-01 17:58:31 +05:00
Харченко Владимир
eaf7cb85b2
Disabled PermissionMiddleware and removed [Permission] from TelemetryController
2022-01-27 13:21:12 +05:00
Фролов
e6ac04c6bc
fix DrillFlowChartController.EditAsync() wrong service method
2022-01-21 17:34:23 +05:00
Харченко Владимир
b46a7c33a2
Added Permission attribute to non-anonymous controller methods
2022-01-19 11:42:26 +05:00
Фролов
f5ec155bbb
AdminPermissionController.GetAutogenerated() change generation algorithm.
2022-01-18 17:21:05 +05:00
Фролов
e0bfc8d420
AdminPermissionController. Add method to generate names of auto-permissions.
2022-01-14 17:59:07 +05:00
Фролов
2c51c352b1
CS2-139 Добавить контроллер AdminCompanyType
2022-01-12 13:33:16 +05:00
Фролов
345ca47f87
CS2-135. Db model uses DateTimeOffset. see about using DateTime[Offset].md
2022-01-05 17:50:45 +05:00
Фролов
4872b4a495
не доделано перед праздниками
2021-12-30 17:05:44 +05:00
Фролов
e7d6aef6a6
Move logic from AsbCloudDbContext.GetDepthToIntervalAsync() to TelemetryAnalyticsService.GetWellDepthToIntervalAsync()
2021-12-27 13:49:29 +05:00
Фролов
896e5dc8db
update packs Swashbuckle.AspNetCore*.
...
Fix optional param MeasureController.GetHisoryAsync()
2021-12-24 15:50:30 +05:00
Фролов
03ded4e6cf
TelemetryDataBaseController doesn't await sending to SignalR
2021-12-24 12:59:17 +05:00
Фролов
95df836155
Add WellOperationController.GetSectionTypes()
2021-12-22 17:09:26 +05:00
Фролов
2019386a71
fix AdminCompanyController.Get*(). Include CompanyType
2021-12-22 15:58:49 +05:00
Фролов
ea26010719
fix MeasureController.GetHisoryAsync
2021-12-22 12:31:37 +05:00
Фролов
6924a6bac7
start refactoring// fire alarm
2021-12-21 11:52:53 +05:00
Фролов
a0208f412e
refactor UserRoleService
2021-12-20 15:17:09 +05:00
Фролов
7c24d52fa2
Merge branch 'dev' into NewUserRoles
2021-12-20 15:13:36 +05:00
Фролов
c10c698cbe
add return type description in RequerstTrackerController.GetUsersStat()
2021-12-17 16:30:00 +05:00
Фролов
31b671a0c7
remove unused methods
2021-12-17 13:04:33 +05:00
Фролов
e0834e4720
add telemetry merge
2021-12-17 12:48:58 +05:00
Харченко Владимир
d94b2e685e
CS2-133: Fixed CRUD operations over Permissions
2021-12-17 12:38:34 +05:00
Харченко Владимир
17db1218cc
CS2-133: Removed permission mask logic from permissions
2021-12-16 16:00:47 +05:00
Фролов
551c60c4ff
Add/refactor services for permissions authorization model.
...
Rename some fields in DB.permission.
2021-12-11 16:46:04 +05:00
Фролов
5752ad40b7
some rider recommendations and spelling
2021-12-07 18:27:52 +05:00
Фролов
9a7d2b4140
Remove ReportService.GetSuitableReportsAsync()
2021-12-07 13:55:39 +05:00
Фролов
819bc82227
MeasureService.GetHisoryAsync(..) uses idCategory arg
2021-12-07 13:43:47 +05:00
Фролов
ee01ab30db
Забрал домой
2021-12-07 11:34:06 +05:00
Фролов
fa3e47493b
Doc timascale backup and restore.
2021-12-03 17:34:24 +05:00
Фролов
539905e8e0
Use cacheTable for roles and permissions
2021-12-03 15:03:33 +05:00
Фролов
00dd39b587
merge dev to this
2021-12-03 09:58:48 +05:00
Фролов
4aaac31c43
nit refacroring before merge
2021-12-03 09:44:10 +05:00
KharchenkoVladimir
b655360835
CS2-123: Added AdminPermissionController methods
2021-12-02 12:03:30 +05:00
KharchenkoVladimir
22c5d33b7e
CS2-123: Added AdminPermissionController and Service
2021-12-01 17:10:17 +05:00
Фролов
a74a7cbf58
doc RequestTracker
2021-12-01 12:53:10 +05:00
Фролов
ee2172f64b
fix SetpointsController. Add AllowAnonymous.
...
fix doc for backup db.
2021-11-26 17:14:02 +05:00
KharchenkoVladimir
576d119674
CS2-123: Changed UserRoleService and controller to inherit CrudController/service
2021-11-25 11:55:52 +05:00
Фролов
26ada6572b
Add SetpointInfoDto
2021-11-24 17:58:53 +05:00
KharchenkoVladimir
908c855463
CS2-123: Added CRUD over user roles and their permissions (controller + service)
2021-11-24 17:38:40 +05:00
Фролов
18ad9fc91a
CS2-124 Создать контроллер рекомендый новыйх уставок бурильщику
2021-11-24 16:16:17 +05:00
Фролов
a74032eed5
Fix TelemetryTracker dbContext disposing.
2021-11-23 16:16:13 +05:00
KharchenkoVladimir
6412c24a3e
CS2-107: Fixed rop stat methods routes
2021-11-23 14:07:43 +05:00
KharchenkoVladimir
cb52f96069
Merge branch 'dev' into MaxAndAverageRop
...
# Conflicts:
# AsbCloudInfrastructure/Services/WellService.cs
2021-11-23 11:35:11 +05:00
KharchenkoVladimir
d361c9a9b4
CS2-107: Added calculation of max and average Rop for cluster wells
2021-11-22 17:29:19 +05:00
Фролов
14bc1e12b4
Merge branch 'TelemetryTimeZone' into dev
2021-11-22 11:31:10 +05:00
Фролов
1eaa1efb03
Refactor. Extract TimezoneService.
2021-11-22 11:30:08 +05:00
KharchenkoVladimir
07f76afa35
CS107: Renamed Mse to Rop in Cluster rop stat
2021-11-19 11:17:45 +05:00
KharchenkoVladimir
00798becb0
CS2-107: Added ClusterOperationStatController
2021-11-19 11:12:25 +05:00
KharchenkoVladimir
e62ac96bd7
CS2-119: Added .FixDatesRangeByTimeZoneAsync() to fix dates ranges to well timezone everywhere
2021-11-18 12:03:59 +05:00
KharchenkoVladimir
4bed0623f1
CS2-119: Added dates change to well timezone if requested
2021-11-18 11:24:21 +05:00
Фролов
b6c2f60296
fix use fileshare only when needed.
2021-11-17 13:06:48 +05:00
KharchenkoVladimir
88f9236b8a
CS2-119: Added Telemetry Timezone object and update timezone functionality
2021-11-16 13:14:31 +05:00
Фролов
212989b3b6
fix analyze recomendations
2021-11-15 16:52:12 +05:00
Фролов
bfb76b9dc0
Add request tracker. it also track users activity.
2021-11-10 14:23:53 +05:00
Фролов
170693f445
Refactor:
...
FilesService move FileSharing functions to GoogleDriveService;
FilesService.CreateFileMarkAsync() Move drillingProgram related logic into DrillingProgramService.CreateFileMarkAsync();
FilesService.MarkFileMarkAsDeletedAsync() Move drillingProgram related logic into DrillingProgramService.MarkFileMarkAsDeletedAsync();
IGoogleDriveService cleanup and rename to IFileShareService;
GoogleDriveService check token before usage and resresh it id needeed;
DrillingProgramController move logic to service;
DrillingProgramController use dto;
FileController remove unused method;
2021-11-09 17:36:44 +05:00
cult
e716c6fbeb
CS2-104: Added deleting of existing drilling program on file marks actions
2021-11-03 14:12:39 +05:00
cult
2f2193da76
CS2-104: Added recreate of drilling program if new files were confirmed
2021-11-02 16:33:49 +05:00
cult
a53d557f2a
CS2-104: Added confirm of drilling program parts
2021-11-01 16:41:25 +05:00
cult
e79cf9f5d1
CS2-106: Inserted logic from DrillingProgram controller in fileService.GetFileWebUrlAsync()
2021-10-29 16:03:24 +05:00
cult
45b4d8bb23
CS2-106: Fixed Drilling program creation and preview logic
2021-10-29 12:47:18 +05:00
cult
e8ad17bc1d
CS2-106: Added .GetFileWebLinkAsync() in DrillingProgramController.cs
2021-10-28 16:59:00 +05:00
cult
c3be8bceea
CS2-106: Fixed .GetAsync() in DrillingProgramController to return file web url in cloud
2021-10-28 15:08:06 +05:00
Фролов
da9e94b4b9
Modify telemetry tracker to keep remote and server dates.
...
Update related services.
Small refactor TelemetryController: exclude dictionaries updates from tracker update. All tracker updates moved to services.
2021-10-28 10:56:18 +05:00
Фролов
5966920019
nit refactoring
2021-10-27 17:48:19 +05:00
cult
2ab29df231
CS2-106: Added description that web url for drilling program file is created only if such file was created.
2021-10-27 17:23:43 +05:00
cult
ab13e97837
CS2-106: Added GoogleDriveService and .GetWebLink() to DrillingProgramController
2021-10-27 17:00:27 +05:00
KharchenkoVladimir
b553f74a50
Added return type descriptions for BaseControllers classes
2021-10-25 17:38:52 +05:00
KharchenkoVladimir
23a467639a
Merge branch 'NewRegister' into dev
2021-10-25 12:05:44 +05:00
KharchenkoVladimir
2ce110ea8f
Added 'User already exists' check in .Register()
2021-10-25 12:04:34 +05:00
KharchenkoVladimir
6b2c4a359b
Added register params validation
2021-10-22 17:41:00 +05:00
KharchenkoVladimir
9fea1c94a6
Fixed Login. Users with State == 0 will not be authenticated
2021-10-21 17:24:25 +05:00
Фролов
8b54966876
Fix security in WellController
2021-10-20 17:55:50 +05:00
KharchenkoVladimir
167dd3d5f5
Added Get well by id method in WellController
2021-10-20 16:18:07 +05:00
Фролов
eab95cb7a1
Refactor GetLastTelemetryDate(..) in services (single resp).
...
Add State and LastTelemetryDate into StatWellDto.
2021-10-20 12:52:31 +05:00
KharchenkoVladimir
16e17c0559
Fixed error text back in AuthController.Register().
2021-10-19 17:21:07 +05:00
KharchenkoVladimir
1d26c3dc9d
Auth controller very minor changes
2021-10-19 16:58:40 +05:00
KharchenkoVladimir
387b01c44d
CS2-72: Added email, phone and position in UserDto.
2021-10-19 15:22:18 +05:00
KharchenkoVladimir
37e03b3f0d
CS2-98: Added WellUpdateParamsDto in WellController.UpdateWellAsync().
2021-10-18 16:30:14 +05:00
KharchenkoVladimir
6e4c85843f
CS2-98: Added State to Well. Added .UpdateWell() in WellController.
2021-10-18 12:38:49 +05:00
KharchenkoVladimir
02f344569e
CS2-91: Moved TelemetryTracker from WellService to TelemetryService
2021-10-15 12:24:04 +05:00
Фролов
caae2f970c
Add DrillParamsController.SaveAsync() it removes old records before add new ones.
2021-10-14 17:57:25 +05:00
Фролов
2173f6593f
Fix DrillFlowChartController autorization.
...
Fix DrillFlowChartController.GetByTelemetryAsync() assertion
2021-10-14 16:16:35 +05:00
KharchenkoVladimir
aa977e4db5
Added WellCompositeService in DependencyInjection
2021-10-14 12:30:51 +05:00
KharchenkoVladimir
8e447a040f
Added method for returning wells with drill params only (in DepositController)
2021-10-14 12:04:21 +05:00
Фролов
03813b9403
DrillFlowChartController. Edit routes
2021-10-14 11:46:17 +05:00
KharchenkoVladimir
32732bf058
Fixed DrillFlowChart routes, model, dto names
2021-10-14 10:18:43 +05:00
KharchenkoVladimir
4f4eb4333a
Merge branch 'DrillingFlowChart' into dev
2021-10-13 17:35:14 +05:00
KharchenkoVladimir
911deb5b8b
CS2-97: Added DrillFlowChartParams infrastructure
2021-10-13 17:34:32 +05:00
KharchenkoVladimir
e31780571b
CS2-94: Fixed DrillParamsService queries
2021-10-13 15:56:23 +05:00
KharchenkoVladimir
70ee22bccf
CS2-96: Added DrillParams methods to get composite well drill params
2021-10-13 12:27:40 +05:00
Фролов
50c3cca8b8
CS2-84 При формировании статистики по кусту нет фильтра по доступным скважинам
2021-10-12 18:06:47 +05:00
Фролов
b800759a09
CS2-95 В WellOperationStatController добавить метод получения статистики по скважинам и секциям по массиву id скважин
2021-10-12 16:07:08 +05:00
KharchenkoVladimir
e34bb4b554
Renamed DrillParamsController methods
2021-10-12 12:50:04 +05:00
Фролов
f7fedb16e8
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
2021-10-12 12:17:58 +05:00
Фролов
3bff1d0daf
Add WellCompositeController
2021-10-12 12:17:46 +05:00
KharchenkoVladimir
2b77fdae98
CS2-94: Added .GetAll() method to DrillParamsService
2021-10-12 12:02:28 +05:00
KharchenkoVladimir
bf7c0895b3
Merge remote-tracking branch 'origin/dev' into dev
2021-10-12 11:30:21 +05:00
KharchenkoVladimir
99f8a36437
CS2-94: Fixed DrillParamsService and Dto
2021-10-12 11:30:07 +05:00
Фролов
638d8eb3da
Drop useless method
2021-10-12 11:26:41 +05:00
Фролов
91c85c8fdc
Remove obsolete dataService; remove db mdel dependendency from webApi
2021-10-12 11:03:05 +05:00
KharchenkoVladimir
a860bde21e
Merge branch 'DrillingModes' into dev
2021-10-11 16:43:48 +05:00
KharchenkoVladimir
32784c31f9
CS2-94: Edited DrillParamsService to extend CrudService
2021-10-11 16:43:10 +05:00
Фролов
eac38b6139
Remove dead "DataController"
2021-10-11 16:00:52 +05:00
KharchenkoVladimir
47397e4ad6
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
2021-10-11 15:32:06 +05:00
KharchenkoVladimir
4168e63dad
Merge branch 'DrillingModes' into dev
2021-10-11 15:31:17 +05:00
KharchenkoVladimir
afd2801715
CS2-94: Added main DrillParams controller and service methods
2021-10-11 15:21:26 +05:00
Фролов
9117471f82
WellOperationImportService Add GetTemplate(),
...
Improve error handling.
2021-10-11 13:45:06 +05:00
KharchenkoVV
c962374b6c
CS2-94: Added Drilling params controller, service and model
2021-10-10 13:35:43 +05:00
Фролов
e604d8a031
make WellOperations import and export. ExcelTemplate embedded to infrastructure.
2021-10-09 20:16:22 +05:00
KharchenkoVV
1f4a55c5df
Fixed Measure controller to return all measure history at once
2021-10-05 18:02:02 +05:00
Фролов
90bdb264cb
fix Get* methods. add orderBy, specify dateTimeKind and return value:)
2021-09-29 17:05:27 +05:00
Фролов
fb38348618
Add DRAFT telemetry merge
2021-09-29 10:12:54 +05:00
Фролов
eb3668a8ba
mark legacy as Obsolete. till panels full update.
2021-09-27 16:48:24 +05:00
Фролов
956e564f56
переименовал ряд методов для лучшего понимания
2021-09-23 15:26:55 +05:00
Фролов
83e592ba86
CS2-60 ReportGenerator выдает неправильные значения при отсутствии данных в БД.
2021-09-23 15:26:55 +05:00
Фролов
0b1f9683b9
fix jsonSerializer settings;
...
reafctor TelemetryHub;
Add wellDepth into TelemetryMessage
2021-09-17 16:24:01 +05:00
Фролов
35cd538b1d
Refactor DataSaubBase to TelemetryDataSaub;
...
Add generic TelemetryDataController;
Add TelemetryDataSpin and model;
Add migration;
2021-09-14 17:17:33 +05:00
KharchenkoVV
e8063057d7
Added .GetOperationsDateRangeAsync() to Telemetry analytics controller
2021-09-10 15:23:36 +05:00
Фролов
30a59d0809
cleanup
2021-09-10 11:28:57 +05:00
Фролов
73fab69b76
AuthController Добавлена регистрация пользователя и смена пароля
2021-09-07 09:49:25 +05:00
Фролов
b471efc59e
File author is optional (for drillingProgram)
2021-09-01 15:55:10 +05:00
Фролов
a7962492af
fileController search by companyName (not by companyId).
...
Add UserDto into FileInfoDto.
Add CompanyDto into UserDto.
2021-08-31 18:01:26 +05:00
Фролов
41660af49f
FileController Add file size and fix search by file name
2021-08-31 12:29:27 +05:00
Фролов
e87e959bca
CS2-58 FileController doc
2021-08-31 10:02:04 +05:00
Фролов
b3b1230c0a
CS2-58 FileController Add filter by filename
2021-08-31 09:59:23 +05:00
Фролов
e8bfe3b443
add new file categories
2021-08-31 09:52:32 +05:00
Фролов
ebd3e4ec4c
rename lastDataService to measureService
2021-08-31 09:52:15 +05:00
Фролов
4e0e9b93d7
fix route in DrillingProgramController
2021-08-29 17:29:24 +05:00
Фролов
14cf99a1dd
Add DrillingProgramController
2021-08-29 17:25:16 +05:00
Фролов
80d74067c0
MeasureService Add GetLastAsync
2021-08-28 22:34:57 +05:00
Фролов
9724b24d98
LastData rename to Measure. Implement MeasureService
2021-08-28 20:00:04 +05:00
Фролов
843dd276a3
NotCompleted LasdData Weekend
2021-08-27 17:55:22 +05:00
Фролов
ac57a69670
Add CalcTvd to WellOperationsStatService
2021-08-27 12:15:04 +05:00
Фролов
85ff9a5903
StatController mathod renames
2021-08-25 11:30:50 +05:00
Фролов
e55f505ea7
Refactor Stat* models
2021-08-25 11:13:56 +05:00
Фролов
94b7dd3ef7
All statisstic moved to WellOperationStatService.
...
Stats reorganized
2021-08-24 16:47:10 +05:00
Фролов
99d242101e
remove efModel wellSection. Cleanup. Split categories lastData and files
2021-08-24 10:59:10 +05:00
KharchenkoVV
a0856fad25
CS2-66: Added well depth filter to .GetOperationsAsync()
2021-08-23 16:59:26 +05:00
KharchenkoVV
791f72cbdb
CS2-65: United GetSectionsData() and GetWholeWellData() methods
2021-08-20 16:56:21 +05:00
Фролов
cec8e92d77
Clean and doc
2021-08-20 14:17:53 +05:00
KharchenkoVV
fbff8e986a
CS2-65: Added operations calculation for whole well
2021-08-20 13:56:01 +05:00
KharchenkoVV
0e586edcc5
CS2-58: Added [FromQuery] to 'companies' param
2021-08-20 11:46:14 +05:00
KharchenkoVV
b39f07821d
CS2-58: Added files filtering by requested companies ids
2021-08-20 11:20:24 +05:00
KharchenkoVV
d0deefe74f
CS2-56: Changed tuple to FileInfoDto
2021-08-19 17:32:22 +05:00
KharchenkoVV
8b5af8d32e
CS2-59: Added Delete() to File controller
2021-08-19 16:58:26 +05:00
KharchenkoVV
e8d98a0887
CS2-55: Renamed SaveFileProperties...() to SaveFileInfos()
2021-08-19 16:34:36 +05:00
KharchenkoVV
bf823e1825
CS2-55: Moved file saving logic from File controller to service
2021-08-19 16:32:04 +05:00
Фролов
c5dedfc03e
WellOperationController.GetCategories() fix return type
2021-08-19 12:24:57 +05:00
Фролов
a685418cf0
rename WellOperationController.GetAllAsync(..) to GetOperationsAsync(..)
2021-08-18 17:25:40 +05:00
KharchenkoVV
154426a5fb
Changed WellOperation fileds names
2021-08-18 17:09:57 +05:00
Фролов
7b154abb66
CS2-61 WellOperationController.GetAllAsync(..) добавить параметры фильтрации
2021-08-18 16:57:20 +05:00
KharchenkoVV
977645e23a
CS2-54: Added Well section data calculation
2021-08-18 14:52:52 +05:00
KharchenkoVV
d6bf5d3252
Added IdUser claim to authenticated user claims
2021-08-17 13:03:17 +05:00
KharchenkoVV
b1495dda34
DataController route fix
2021-08-17 09:43:09 +05:00
KharchenkoVV
0e662d4868
Fixed controllers routes
2021-08-17 09:39:05 +05:00
KharchenkoVV
d1f67dc69c
WellOperation Controller and Service fix
2021-08-17 09:20:31 +05:00
KharchenkoVV
a8cdda862a
Fixed FileController's routes
2021-08-16 17:34:00 +05:00
KharchenkoVV
d7e0eace47
CS2-53: Added WellOperations Controller, Service, Dtos and Models
2021-08-16 14:19:43 +05:00
Фролов
57afb6b7d2
Merge branch 'master' of https://bitbucket.org/frolovng/asbcloudserver
2021-08-13 17:26:32 +05:00
Фролов
2e01c4334f
fix "order for skip/take" warning. some refactoring.
2021-08-13 17:26:19 +05:00
KharchenkoVV
bc1bcb2ee2
CS2-53: Added basics of WellOperation controller, service, model and dto
2021-08-13 17:25:06 +05:00
KharchenkoVV
1956eafb32
Renamed Analytics Service and Controller to TelemetryAnalytics
2021-08-13 15:57:22 +05:00
Фролов
9497aaf7e3
Add WellSectionTypes dbSet
2021-08-13 12:33:05 +05:00
Фролов
eaf1b9509d
Merge branch 'master' of https://bitbucket.org/frolovng/asbcloudserver
2021-08-12 11:52:36 +05:00
Фролов
bef1292e7c
doc and terurn types
2021-08-12 11:52:23 +05:00
Фролов
95a3a0d207
WellSectionController params order
2021-08-12 11:50:04 +05:00
KharchenkoVV
ab63bc4aa1
CS2-50: Added .ConfigureAwait(false) to all async methods.
2021-08-11 17:26:02 +05:00
KharchenkoVV
f13b757a84
CS2-50: All controllers and services are made async
2021-08-11 16:54:42 +05:00
KharchenkoVV
4c4048865c
CS2-50: Controllers and some services are made async
2021-08-11 12:11:21 +05:00
Фролов
33f545c7b3
WellSectionController tested and fixed
2021-08-10 17:43:13 +05:00
Фролов
50fc46e007
WellSectionController almost done
2021-08-10 16:37:36 +05:00
Фролов
e96a9820db
implement async WellSection controller
2021-08-10 14:36:35 +05:00
