forked from ddrilling/asb_cloud_front
Merge branch 'NewMeasures' of https://bitbucket.org/autodrilling/asb_cloud_front into NewMeasures
This commit is contained in:
commit
49997e7449
@ -32,7 +32,7 @@
|
|||||||
"react_test": "react-scripts test",
|
"react_test": "react-scripts test",
|
||||||
"eject": "react-scripts eject"
|
"eject": "react-scripts eject"
|
||||||
},
|
},
|
||||||
"proxy": "http://192.168.1.70:5000",
|
"proxy": "http://localhost:5000",
|
||||||
"eslintConfig": {
|
"eslintConfig": {
|
||||||
"extends": [
|
"extends": [
|
||||||
"react-app",
|
"react-app",
|
||||||
|
@ -36,9 +36,9 @@ export const MeasureTable = ({idWell, idCategory, title, columns, values, update
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
let valuesToDisplay = []
|
let valuesToDisplay = []
|
||||||
|
|
||||||
if(!selectedTimeLineId)
|
if(!selectedTimeLineId)
|
||||||
valuesToDisplay = values && values.length
|
valuesToDisplay = values && values.length
|
||||||
? values[[values.length-1]]
|
? values[values.length-1]
|
||||||
: []
|
: []
|
||||||
else
|
else
|
||||||
valuesToDisplay = values.find(el => el.id === selectedTimeLineId)
|
valuesToDisplay = values.find(el => el.id === selectedTimeLineId)
|
||||||
|
Loading…
Reference in New Issue
Block a user