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

302 Commits

Author SHA1 Message Date
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
Фролов
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
Фролов
97df21c58b Remove WellService.GetOperationsAsync() redundant method 2021-10-12 10:31:17 +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
Фролов
d73cc9692f Replace WellOperationImportTemplate.xltx to WellOperationImportTemplate.xlsx 2021-10-11 15:28:21 +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
Фролов
2868304546 Draft WellOperationImportService. incomplete 2021-10-08 17:00:30 +05:00
Фролов
4fe570f3e9 Refactor WellOperation WellDepth split to DepthStart and DepthEnd. 
Fix other services to use new model.
 2021-10-08 11:30:06 +05:00
KharchenkoVV
eac35cd3e9 Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev 2021-10-08 11:12:57 +05:00
KharchenkoVV
47e62f395a Removed Measures from db demo data 2021-10-08 11:12:43 +05:00
Фролов
4cec602678 refactor IFileService. Rename DeletedAsync method to DeleteAsync 2021-10-06 18:07:35 +05:00
Фролов
197142eca2 Fix tvd predict 2021-10-06 16:30:46 +05:00
KharchenkoVV
1f4a55c5df Fixed Measure controller to return all measure history at once 2021-10-05 18:02:02 +05:00
Фролов
e1457471c8 unpatch cache path by permanent solution 2021-10-04 15:54:58 +05:00
Фролов
8e6384e46c make cache sinchronized. 2021-10-04 15:52:22 +05:00
Фролов
cdfcb0b2f7 semaphore 2021-10-03 20:08:17 +05:00
Фролов
031ff8c747 Add migration. Set Telemetry forign keys on delete - cascade. 2021-10-01 17:37:44 +05:00
Фролов
ae9b23cc00 Refactor TelemetryAnalysis. 2021-10-01 15:44:56 +05:00
Фролов
8362aa6ffa Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev 2021-09-30 18:03:34 +05:00
Фролов
427a713095 nit WellOperation.id = default on Add 2021-09-30 18:02:50 +05:00
KharchenkoVV
3c9745474a Added drilling operations to Telemetry analytics calculation 2021-09-30 17:10:12 +05:00
KharchenkoVV
84cb9f6d3b Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev 2021-09-30 16:41:16 +05:00
KharchenkoVV
a589775ceb Fixed telemetry analytics calculation logic 2021-09-30 16:41:00 +05:00
Фролов
4c08a2963f Add fileDto to reportprops dto. For unification download mechanism. 2021-09-30 12:38:29 +05:00
Фролов
90bdb264cb fix Get* methods. add orderBy, specify dateTimeKind and return value:) 2021-09-29 17:05:27 +05:00
KharchenkoVV
b60b84b45c Fixed Telemetry analysis start depending on analyze start date 2021-09-29 12:20:19 +05:00
Фролов
c0918652a3 Disable TelemetryAnalyticsBackgroundService 2021-09-29 10:44:11 +05:00
Фролов
093c1eafa3 Fix TelemetryAnalyticsBackgroundService inf loop 2021-09-29 10:27:49 +05:00
Фролов
11604d8157 Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev 2021-09-29 10:26:41 +05:00
KharchenkoVV
6a4b426aa2 Changed CacheTable internal List to ConcurrentBag 2021-09-29 10:26:25 +05:00
Фролов
a82b403cb0 Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev 2021-09-29 10:26:01 +05:00
Фролов
fb38348618 Add DRAFT telemetry merge 2021-09-29 10:12:54 +05:00
Фролов
c45b5728df CrudServiceBase add order by id and skip/take 2021-09-29 09:57:11 +05:00
KharchenkoVV
0132407dd8 CS2-88: Fixed analyze start date calculation 2021-09-28 14:37:44 +05:00
KharchenkoVV
130feacdd5 CS2-88: Added refresh of Telemetry analyze start date (to prevent infinite loops) 2021-09-28 10:17:26 +05:00
Фролов
c2c9bad200 merge master (hotfix) to dev. 2021-09-27 16:53:54 +05:00
KharchenkoVV
6730d64df1 CS2-88: Changed telemetry analysis interval (to 12 hours parts) 2021-09-27 16:50:56 +05:00
Фролов
eb3668a8ba mark legacy as Obsolete. till panels full update. 2021-09-27 16:48:24 +05:00
Фролов
dc156154b0 hotfix telemetryService get Id. UDO this when cache table done 2021-09-27 16:47:16 +05:00
KharchenkoVV
40b83826a4 CS2-88: Changed telemetry analysis start event. 2021-09-27 11:47:39 +05:00
KharchenkoVV
99ec0dedaf Disabled Telemetry analytics calculation 2021-09-24 15:30:50 +05:00
KharchenkoVV
614519c3c8 Fixed if() expression in CacheTable.Refresh() 2021-09-24 15:17:30 +05:00
KharchenkoVV
8ad98027cb CS2-85: Added force cache update in .GetOrCreateTelemetryByUid() 2021-09-24 14:19:27 +05:00
KharchenkoVV
804bdc6175 Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev 2021-09-24 11:17:42 +05:00
KharchenkoVV
53ef4425c9 CS2-87: Added well depth display to messages table. 2021-09-24 11:17:31 +05:00
Фролов
23b044e10e Logging on bacground task fails 2021-09-23 17:59:31 +05:00
KharchenkoVV
7aa83f8c2d CS2-82: Sorted operations in Plan\Fact table 2021-09-23 17:34:27 +05:00
KharchenkoVV
a86c2ed971 Merge conflicts solve 2021-09-23 15:53:26 +05:00
KharchenkoVV
059475e96a CS2-74: Changed using NPOI library to ClosedXML 2021-09-23 15:26:55 +05:00
Фролов
845f1f0fb1 refactor names 2021-09-23 15:26:55 +05:00
KharchenkoVV
84e82438f7 Changed Drilling program creation to ClosedXML lib 2021-09-23 15:26:55 +05:00
Фролов
956e564f56 переименовал ряд методов для лучшего понимания 2021-09-23 15:26:55 +05:00
Фролов
83e592ba86 CS2-60 ReportGenerator выдает неправильные значения при отсутствии данных в БД. 2021-09-23 15:26:55 +05:00
KharchenkoVV
9d609ed402 CS2-74: Changed using NPOI library to ClosedXML 2021-09-23 14:36:05 +05:00
Фролов
04d6b1c1a7 refactor names 2021-09-23 11:56:12 +05:00
Фролов
214c4dc84b Add IFileService.MoveAsync; 2021-09-23 11:55:25 +05:00
KharchenkoVV
9e89f87d47 Changed Drilling program creation to ClosedXML lib 2021-09-23 11:39:56 +05:00
Фролов
e93e1e72a1 переименовал ряд методов для лучшего понимания 2021-09-23 10:53:48 +05:00
Фролов
44d41fb377 CS2-60 ReportGenerator выдает неправильные значения при отсутствии данных в БД. 2021-09-23 10:52:10 +05:00
Фролов
38e7f624b1 fix reports. 2021-09-20 15:25:08 +05:00
Фролов
711dfa681d Fix fail messageController on telemetry user is null. 2021-09-20 10:33:15 +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
Фролов
1bf746dff2 Fix operations order 2021-09-13 12:28:57 +05:00
KharchenkoVV
e8063057d7 Added .GetOperationsDateRangeAsync() to Telemetry analytics controller 2021-09-10 15:23:36 +05:00
KharchenkoVV
3017d6d990 Merge branch 'master' of https://bitbucket.org/autodrilling/asbcloudserver 2021-09-10 11:30:38 +05:00
KharchenkoVV
4b8a161ed5 Fixed date intervals in .GetOperationsSummaryAsync() 2021-09-10 11:30:24 +05:00
Фролов
30a59d0809 cleanup 2021-09-10 11:28:57 +05:00
Фролов
3c9718b0de CachedTable implement IEnumerable 2021-09-08 11:51:55 +05:00
Фролов
16bd6749fd fix telemetry user id mapping 2021-09-03 11:35:49 +05:00
Фролов
187c83a7b1 ignoring strange issue. 2021-09-03 11:35:27 +05:00
KharchenkoVV
81e765581c CS2-70: Added wells with no operations into cluster info 2021-09-02 11:42:05 +05:00
KharchenkoVV
95733371a2 Merge branch 'master' of https://bitbucket.org/frolovng/asbcloudserver 2021-09-02 10:13:33 +05:00
KharchenkoVV
1debac9505 Fixed exception with .ElementAt(0) call at empty collection 2021-09-02 10:13:20 +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
Фролов
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
Фролов
7f0d5bd673 fix di in DrillingProgramService 2021-08-29 17:27:24 +05:00
Фролов
14cf99a1dd Add DrillingProgramController 2021-08-29 17:25:16 +05:00
Фролов
002da70471 fix CalcStat on empty operations list 2021-08-29 12:05:43 +05:00
Фролов
06a492a5e5 fix merge plan-fact in WellOperationsStatService 2021-08-29 11:59:20 +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