ia.novokshanov/asb_cloud_front
1
0
Fork 0
forked from ddrilling/asb_cloud_front
Code Issues Pull Requests Packages Projects Releases Wiki Activity
523 Commits 13 Branches 0 Tags 4.4 MiB
2637720762
Commit Graph

505 Commits

Author SHA1 Message Date
goodmice
c50cb29b33 Merge branch 'master' into dev 2021-10-14 13:00:53 +05:00
goodmice
f0fde92af0 hotfix. CF2-75, CF2-76. Логика исправлена 2021-10-14 13:00:16 +05:00
goodmice
6c3d3de619 Merge branch 'dev' into feature/CombinedWellEditor 2021-10-14 12:47:02 +05:00
goodmice
d4670c6dde Merge branch 'master' into dev 2021-10-14 12:46:52 +05:00
goodmice
4c24bdf226 hotfix. CF2-75, CF2-76. Дубликация кода обработчиков устранена 2021-10-14 12:44:06 +05:00
goodmice
6a0601f39a Merge branch 'dev' into feature/CombinedWellEditor 2021-10-14 11:45:00 +05:00
goodmice
76c4dff162 Merge branch 'master' into dev 2021-10-14 11:41:57 +05:00
goodmice
f3c42568dc hotfix. CF2-75, CF2-76. Скорость тальблока берётся по модулю; Момент ротора меньше 1 считается 0 2021-10-14 11:35:38 +05:00
goodmice
c4b3a3f980 Добавлено отображение секций 2021-10-14 11:07:11 +05:00
goodmice
2f63fd6668 добавлена загрузвка в оконо графика 2021-10-14 11:05:45 +05:00
goodmice
1a3569389e Сервисы обновлены 2021-10-13 18:04:47 +05:00
goodmice
21f1912dd9 Добавлена страница композитной скважины со сводкой по скважинам 2021-10-13 16:32:39 +05:00
goodmice
9e1dcbf5b0 Обновлена страница куста (убрана вкладка секций) 2021-10-13 16:32:01 +05:00
goodmice
e64092881c Сервисы обновлены 2021-10-13 16:30:45 +05:00
goodmice
3f06e0ed3c Добалено отображение выбранной вкладки в операциях по скважине 2021-10-12 17:08:04 +05:00
goodmice
57c6859386 Отключено отображение пагинации 2021-10-12 16:51:25 +05:00
goodmice
23571eb213 Имя метода обновления режима исправлено 2021-10-12 16:49:33 +05:00
goodmice
a60b73d408 Удалена пагинация 2021-10-12 16:48:17 +05:00
goodmice
279b375ea9 Сервисы обновлены 2021-10-12 15:28:46 +05:00
goodmice
d777b02661 Страница переименована 2021-10-12 15:04:02 +05:00
goodmice
fb364104f7 Фабрики исправлены 2021-10-12 15:03:43 +05:00
goodmice
92f95b5fe2 Сервисы обновлены 2021-10-12 15:01:07 +05:00
goodmice
b6b7a0bc43 Название страницы исправлено 2021-10-12 11:15:45 +05:00
goodmice
f9271b0f46 Merge remote-tracking branch 'origin/dev' into DrillingModesPage 2021-10-12 11:13:55 +05:00
goodmice
ef71890023 Добавлена страница с режимами бурения 2021-10-12 11:10:33 +05:00
goodmice
a22bfcbb1f API updated 2021-10-12 10:39:56 +05:00
goodmice
5e43b59d8c Добавлен тип столбца "Диапозон со средним значением" 2021-10-11 16:10:19 +05:00
Фролов
2da5e7076e remove dead controller; 
update api client;
 2021-10-11 15:58:38 +05:00
