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

581 Commits

Author SHA1 Message Date
ngfrolov
a8c4fa58e9 Add Crud service abstract test. 2022-06-09 17:25:26 +05:00
ngfrolov
c9d150d3a9 Merge branch 'EFpro' into ICrud_refactor 2022-06-09 13:36:42 +05:00
ngfrolov
dd2a777d3d Crud services, controllers refactoring. Not tested version of new API. 2022-06-09 11:19:52 +05:00
Lyudmila Romanova
cf8c61c1a7 Изменение dto для анализа 2022-06-08 14:37:05 +05:00
Lyudmila Romanova
6d44dadb27 Модель и сервисы для значений операций 2022-06-07 16:24:05 +05:00
ngfrolov
bbab9e1a15 Оптимизация EfCache[Dictionary]Extensions. 
Семафор на добавление тега теперь работает существенно быстрее, логика заполнения данными из БД перенесена под семафор конкретного кеша.
 2022-06-07 12:29:11 +05:00
ngfrolov
e99ac84c46 Fix TimezoneId mapping, rename TimeZoneId to TimezoneId 2022-06-06 17:00:53 +05:00
ngfrolov
4db67113b4 CrudService очищен от неиспользуемого кода. 
CrudCacheService Адаптировано для новой схемы кеширования.
Убраны extention методы для mapster.
 2022-06-06 15:43:47 +05:00
ngfrolov
1e7f5fe654 Doc 2022-06-01 17:52:26 +05:00
ngfrolov
b89ea13c78 Converted cache 2022-06-01 15:59:02 +05:00
ngfrolov
cb4eb3341c EfCacheL2 tested. 2022-06-01 12:18:10 +05:00
ngfrolov
fa38c145e7 Add new Permissions 2022-05-31 17:54:43 +05:00
ngfrolov
1a213a0791 merge EFpro 2022-05-31 16:39:23 +05:00
ngfrolov
6fb82e7333 Add new ef layer 2 cache 2022-05-31 16:38:04 +05:00
ngfrolov
213675c5a9 Update packs 2022-05-31 16:37:18 +05:00
ngfrolov
87391ad9b1 Add DateOnly, TimeOnly support 2022-05-31 16:18:31 +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
23cf8d2108 Убрал ненужные переопределения. 
Добавил учет часового пояса скважины.
 2022-05-26 13:33:59 +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
1ea68f5605 fix email body links 2022-05-20 09:01:39 +05:00
ngfrolov
ed8bbf641a Fix DailyReportMakerExcel. string[] to string 2022-05-18 13:16:03 +05:00
ngfrolov
24ccc2a128 fix emails triggers and bodies 2022-05-18 11:07:39 +05:00
ngfrolov
00cfb0909c DetectorSlipsTime Add new condition 2022-05-12 17:21:06 +05:00
ngfrolov
8b6a9c78c7 fix DailyReport.MakeDefaultDailyReportAsync 2022-05-06 17:02:53 +05:00
ngfrolov
3e7a8da219 Add StartDate to WellDto 2022-05-06 16:35:16 +05:00
ngfrolov
692517798b Recreate migration Add_mw_telemetry_datas_saub_stat. 2022-05-06 10:58:52 +05:00
ngfrolov
5458ac5414 debug and fix daily report 2022-05-05 15:14:29 +05:00
ngfrolov
923d2866b0 DrillingProgram emails tested 2022-05-05 13:28:48 +05:00
ngfrolov
31634e653a disable really email send 2022-05-05 10:45:04 +05:00
ngfrolov
7201f7ca63 merge detected operations 2022-05-05 10:22:51 +05:00
ngfrolov
7112ebc4f2 Merge branch 'DailyReport' into dev 2022-05-05 10:09:47 +05:00
ngfrolov
24b40973bb merge and fix 2022-05-05 10:06:21 +05:00
ngfrolov
5f21e9e8ce refactoring BodyCreation => MailBodyFactory 2022-05-04 15:02:12 +05:00
ngfrolov
3c67d22bbd Fix filter 2022-04-29 15:54:01 +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
ngfrolov
45fb5ab8e8 Add Db store for detected operations. 
Add backgroudService for periodically detect.
 2022-04-25 17:41:18 +05:00
