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

2218 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Фролов
796faa3893 Add linkFile for panel. //After copy make it executable 2021-09-17 17:41:58 +05:00
Фролов
786e576a08 Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev 2021-09-17 16:24:15 +05:00
Фролов
0b1f9683b9 fix jsonSerializer settings; 
reafctor TelemetryHub;
Add wellDepth into TelemetryMessage
 2021-09-17 16:24:01 +05:00
KharchenkoVV
99c805c7d4 Added advanced union logic for files with small amount of empty columns 2021-09-17 15:58:01 +05:00
KharchenkoVV
6c2e58a14d First version of Excel files union using ClosedXML library 2021-09-17 15:41:55 +05:00
KharchenkoVV
3616c90c65 Fixed refill of cells in multiple tables union 2021-09-16 14:34:32 +05:00
KharchenkoVV
d45dc54230 Added union of several excels to one file 2021-09-15 17:48:34 +05:00
KharchenkoVV
643c04be30 Added cloning data to separate lists as in source file 2021-09-15 16:37:17 +05:00
KharchenkoVV
246bf9b8a5 Added excel content copying with cell styles 2021-09-15 15:22:24 +05:00
KharchenkoVV
22827b8dcf OpenXML code writing only numeric cells from source Excel file 2021-09-15 12:00:46 +05:00
KharchenkoVV
41cacf62ff Raw(!!) working OpenXML library code with creating Excel file and writing data 2021-09-15 10:43:46 +05:00
Фролов
35cd538b1d Refactor DataSaubBase to TelemetryDataSaub; 
Add generic TelemetryDataController;
Add TelemetryDataSpin and model;
Add migration;
 2021-09-14 17:17:33 +05:00
Фролов
787627d439 Update react client build 2021-09-13 16:04:46 +05:00
Фролов
1bf746dff2 Fix operations order 2021-09-13 12:28:57 +05:00
Фролов
cb1ab8c842 hotfix Configure System.Text.Json.JsonSerializer to handle inf, -inf, NaN 2021-09-13 11:02:54 +05:00
Фролов
278445cdbd Merge branch 'master' of https://bitbucket.org/autodrilling/asbcloudserver 2021-09-13 09:39:23 +05:00
Фролов
a046194e35 Add default data (operations dictionary) migration 2021-09-13 09:39:11 +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
Фролов
c0a4716341 Merge branch 'master' of https://bitbucket.org/autodrilling/asbcloudserver 2021-09-10 11:30:10 +05:00
Фролов
30a59d0809 cleanup 2021-09-10 11:28:57 +05:00
KharchenkoVV
b022a4c1cb Fixed return of .DepthToInterval() analytics method 2021-09-09 12:55:13 +05:00
Фролов
6a338403af Add IId interface to all supported classes 2021-09-09 12:31:12 +05:00
Фролов
3c9718b0de CachedTable implement IEnumerable 2021-09-08 11:51:55 +05:00
KharchenkoVV
9d80c28c1b Added try/catch for 'Demo data' project for error cases 2021-09-07 17:39:28 +05:00
KharchenkoVV
42b9849ae9 Added User model 'email', 'phone', 'position' columns 2021-09-07 14:42:56 +05:00
KharchenkoVV
9ee6749c3c Added new project with test data. 2021-09-07 14:04:43 +05:00
KharchenkoVV
5e757e9bbb Added migrations. 2021-09-07 14:04:30 +05:00
KharchenkoVV
e7129f0148 Moved 'Company types' from Demo data to Data in EF context 2021-09-07 09:58:48 +05:00
Фролов
73fab69b76 AuthController Добавлена регистрация пользователя и смена пароля 2021-09-07 09:49:25 +05:00
Фролов
f2adaaa377 make .service file part of the build 2021-09-06 10:10:36 +05:00
Фролов
2555b7f490 nit doc 2021-09-03 18:02:50 +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
Фролов
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
Фролов
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