Фролов
0ee72bb952 fix userView 2021-10-11 15:32:18 +05:00
Фролов
260f89db62 Add import/export to WellOperations 2021-10-11 13:42:32 +05:00
Фролов
0aacc05dac Improve fetch error handling 2021-10-11 13:41:54 +05:00
Фролов
9360724ad2 update api client 2021-10-11 13:41:19 +05:00
Фролов
26044734ad Refactor defaultNumericColunmOptions to makeNumericColunmOptions(..) 2021-10-08 17:02:15 +05:00
Фролов
fbc0c97b99 Update WellOperations and Tvd by new model 2021-10-08 17:01:27 +05:00
Фролов
beaa8f3743 update client 2021-10-08 17:00:48 +05:00
KharchenkoVV
e06df14a80 CF2-49: Removed Measures form validation 2021-10-08 11:25:21 +05:00
KharchenkoVV
372617f314 CF2-49: Removed unnecessary useEffect() 2021-10-08 10:50:27 +05:00
KharchenkoVV
49997e7449 Merge branch 'NewMeasures' of https://bitbucket.org/autodrilling/asb_cloud_front into NewMeasures 2021-10-08 10:02:14 +05:00
KharchenkoVV
8f06192ccf CF2-49: Fixed error while Measure deleting 2021-10-08 10:00:43 +05:00
KharchenkoVV
11bb5f4c18 CF2-49: Changed 'Measures' table crud buttons 2021-10-07 17:23:01 +05:00
KharchenkoVV
11650fea46 CF2-49: Added 'no data' display if no measures are uploaded 2021-10-07 15:34:59 +05:00
KharchenkoVV
61049d6b8b CF2-49: Fixed 'Measures' table in editing view 2021-10-07 15:05:59 +05:00
KharchenkoVV
00ed56c8b1 CF2-49: Added default values for 'Measure' table 2021-10-07 11:52:52 +05:00
KharchenkoVV
d562b910ca CF2-49: Added values to table inputs while 'Measures' table update 2021-10-07 10:48:26 +05:00
KharchenkoVV
c6bdb27857 CF2-49: Fixed selecting of default values to display 2021-10-06 16:06:07 +05:00
KharchenkoVV
9973009c65 CF2-49: Added 'Insert' and 'Delete' actions 2021-10-06 15:31:55 +05:00
KharchenkoVV
cf0b3161f0 CF2-49: Added form in 'Measures' table 2021-10-06 13:57:04 +05:00
KharchenkoVV
05b891b15f CF2-49: Added switch measure table state (normal/editing) 2021-10-05 17:55:20 +05:00
KharchenkoVV
1cda800f18 Api refresh 2021-10-05 15:20:42 +05:00
KharchenkoVV
fa78376c2a CF2-49: Fixed Measures appearence. Added switch values by history. 2021-10-05 14:57:56 +05:00
KharchenkoVV
5755b41abc CF2-49: Main changes for new Measures table display 2021-10-04 18:06:42 +05:00
Фролов
c2243f1eb6 refactor EditableTable separate try-catch on change handlers. 2021-09-30 18:00:46 +05:00
Фролов
74bc512fa3 Refactor extract downloadFileMethod into factory 2021-09-30 12:33:41 +05:00
Фролов
f0e16032e0 Animate PidId border and icons: MSE, Spin, TorqueStab. 
Refactor TelemetryView Replace antd.Grid to own html5Grid.
Fix RigMnemo bit animation.
 2021-09-30 11:42:23 +05:00