ngfrolov
6c845b7f9f Complete from Ivanov 2022-04-25 15:38:44 +05:00
ngfrolov
4a91a29f07 Rename DetectedOperation props simmmilar to WellOperation 2022-04-25 12:17:14 +05:00
ngfrolov
6738bb3b35 Add DetectorService 2022-04-22 17:17: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
ac130e3efc Fix DateTimeOffset overflow 2022-04-15 13:36:09 +05:00
ngfrolov
b6b5039d97 Add torque_pid_out_limit to setpointsService 2022-04-13 17:50:09 +05:00
ngfrolov
c31cb55d2b replace ref projects to ref dlls 2022-04-12 17:40:05 +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
0521809e6e fix timezone in tvd 2022-03-29 10:36:18 +05:00
ngfrolov
b12c3efffc Fix ScheduleReportService correct deltaDepth 2022-03-18 16:54:40 +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
ngfrolov
08d351a439 Add notice to WellOperationImportTemplate 2022-03-16 16:06:52 +05:00
Фролов
007f7ac62e Fix UserService.GetNestedPermissions(). returns all permissions for all nested roles 2022-03-15 16:19:51 +05:00
Фролов
fdc22f4f94 start report tvd 2022-03-11 18:07:25 +05:00
Фролов
efdcb4f211 Add nptDays to WellOperationService 2022-03-11 16:53:31 +05:00
Фролов
b613cb5e1f rename WellOperationDto.NptDays to NptHours 2022-03-10 17:17:52 +05:00
Фролов
1e46a3c478 Fix setpoints. Ошибка в дате и времени 2022-03-09 16:49:02 +05:00
Фролов
3ebb0020f5 OperationsStatService add calc cumulative non productive time 2022-03-04 10:15:52 +05:00
Фролов
bafa372d66 rename some methods 2022-03-02 17:42:34 +05:00
Фролов
557d7af25a Fix drillingProgram fileMarks DateTime 2022-03-02 17:41:59 +05:00
Фролов
7b8cbb71be Edit UserSrvice. UserRolesDto in UserDto is 1 level of nesting 2022-03-01 09:51:16 +05:00
Фролов
45cce481ee Add emailService 2022-02-28 14:44:26 +05:00
Фролов
f286410eff Add DrillingProgramCreateError 2022-02-28 14:44:15 +05:00
Фролов
cee68bf4ee DrillingProgramStateDto Add PermissionToEdit 2022-02-24 09:52:11 +05:00
Фролов
433bc30316 fix default EF data. 2022-02-21 12:04:26 +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
Фролов
696dbee375 Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev 2022-02-08 10:05:00 +05:00
Фролов
981ae016c7 fix userRole validator. IdType can be anything 2022-02-02 11:11:10 +05:00
Фролов
fc752e8f3b fix validators. lat, long is nullable. 2022-02-01 17:55:56 +05:00
Харченко Владимир
87d7563ed3 CS2-27: Fixed ClusterService unit tests 2022-01-31 16:13:27 +05:00
Фролов
99a2592ace Add shorthand to check admins permissions 2022-01-31 11:09:24 +05:00
Харченко Владимир
52c8f6a79b Fix: Added null check for cluster stats with no operations 2022-01-25 15:00:17 +05:00
Фролов
e1afec1810 Add Permissions 'generator' file 2022-01-21 17:58:02 +05:00
Фролов
2037160545 Edit validators 2022-01-21 17:56:36 +05:00
Фролов
8633616481 Fix DrillFlowChartService.UpdateAsync() utc time 2022-01-21 17:32:10 +05:00
Харченко Владимир
8a3bcf311f Fixed dto ids validation 2022-01-20 12:07:15 +05:00
Фролов
7a10d26ca6 CS2-145 Добавить специальный ArgumentInvalidException кастомной вылидации для замены ArgumentException 2022-01-18 11:04:44 +05:00
Фролов
1f1f86f00e Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev 2022-01-17 16:07:09 +05:00
Фролов
2192cdc242 Extract BeforeRunHandle method. It runs some procedures like Migrate() on startup. 2022-01-17 15:33:00 +05:00
Фролов
7cf1a69dd5 CS2-138 Запретить удалять и редактировать пользователя dev 2022-01-17 14:31:07 +05:00
Харченко Владимир
52122358b8 Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev 2022-01-17 10:40:27 +05:00
Фролов
ee4632ae38 Reconnect reports. 2022-01-14 17:59:22 +05:00
Фролов
c2c82c2cda Complete UserRoleService crud and unit test. 2022-01-13 15:51:06 +05:00
Фролов
0109e529f6 CS2-142 Изменить UserRole 2022-01-13 14:36:27 +05:00
Фролов
9eb1070941 Add Day to TVD 2022-01-12 17:46:33 +05:00
Харченко Владимир
d1440ea0d0 CS2-125: Added newly created dto validators in DependencyInjection 2022-01-12 17:35:14 +05:00
Харченко Владимир
9792fe2196 CS2-125: Added base dto validation 2022-01-12 17:28:27 +05:00
Фролов
2c51c352b1 CS2-139 Добавить контроллер AdminCompanyType 2022-01-12 13:33:16 +05:00
Фролов
fed253d0f6 merge net6_migrate 2022-01-11 11:51:02 +05:00