Commit Graph

170 Commits

Author SHA1 Message Date
f1b1b01012 fix convert 2023-04-17 18:10:25 +05:00
4df94466f0 fix gtr 2023-04-17 18:02:51 +05:00
ngfrolov
b6cb2d8efc
Merge branch 'dev' into gtr 2023-04-17 14:43:46 +05:00
ngfrolov
b97871bd46
hotfix WellOperationRepository.GetGroupOperationsStatAsync() 2023-04-17 12:33:54 +05:00
ngfrolov
94a152388f
fix WellOperationRepository.GetGroupOperationsStatAsync() 2023-04-17 11:59:16 +05:00
5961260ccd Фикс бага при формировании данных (метод GetGroupOperationsStatAsync в WellOperationRepository) 2023-04-17 11:31:27 +05:00
4d5b8932a5 delete comment 2023-04-14 00:46:31 +05:00
9b1b1f9736 small correction 2023-04-14 00:40:38 +05:00
55e17f6955 refact GetAsync 2023-04-14 00:36:35 +05:00
f14b0064ed Merge branch 'dev' into gtr 2023-04-12 00:43:04 +05:00
6100dd57ff add dbSet 2023-04-12 00:40:40 +05:00
84a783a76b оптимизация метода Get 2023-04-11 13:49:51 +05:00
44f1b08f90 оптимизирован метод save 2023-04-11 13:27:42 +05:00
27ee40816f refact save method 2023-04-11 12:06:05 +05:00
7e2b1e56c8 refact 2023-04-11 07:05:07 +05:00
b9e0e60d6c rework save method 2023-04-11 06:34:51 +05:00
7c827f4fae rework get method in rep 2023-04-11 00:32:06 +05:00
8e663e7bef edit generic 2023-04-07 05:32:03 +05:00
e26c5d98a7 delete manual timescale script (error index)
edit generic repository
2023-04-07 04:51:30 +05:00
75738b7712 update wits rep 2023-04-07 02:53:57 +05:00
9a0617adce add gtrRepository.SaveData 2023-04-06 04:02:47 +05:00
ngfrolov
0457f8dd98
Merge branch 'dev' into feature/rtc-calc 2023-04-05 10:56:29 +05:00
3ced1a0e20 new migration
refact entity model
wits rep and interface
2023-04-04 21:21:06 +05:00
f1dc52c768 Merge branch 'dev' into feature/set-user-editor-to-operation 2023-04-04 12:54:42 +05:00
be0d171973 Запись пользователя, изменившего / создавшего опреацию в БД + запись даты изменения / создания 2023-04-04 12:52:11 +05:00
ngfrolov
9b794311c4
Rename processMaps to processMapPlan, processMapReport, processMapReportMaker. 2023-04-03 14:59:59 +05:00
ngfrolov
225d6ef827
Незначительные переименования 2023-03-31 16:57:20 +05:00
ee8f000ab1 Merge branch 'dev' into feature/refactoring-daily-report-form 2023-03-27 17:15:31 +05:00
6815dc4437 Актуализирован блок "Баланс времени" в выгружаемом отчете. 2023-03-27 17:14:36 +05:00
ngfrolov
464678a3db
nit deleting an outdated tasks 2023-03-27 09:40:51 +05:00
ngfrolov
df6c423341
Merge branch 'dev' into feature/refactoring-daily-report-form 2023-03-23 11:07:10 +05:00
8a9a565365 Merge branch 'dev' into feature/refactoring-daily-report-form 2023-03-21 15:58:23 +05:00
99687c495f rep and dto 2023-03-21 12:41:43 +05:00
38e58b41b1 Add sort 2023-03-13 11:24:57 +05:00
a97fd12b74 Merge branch 'dev' into feature/refactoring-daily-report-form 2023-03-10 11:24:33 +05:00
f8c26f1835 фикс фильтрации фактических операций 2023-03-10 10:25:10 +05:00
ngfrolov
43847298d8
Replace TelemetryService.GetOrDefaultIdTelemetryByIdWell() by GetOrDefaultTelemetryByIdWell() 2023-03-07 09:47:30 +05:00
ngfrolov
24764f2fd4
Merge branch 'dev' into feature/filling-fact-operations-in-daily-report 2023-02-28 09:23:05 +05:00
ngfrolov
9bdea8f410
Merge branch 'feature/nullable' into dev 2023-02-27 13:42:14 +05:00
ngfrolov
6d5232231d
fix nullable ScheduleRepository 2023-02-27 12:30:44 +05:00
feb2623200 IDailyReportService, WellInfoService, WellInfoService 2023-02-27 12:12:55 +05:00
15fdfa11ed ArgumentInvalidException 2023-02-27 11:29:06 +05:00
ngfrolov
c73b6438e3
Merge branch 'dev' into feature/filling-fact-operations-in-daily-report 2023-02-22 12:26:57 +05:00
ngfrolov
9de4b31f2d
nit WellOperationRepository renames 2023-02-22 11:25:51 +05:00
ngfrolov
3bd6c7d0fb
MemoryCacheExtentions delete GetOrCreateBasic* based on DbContext 2023-02-22 09:40:02 +05:00
ngfrolov
539d04d3cf
remove EfCacheExtensions, replace by IMemoryCache 2023-02-21 18:01:03 +05:00
c7c5de563a 1. Разделение методов получения фактических и плановых операций (GetPageOperationsPlanAsync и GetPageOperationsFactAsync)
2. Фикс получения категории операции в BuildQuery
2023-02-21 17:16:45 +05:00
c15c0e5522 1. Правки после ревью
2. nullable enable в WellOperationPlanDto
2023-02-21 16:15:36 +05:00
aef99cbf11 1. Изменен запрос для формирования списка плановых операция для сопоставления
2. Добавлена модель WellOperationPlanDto для хранения списка плановых операций и даты последней сопоставленной плановой операции
3. WellSectionTypeName и CategoryName в WellOperationDto могут быть nullable
2023-02-21 13:22:24 +05:00
0083048821 Merge branch 'dev' into feature/filling-fact-operations-in-daily-report 2023-02-21 13:18:43 +05:00