KharchenkoVV
1897cfacdd Added message well depth display to monitoring page 2021-09-24 11:45:25 +05:00
KharchenkoVV
ce8596ed87 Added well depth display to messages table 2021-09-24 11:16:03 +05:00
Фролов
bb73a17a77 fix reports 2021-09-23 14:18:46 +05:00
Фролов
f46d94f547 update api client 2021-09-23 14:18:22 +05:00
Фролов
4d8a62c072 fix report filter 2021-09-21 10:35:34 +05:00
Фролов
8d46df8294 fix WellOperationEditor make wellDepth numeric before send. 2021-09-17 15:11:12 +05:00
KharchenkoVV
a437972fc5 Fixed WellOperations table cell renderer 2021-09-16 16:33:03 +05:00
Фролов
dd9c49c626 hotfix ui freeze (zoom in map) 2021-09-15 12:03:03 +05:00
Фролов
0914449d92 api client update 2021-09-15 12:00:59 +05:00
KharchenkoVV
38c6c6cf8c Added alt to <img> 2021-09-13 17:33:11 +05:00
KharchenkoVV
f06641a1d6 Added MSE, Spin and Torque indicators (with raw style) 2021-09-13 17:31:09 +05:00
KharchenkoVV
945b119500 Commented 'Telemetry operations' main menu tab 2021-09-13 16:02:43 +05:00
KharchenkoVV
68ef0e8e9d Fixed Telemetry analytics charts' appearance 2021-09-13 16:00:51 +05:00
Фролов
03fd9ae3b1 hotfix ClusterSections "number.ToFixed is not a function" at columns definition 2021-09-13 12:17:38 +05:00
KharchenkoVV
2bcdbc3738 Added 'Operations summary' doghnut chart 2021-09-10 15:27:28 +05:00
KharchenkoVV
700dbe2154 Api methods and Dtos update 2021-09-10 15:24:55 +05:00
KharchenkoVV
be6072e641 Added 'Bar' chart for 'Depth to interval' telemetry analysis 2021-09-09 17:39:24 +05:00
KharchenkoVV
8302cc8573 Merge branch 'dev' of https://bitbucket.org/autodrilling/asb_cloud_front into dev 2021-09-09 11:13:47 +05:00
KharchenkoVV
2855adefd7 Fixed Telemetry depth to day chart 2021-09-09 11:13:32 +05:00
Фролов
82f3c775f7 spell check 2021-09-09 09:12:51 +05:00
KharchenkoVV
eab4e3d749 Base pages and components for Telemetry analytics charts 2021-09-08 16:58:49 +05:00
Фролов
0b75d8240e WellOperation. Add default startDate, fix durationColumn render 2021-09-03 15:29:54 +05:00
Фролов
0b377d11c6 Add component \ Private for routing by roles 2021-09-03 14:27:00 +05:00
Фролов
71a21395fa logo edit. remove padding 2021-09-03 09:56:30 +05:00
Фролов
ffed103f8f Change logo. Reorganize resources. 2021-09-03 09:46:22 +05:00
Фролов
c831cf0117 measure design incomplete 2021-09-03 09:26:43 +05:00
Фролов
dc324001e8 design before change logo 2021-09-03 09:26:20 +05:00
KharchenkoVV
a088e63f04 Fixed 'unique keys' error in well operations modal window in Cluster data info table 2021-09-02 17:31:58 +05:00
KharchenkoVV
322aa42c63 Moved reusing TVD request to .getOperations() function 2021-09-02 17:09:14 +05:00
KharchenkoVV
73968646e6 unique keys errors fix 2021-09-02 16:33:02 +05:00
KharchenkoVV
8560ce5f47 Changed ClusterInfo data's keys from data.id to data.caption 2021-09-02 11:37:28 +05:00
KharchenkoVV
c288b45dab Removed unnecessary useEffect() from ClusterInfo tables 2021-09-02 09:52:57 +05:00
KharchenkoVV
bb84c348fc Merge branch 'master' of https://bitbucket.org/frolovng/asb_cloud_front_react 2021-09-01 16:24:25 +05:00
KharchenkoVV
0c41cc8784 Added incorrect login/password error in login form 2021-09-01 16:24:11 +05:00
Фролов
4ad91d861f design 2021-09-01 15:55:23 +05:00
Фролов
e42b9069fe Move drillingProgramButton into documentTemplate header 2021-09-01 13:43:14 +05:00
Фролов
449a7566b6 CF2-61 DrillingProgram кнопка загрузки доступна только при наличии excel файлов в DocumentsTemplate 2021-09-01 12:29:44 +05:00
KharchenkoVV
75657398c6 Added align: right to numeric EditableCells in Operations table 2021-09-01 11:58:50 +05:00
Фролов
0b18324a47 CF2-60 DrillingProgram > DocumentsTemplate > UploadForm задавать фильтр допустимых форматов файлов 2021-09-01 10:32:47 +05:00
Фролов
d7349afd6b fix factory.download. 
Starts download only if response status is 200
 2021-09-01 10:31:56 +05:00
