Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Field Science
datavis
Commits
919063d5
Commit
919063d5
authored
Mar 04, 2020
by
Porter Libby
Browse files
switch value to value_1
parent
c0ff2b01
Changes
2
Hide whitespace changes
Inline
Side-by-side
public/js/data.js
View file @
919063d5
...
...
@@ -613,10 +613,10 @@ function processReadings(readings){
out_node
.
accuracy
=
current_data
[
j
].
accuracy
;
// 0 to 8
if
(
!
out_node
[
current_data
[
j
].
sensortype
]){
out_node
[
current_data
[
j
].
sensortype
]
=
current_data
[
j
].
value
;
out_node
[
current_data
[
j
].
sensortype
]
=
current_data
[
j
].
value
_1
;
}
}
else
if
(
!
out_node
[
current_data
[
j
].
sensortype
]){
out_node
[
current_data
[
j
].
sensortype
]
=
current_data
[
j
].
value
;
out_node
[
current_data
[
j
].
sensortype
]
=
current_data
[
j
].
value
_1
;
}
}
}
...
...
queries.js
View file @
919063d5
...
...
@@ -101,7 +101,7 @@ const getReadingsDates = (request, response) => {
const
getReadings
=
(
request
,
response
)
=>
{
var
query
=
"
SELECT tripid,siteid,sectorid,spotid,platformid,
"
+
"
(SELECT sensortype FROM fieldday_sensor where sensorid=fieldday_reading.sensorid)
"
+
"
,recordtime,latitude,longitude,elevation,accuracy,satellites,quality,value,value_2
"
+
"
,recordtime,latitude,longitude,elevation,accuracy,satellites,quality,value
_1
,value_2
"
+
"
,value_3,value_4,value_5,value_6 from fieldday_reading where tripid=
"
+
(
request
.
query
.
tripid
)
+
'
and siteid=
'
+
(
request
.
query
.
siteid
)
+
'
and sectorid=
'
+
request
.
query
.
sectorid
+
'
and
'
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment