diff --git a/package.json b/package.json index 65b6c2d4be01e51ffa4af8097fac257be3d0fe02..25e4bf61a59c8d6c8c5f0bf1ab8ba88cf06f7326 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "weather_interface", - "version": "1.02.01", + "version": "1.02.03", "description": "Collect data from a Davis Vantage Pro 2, and display and download it through a NodeJS front-end.", "main": "index.js", "scripts": { diff --git a/public/js/graph.js b/public/js/graph.js index be86cdd3ffa0e6119f084a416de9b69e0f80991f..c9747d44c329289e811eaac146404180bd8d4e3e 100644 --- a/public/js/graph.js +++ b/public/js/graph.js @@ -24,16 +24,28 @@ function make_graph(arr, depth, offset){ slide_min = Math.min(document.getElementById('slide1').value, document.getElementById('slide2').value); arr = [arr[0]].concat(arr.slice(slide_min, slide_max)); */ - arr = [arr[0]].concat(arr.slice(arr.length - 101)); + arr = [arr[0]].concat(arr.slice(1).slice(arr.length - depth)); - let data_sensors = arr.shift(); - let datasets = [] - l = [] + let data_sensors = arr.shift(); // titles of columns + let datasets = []; // container for data to graph (2d array) + l = [] // container for dates (displayed on x axis) + for (x=0;x< arr.length;x++){ l.push(arr[x][1]) } - + console.log(data_sensors); for (x=2;x<data_sensors.length;x++){ // start from two for timestamp + // Add units + if (data_sensors[x] == "barometric") { data_sensors[x] += " (inHg)"} + if (data_sensors[x] == "insideTemp") { data_sensors[x] += " (°" + temp_unit[unit_system] + ")"} + if (data_sensors[x] == "outsideTemp") { data_sensors[x] += " (°" + temp_unit[unit_system] + ")"} + if (data_sensors[x] == "insideHum") { data_sensors[x] += " (%)"} + if (data_sensors[x] == "outsideHum") { data_sensors[x] += " (%)"} + if (data_sensors[x] == "windSpeed") { data_sensors[x] += " (" + speed_unit[unit_system] + ")"} + if (data_sensors[x] == "windSpeedAvg") { data_sensors[x] += " (" + speed_unit[unit_system] + ")"} + if (data_sensors[x] == "windSpeed2mAvg") { data_sensors[x] += " (" + speed_unit[unit_system] + ")"} + if (data_sensors[x] == "solarRad\r") { data_sensors[x] += " (W/m^2)"} + d = [] for (y=0;y< arr.length;y++){ d.push(arr[y][x]) diff --git a/public/js/home.js b/public/js/home.js index e349740eb1c6ae4b6705abdb11409a9fa54950cd..570b80b7aaeab9c46b7e266e4d6903472ffe339a 100644 --- a/public/js/home.js +++ b/public/js/home.js @@ -38,7 +38,7 @@ function temptable(data){ // temperature section of current weather // insideTemp header.innerHTML += "<th>Inside Temp</th>"; - row.innerHTML += "<td>" + data['insideTemp'] + "° " + temp_unit[unit_system] + "</td>"; + row.innerHTML += "<td>" + data['insideTemp'] + " °" + temp_unit[unit_system] + "</td>"; // insideHum @@ -47,7 +47,7 @@ function temptable(data){ // temperature section of current weather // outsideTemp header.innerHTML += "<th>Outside Temp</th>"; - row.innerHTML += "<td>" + data['outsideTemp'] + "° " + temp_unit[unit_system] + "</td>"; + row.innerHTML += "<td>" + data['outsideTemp'] + " °" + temp_unit[unit_system] + "</td>"; // outsideHum header.innerHTML += "<th>Outside Humidity</th>";