Фролов
bd6b8cef11 update api client 2021-08-31 18:06:48 +05:00
Фролов
615e0d4031 refactor DrillingProgram is based on DocumentsTemplate 2021-08-31 18:04:04 +05:00
Фролов
33146c59d8 Add components for simple view users and companies. 
Add Grid.jsx for css grid.
 2021-08-31 18:03:08 +05:00
KharchenkoVV
22c242cd5e Fixed date sorter for dates in Cluster info table 2021-08-31 16:53:46 +05:00
KharchenkoVV
a21e528f55 Removed null check for cluster table data from parse functions to render 2021-08-31 16:41:13 +05:00
KharchenkoVV
af76dad0b2 Added null check for ClusterSections table 2021-08-31 13:50:13 +05:00
KharchenkoVV
e779253ff6 Merge branch 'master' of https://bitbucket.org/frolovng/asb_cloud_front_react 2021-08-31 12:45:02 +05:00
KharchenkoVV
e33f45f119 Changed well name to router link 2021-08-31 12:44:39 +05:00
Фролов
c8c06f46e7 fix file search by name 2021-08-31 12:30:44 +05:00
Фролов
c8d184c590 Add UserView 2021-08-31 12:30:03 +05:00
KharchenkoVV
dc5b96ccb0 Fixed data align in numeric table columns 2021-08-31 11:55:26 +05:00
KharchenkoVV
4ccba24db4 Fixed operations modal window in Cluster info table 2021-08-31 11:46:55 +05:00
KharchenkoVV
ab1aa7be90 Merge branch 'master' of https://bitbucket.org/frolovng/asb_cloud_front_react 2021-08-31 11:14:52 +05:00
KharchenkoVV
6795b6c936 Added Well operations modal window to Cluster info table 2021-08-31 11:14:35 +05:00
Фролов
b5c99b29bd Merge branch 'master' of https://bitbucket.org/frolovng/asb_cloud_front_react 2021-08-30 16:41:10 +05:00
Фролов
30b5ac8eb3 Add Measure Editor 2021-08-30 16:40:56 +05:00
KharchenkoVV
a7293f616b Removed footer from 'TVD' modal window 2021-08-30 16:22:18 +05:00
KharchenkoVV
81c457c350 Added render format to 'Duration' table column 2021-08-30 16:17:58 +05:00
KharchenkoVV
fb8d693a15 Added filters to WellOperations Plan/Fact tables 2021-08-30 15:53:08 +05:00
Фролов
7a7a4663c5 Remove padding from EditableCell. 
Add types into otherColumsParams.
 2021-08-30 15:11:21 +05:00
