|
8a9a565365
|
Merge branch 'dev' into feature/refactoring-daily-report-form
|
2023-03-21 15:58:23 +05:00 |
|
|
56477e5a9b
|
Merge branch 'feature/refactoring-daily-report-form' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into feature/refactoring-daily-report-form
|
2023-03-21 15:55:15 +05:00 |
|
|
f1e0aaf3ae
|
Добавление даты и ключа пользователя, внесшего изменения в блок суточного рапорта
|
2023-03-21 15:55:03 +05:00 |
|
ngfrolov
|
ab280f3451
|
Fix tests
|
2023-03-21 11:19:02 +05:00 |
|
ngfrolov
|
a1c73effc3
|
TelemetryDataSaubDto doc. Add units to description
|
2023-03-20 15:06:53 +05:00 |
|
|
f0a80aae02
|
Merge pull request 'WellOperation Sort' (#35) from WellOperationCategories_Sort into dev
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/35
Reviewed-by: Никита Фролов <ng.frolov@digitaldrilling.ru>
|
2023-03-13 17:02:52 +05:00 |
|
|
38e58b41b1
|
Add sort
|
2023-03-13 11:24:57 +05:00 |
|
ngfrolov
|
6ddef54514
|
Merge branch 'dev' into feature/refactoring-daily-report-form
|
2023-03-10 16:48:18 +05:00 |
|
ngfrolov
|
e9f3a10bac
|
Merge branch 'dev' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into dev
|
2023-03-10 16:47:45 +05:00 |
|
ngfrolov
|
1f130c0d48
|
Hotfix OperationsStatService.CalcTvdLagDays()
|
2023-03-10 15:37:49 +05:00 |
|
|
fd5822ac91
|
Merge pull request 'Add attrib's to dto models and remove the "FluentValidation" package' (#34) from AddAttributesToDtos into dev
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/34
|
2023-03-10 13:46:21 +05:00 |
|
|
7de6d036b7
|
мелкие правки
|
2023-03-10 13:40:05 +05:00 |
|
|
a97fd12b74
|
Merge branch 'dev' into feature/refactoring-daily-report-form
|
2023-03-10 11:24:33 +05:00 |
|
|
c835896ce7
|
убран Extension-метод для DateOnly, функциональность добавлена в локальный метод ExtractDate
|
2023-03-10 10:59:04 +05:00 |
|
|
0750b0fc9a
|
удален лишний мусор
|
2023-03-10 10:34:03 +05:00 |
|
|
f8c26f1835
|
фикс фильтрации фактических операций
|
2023-03-10 10:25:10 +05:00 |
|
|
a35a89c7ff
|
remove fluent validator
|
2023-03-10 06:01:36 +05:00 |
|
|
fe25c1e962
|
edit message dto
|
2023-03-10 05:53:48 +05:00 |
|
|
65d846dba4
|
dev changes
|
2023-03-10 05:48:43 +05:00 |
|
|
a9ee51e090
|
merge dev
|
2023-03-10 05:47:40 +05:00 |
|
|
0540df26c4
|
edit validate user registration
|
2023-03-10 05:42:54 +05:00 |
|
|
4d7ef61ab8
|
add error message
|
2023-03-10 05:09:41 +05:00 |
|
ngfrolov
|
db1bd49d60
|
Add TelemetryDataSaubController.GetZippedCsv(..)
|
2023-03-09 12:32:09 +05:00 |
|
|
2dd04d4037
|
мини-правка
|
2023-03-09 11:56:36 +05:00 |
|
|
29e34445be
|
Отдельный extension-метод для дат - ExtractDateOnly
|
2023-03-09 11:38:43 +05:00 |
|
|
4545325a93
|
Проверка создания суточного рапорта: если он есть в базе, то нужно возвращать ошибку
|
2023-03-09 09:55:53 +05:00 |
|
ngfrolov
|
cff9fe3fe7
|
Merge branch 'dev' into ZippedCsvTelemetryExport
|
2023-03-07 15:49:00 +05:00 |
|
ngfrolov
|
fb128c0eb1
|
Add root auto-permission
|
2023-03-07 15:33:06 +05:00 |
|
ngfrolov
|
43847298d8
|
Replace TelemetryService.GetOrDefaultIdTelemetryByIdWell() by GetOrDefaultTelemetryByIdWell()
|
2023-03-07 09:47:30 +05:00 |
|
|
612fa19b10
|
add attrib's -ProcessMap,permissions
and remove validators
|
2023-03-07 00:36:09 +05:00 |
|
|
9793280b28
|
todo TimeDtoValidator
|
2023-03-07 00:16:20 +05:00 |
|
|
d6d14ca2f2
|
change dtos (auth,event,company,measure,message,userRole,well,welloperation)
and delete validators
|
2023-03-07 00:04:20 +05:00 |
|
|
0d16d09ad7
|
Тип System.DateTime сокращен до DateTime в параметре метода AddAsync (в сервисе DailyReportService)
|
2023-03-06 16:54:47 +05:00 |
|
|
52373f8fde
|
Revert "1. Сохранение суточного рапорта по частям."
This reverts commit 5c60b3927b .
|
2023-03-06 16:43:04 +05:00 |
|
|
5c60b3927b
|
1. Сохранение суточного рапорта по частям.
2. Обновление типа данных поля "Дата отчета" в таблице "Суточный рапорт" (timestamp with time zone изменен на date)
|
2023-03-06 16:41:55 +05:00 |
|
|
52a6b92824
|
Merge branch 'dev' into feature/refactoring-daily-report-form
|
2023-03-06 16:33:58 +05:00 |
|
|
b6181ab82f
|
1. Сохранение суточного рапорта по частям.
2. Обновление типа данных поля "Дата отчета" в таблице "Суточный рапорт" (timestamp with time zone изменен на date)
|
2023-03-06 16:30:36 +05:00 |
|
ngfrolov
|
1ca72d50d1
|
StatWellDto Add TvdLagDays and calculation.
|
2023-03-06 16:12:26 +05:00 |
|
ngfrolov
|
546ac8068e
|
Fix. Ошибка при добавлении скважины.
|
2023-03-02 14:31:17 +05:00 |
|
ngfrolov
|
1c21d9abae
|
Merge branch 'dev' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into dev
|
2023-03-02 09:32:50 +05:00 |
|
|
4626a2855e
|
Merge pull request 'Add and rename operation category' (#32) from Task9168959 into dev
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/32
Reviewed-by: Никита Фролов <ng.frolov@digitaldrilling.ru>
|
2023-03-02 09:31:38 +05:00 |
|
ngfrolov
|
c76088b5e8
|
update web client
|
2023-03-02 08:56:08 +05:00 |
|
|
21065efb22
|
rename column "name" (rotor and slide operation)
|
2023-03-01 12:08:34 +05:00 |
|
|
927935a523
|
добавление новых категорий
|
2023-03-01 11:39:47 +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 |
|
|
73f2fe0826
|
PlanFactBase, ArgumentInvalidException
|
2023-02-27 10:33:59 +05:00 |
|