Фролов
4118319b97 return scrollbars back 2021-08-30 15:09:53 +05:00
Фролов
1ad8ecc37b update api client 2021-08-30 15:09:27 +05:00
Фролов
a23ed5bb25 Merge branch 'master' of https://bitbucket.org/frolovng/asb_cloud_front_react 2021-08-30 13:40:41 +05:00
KharchenkoVV
a0e6783f97 Added types to index.ts in 'Table' 2021-08-30 12:39:46 +05:00
Фролов
8462eb7158 Merge branches 'master' and 'master' of https://bitbucket.org/frolovng/asb_cloud_front_react 2021-08-30 12:19:11 +05:00
KharchenkoVV
f6e896d8f3 Removed WellStats' filters config from Table to WellStats 2021-08-30 12:13:30 +05:00
KharchenkoVV
e063fac9ad Removed 'Cluster' tables functions from 'Table' folder to Cluster index 2021-08-30 11:26:00 +05:00
Фролов
2ea28da0e6 fix EditableTable autokeying bug 2021-08-30 11:25:24 +05:00
Фролов
47c76b5a88 Table add interface for propsOther 2021-08-30 10:04:44 +05:00
Фролов
c1d3e736f6 Merge branch 'master' of https://bitbucket.org/frolovng/asb_cloud_front_react 2021-08-29 17:32:50 +05:00
Фролов
1946389b43 Add DrillingProgram 2021-08-29 17:32:31 +05:00
Фролов
9a238ba9ef update Api client 2021-08-29 17:32:18 +05:00
KharchenkoVV
49507e2539 Merge branch 'master' of https://bitbucket.org/frolovng/asb_cloud_front_react 2021-08-29 14:43:14 +05:00
KharchenkoVV
673fc6c4af Added TVD to modal window in ClusterWells table 2021-08-29 14:43:02 +05:00
Фролов
bf9d343570 fix NaN in WellSectionsStat 2021-08-29 12:14:10 +05:00
Фролов
04ce3f0ebf LastData renamed to Measure 2021-08-28 22:32:13 +05:00
Фролов
a164cac9d0 update api client 2021-08-28 22:31:05 +05:00
KharchenkoVV
e586e7ae59 Merge branch 'master' of https://bitbucket.org/frolovng/asb_cloud_front_react 2021-08-27 17:11:48 +05:00
KharchenkoVV
3247ef5cf7 CF2-56: Added TVD chart to 'Wells operations' tab 2021-08-27 17:11:30 +05:00
Фролов
4c2342e205 fix routing 2021-08-27 14:21:48 +05:00
Фролов
2a6a53a1ce fix WellSectionsStat and WellOperationsEditor data mapping 2021-08-27 13:44:09 +05:00
KharchenkoVV
f39e550ac7 Reamed 'Analysis' components to 'Telemetry Analysis' 2021-08-27 11:49:32 +05:00
KharchenkoVV
a4cd429737 CF2-55: Fixed filters 2021-08-26 17:45:36 +05:00
KharchenkoVV
ed4fe093e0 CF2-55: Fixed row selection (prevented selection of several rows at a time) 2021-08-26 11:32:19 +05:00
KharchenkoVV
ac987546b3 CF2-55: Added data to cluster info tables 2021-08-26 11:05:30 +05:00
KharchenkoVV
36bd376b7a CF2-55: Moved reusing code to table config 2021-08-25 10:54:07 +05:00
KharchenkoVV
81fcd3c0e5 CF2-55: Added separated wells/well sections table 2021-08-24 16:32:32 +05:00
Фролов
6e1bb81bce Fixed Well Sections table 2021-08-23 16:41:34 +05:00
Фролов
2ab34efdd6 grouping last data 2021-08-20 17:49:10 +05:00
Фролов
877306b876 Add icons to menu 2021-08-20 16:33:56 +05:00
Фролов
ca9ffe3bd9 fix Archive page 2021-08-20 15:43:13 +05:00
Фролов
7435bb86b5 Add delete function into Documents 2021-08-20 15:28:13 +05:00
Фролов
43e69021d4 update api client 2021-08-20 13:49:21 +05:00
Фролов
d9969a7468 Add SelectFromDictionary 2021-08-20 12:31:24 +05:00
Фролов
a1173fb6a4 grouping Table components and functions into Table folder 2021-08-20 10:49:20 +05:00
Фролов
9d6669c160 fix width of actions column in EditableTable 2021-08-20 09:20:33 +05:00
Фролов
1bfe5f197e make WellOperationsEditor bordered 2021-08-19 17:55:08 +05:00
Фролов
a273d82430 Add dummy tvd 2021-08-19 17:52:38 +05:00
Фролов
c8921c23cd add wellSections page 2021-08-19 17:52:22 +05:00
Фролов
98a87b3f3a Grouping well operations into folder 2021-08-19 17:51:56 +05:00
Фролов
0a3fc5e59d api client update 2021-08-19 15:17:08 +05:00
Фролов
f418afb570 fix WellOperationsEditor 2021-08-19 15:07:24 +05:00
Фролов
057848116b fix RegExp for floats 2021-08-19 15:06:28 +05:00
Фролов
0d1bdcc15a add width of actions column 2021-08-19 15:05:48 +05:00
Фролов
240885cf93 Add autokeys 2021-08-19 11:40:26 +05:00
Фролов
c90e3bde42 WellOperations get and display. 2021-08-18 18:01:46 +05:00
Фролов
24d2ff5fe9 update api client 2021-08-18 18:01:05 +05:00
Фролов
68b0827f66 rename showLoader 2021-08-18 13:50:44 +05:00
Фролов
ad0719b54b Недодуланый код перенесен в папку concept 2021-08-18 13:50:08 +05:00
Фролов
3077ffabcf Весь не доделаный код перенесен в папку concept 2021-08-18 11:40:46 +05:00
Фролов
fbd98134ea reports refactoring 2021-08-18 10:35:39 +05:00
Фролов
3f4464b068 Add sync method invokeWebApiWrapper 2021-08-18 10:35:05 +05:00
Фролов
178057049f rename factory method updateFromWebApiWrapperAsync 2021-08-17 17:42:42 +05:00
Фролов
7bfd446913 add FilterFileName 2021-08-17 17:01:19 +05:00
Фролов
2418d13e75 Refactor documents 2021-08-17 16:46:46 +05:00
Фролов
29537b8d5a fix EditableTable Edit button visibility 2021-08-17 15:24:58 +05:00
Фролов
73d59ae03d ConfigProvider перенесен в App. 2021-08-17 13:01:13 +05:00
Фролов
2ae5e896ed выделение стилей из общего файла 2021-08-17 13:00:03 +05:00
Фролов
fdd05d71e3 grouping components 2021-08-17 10:46:28 +05:00
Фролов
5f6a4724cc Add download function 2021-08-17 10:46:10 +05:00
Фролов
28ad2f63f1 api client update 2021-08-17 10:44:41 +05:00
Фролов
73e0dded99 cleanup 2021-08-17 10:43:23 +05:00
Фролов
60b33503b1 Add some useful factory functions 2021-08-13 14:46:22 +05:00
Фролов
39f9f04c20 cleanup 2021-08-13 11:40:20 +05:00
Фролов
7ea9d8a393 cleanup 2021-08-13 11:37:54 +05:00
Фролов
131b5bce81 group smbo 2021-08-13 10:31:53 +05:00
Фролов
6657e0fa83 add idWell into every child page 2021-08-13 10:31:42 +05:00
Фролов
e6f2c9f517 use stantart Display component 2021-08-13 10:31:02 +05:00
Фролов
0a1af2c293 fix webApiClient method name 2021-08-13 10:30:26 +05:00
Фролов
3a15744a7a Возможность enum. 
Подстановка текста из словаря по ключевому значению.
 2021-08-13 10:29:34 +05:00
Фролов
f384981d7b grouping TelemetryView components 2021-08-12 17:54:04 +05:00
Фролов
a9a572d57f grouping TelemetryView components 2021-08-12 17:47:16 +05:00
Фролов
e391e6a470 Merge branch 'master' of https://bitbucket.org/frolovng/asb_cloud_front_react 2021-08-12 15:43:18 +05:00
Фролов
5a9f28740a редактор секций скважины 2021-08-12 15:43:03 +05:00
Фролов
07dea346dc возможность инициализировать данные 2021-08-12 15:41:11 +05:00
KharchenkoVV
a75e6d8cef Merge branch 'master' of https://bitbucket.org/frolovng/asb_cloud_front_react 2021-08-12 10:06:59 +05:00
KharchenkoVV
03820c4c88 Fixed get id of current well for Documents' requests 2021-08-12 10:03:44 +05:00
Фролов
5038285d6d fix all warnings 2021-08-11 17:39:27 +05:00
Фролов
139f73e968 fix, not tested EditableTable 2021-08-11 11:44:20 +05:00
Фролов
056642f705 update api client 2021-08-11 11:22:52 +05:00
Фролов
ac278edbf3 fix smbo worktime caption 2021-08-10 17:58:56 +05:00
Alexey
85d8f8b614 Слияние с веткой smbo 2021-08-09 16:49:14 +05:00
Alexey
e5eb90539c Добавлен фильтр сообщений по тексту 2021-08-09 16:27:13 +05:00
Alexey
c2514f917c Плитки для смбо. Другая логика расставления + Стили для пустых мест 2021-08-09 11:49:26 +05:00
Фролов
40efe38210 Merge branch 'master' of https://bitbucket.org/frolovng/asb_cloud_front_react 2021-08-09 09:45:43 +05:00
Alexey
7cf3197ac1 Расставил плитки в арку 2021-08-06 17:46:50 +05:00