Skip to content

GitLab

Unverified Commit b4cf369b authored by Porter Libby's avatar Porter Libby Committed by GitHub
Browse files

Merge pull request #14 from probably-not-porter/db_changes 

Db changes
parents 73ba0f8b 0ab16062
Hide whitespace changes
Inline Side-by-side
Showing with 186 additions and 179 deletions
README.md
View file @ b4cf369b
# IFS Datavis Tool 2
## v0.1.2
## v0.1.4
Contributors: Porter Libby
[![GitHub issues](https://img.shields.io/github/issues/probably-not-porter/datavis)](https://github.com/probably-not-porter/datavis/issues)<br>
......
public/js/data.js
View file @ b4cf369b
......@@ -269,6 +269,7 @@ function getReadings(spot_id,value){
console.info('DATA - readings');
console.info('Loaded ' + readings.length + " data points.");
console.table(readings);
var color = getRandomColor();
query_data = processReadings(readings);
......@@ -566,179 +567,4 @@ function renderStreamingsDates(dates){
document.getElementById('streamingdates').innerHTML = '';
togglediv('#streamingsplatforms-ls','streamingsplatforms-button');
}
}
/*
Other
The following functions are for specific utilities in the data screen,
such as the export CSV and the permalink functionalities.
*/
function togglediv(target_div,btn_span){
if (document.getElementById(btn_span)){
var btn = document.getElementById(btn_span);
if (btn.innerHTML == '-'){
btn.innerHTML = '+';
}else{
btn.innerHTML = '-';
}
$(target_div).slideToggle();
}
}
function processReadings(readings){
spotids = query_selection[3];
spots_out = [];
for (x=0;x<spotids.length;x++){
current_data = [];
for(y=0;y<readings.length;y++){
if (readings[y].spotid == spotids[x]){
current_data.push(readings[y]);
}
}
if (current_data.length != 0){
const timestamps = [...new Set(current_data.map(item => item.recordtime))]; // use earlier date to base data on;
console.log(timestamps);
var min = timestamps.reduce(function (a, b) { return a < b ? a : b; });
out_node = {};
for(j=0;j<current_data.length;j++){
if (current_data[j].recordtime = min || !out_node.recordtime){
out_node.Spot = current_data[j].spotid;
out_node.recordtime = current_data[j].recordtime;
out_node.tripname = current_data[j].tripname;
out_node.sitename = current_data[j].sitename;
out_node.sectorname = current_data[j].sectorname;
out_node.elevation = current_data[j].elevation;
out_node.longitude = current_data[j].longitude;
out_node.latitude = current_data[j].latitude;
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;
}
}else if (!out_node[current_data[j].sensortype]){
out_node[current_data[j].sensortype] = current_data[j].value;
}
}
}
spots_out.push(out_node);
}
return spots_out;
}
function loadQuery(params){
console.info('Loading query from permalink...')
document.getElementById("button_permalink").disabled = true;
document.getElementById("button_csv").disabled = true;
if (params.length == 7 && params[1] == 1){ // streaming query
query_type = params[1]
query_selection[0] = params[2]; // load trip
query_selection[1] = params[3]; // load site
query_selection[2] = params[4]; // load sector
query_selection[4] = params[5]; // load platform
query_selection[5] = params[6]; // load date
document.getElementById('query_type').innerHTML = "<label><div style='padding-top:10px;padding-bottom:10px;'><strong>Query loaded from permalink!</br><button onclick='removeQuery()'>Return to regular selection</button></strong></div></label>";
getStreamings(query_selection[5]);
}else if (params.length == 6 && params[1] == 0){ //reading query
query_type = params[1]
query_selection[0] = params[2]; // load trip
query_selection[1] = params[3]; // load site
query_selection[2] = params[4]; // load sector (skip spot)
query_selection[3] = params[5].split('$'); // load spots
console.log(query_selection[3]);
console.log(query_selection);
document.getElementById('query_type').innerHTML = "<label><div style='padding-top:10px;padding-bottom:10px;'><strong>Query loaded from permalink!</br><button onclick='removeQuery()'>Return to regular selection</button></strong></div></label>";
getReadings(query_selection[0],true);
}
}
function buildQuery(){
console.log(query_selection);
query_string = document.location.href.split('/?')[0];
query_string += "?" + "query"
query_string += "/" + query_type
if (query_type == 1){ // streaming
query_string += "/" + query_selection[0];
query_string += "/" + query_selection[1];
query_string += "/" + query_selection[2]; // skip spot
query_string += "/" + query_selection[4];
query_string += "/" + query_selection[5];
}else{
query_string += "/" + query_selection[0];
query_string += "/" + query_selection[1];
query_string += "/" + query_selection[2];
query_string += "/"
for (x in query_selection[3]){
if (x > 0){
query_string += "$";
}
query_string += query_selection[3][x];
}
}
document.getElementById('data-prompt').innerHTML = "Query Permalink: " + query_string;
}
function removeQuery(){
query_type = null;
query_selection = [null,null,null,null,null,null];
current = document.location.href;
base = current.split('?')[0];
location.replace(base);
}
function toggleDetails(){
var all = document.getElementsByClassName('data-catagory');
for (var i = 0; i < all.length; i++) {
if (all[i].classList.contains('data-catagory-simple')){
all[i].classList.remove('data-catagory-simple');
all[i].classList.add('data-catagory-detail');
$("#button_details").css("opacity", "1.0");
}else{
all[i].classList.add('data-catagory-simple');
all[i].classList.remove('data-catagory-detail');
$("#button_details").css("opacity", "0.5");
}
}
}
function createCSV(){
const rows = [["tripid","platformid","sensorid","hostid","recordtime","value_1","quality","latitude","longitude","elevation","accuracy","satellites","value_2","value_3","siteid","sectorid","value_4","value_5","value_6"]];
console.log(query_data[0]);
for (x=0; x< query_data.length; x++){
// ROW STRUCTURE
current_row = [
query_data[x].tripid.toString(),
query_data[x].platformid.toString(),
query_data[x].sensorid.toString(),
query_data[x].hostid.toString(),
query_data[x].recordtime.toString(),
query_data[x].value_1 || "Null",
query_data[x].quality.toString(),
query_data[x].latitude.toString(),
query_data[x].longitude.toString(),
query_data[x].elevation.toString(),
query_data[x].accuracy.toString(),
query_data[x].satellites.toString(),
query_data[x].value_2 || "Null",
query_data[x].value_3 || "Null",
query_data[x].siteid.toString(),
query_data[x].sectorid.toString(),
query_data[x].value_4 || "Null",
query_data[x].value_5 || "Null",
query_data[x].value_6 || "Null",
];
rows.push(current_row)
}
console.log(rows);
let csvContent = "data:text/csv;charset=utf-8,"
+ rows.map(e => e.join(",")).join("\n");
name = "data_" + query_selection[4] + "_" + query_selection[5];
var encodedUri = encodeURI(csvContent);
var link = document.createElement("a");
link.setAttribute("href", encodedUri);
link.setAttribute("download", name + ".csv");
document.body.appendChild(link); // Required for FF
link.click(); // This will download the data file named "my_data.csv".
}
\ No newline at end of file
public/js/graph.js
View file @ b4cf369b
......@@ -25,6 +25,7 @@ $( document ).ready(function() {
});
});
function createGraphReading(dataset, q_arr, color){
console.log(dataset);
//reset containers
document.getElementById('readingStats').style.display = 'block';
document.getElementById('line-chart').style.display = 'none';
......
public/js/util.js
View file @ b4cf369b
......@@ -138,4 +138,181 @@ function resetElements(arr){
for(x=0;x<arr.length; x++){
document.getElementById(arr[x]).innerHTML = "";
}
}
/*
The following functions are for specific utilities in the data screen,
such as the export CSV and the permalink functionalities.
*/
function togglediv(target_div,btn_span){
if (document.getElementById(btn_span)){
var btn = document.getElementById(btn_span);
if (btn.innerHTML == '-'){
btn.innerHTML = '+';
}else{
btn.innerHTML = '-';
}
$(target_div).slideToggle();
}
}
function processReadings(readings){
spotids = query_selection[3];
spots_out = [];
for (x=0;x<spotids.length;x++){
current_data = [];
for(y=0;y<readings.length;y++){
if (readings[y].spotid == spotids[x]){
current_data.push(readings[y]);
}
}
if (current_data.length != 0){
const timestamps = [...new Set(current_data.map(item => item.recordtime))]; // use earlier date to base data on;
console.log(timestamps);
var min = timestamps.reduce(function (a, b) { return a < b ? a : b; });
out_node = {};
for(j=0;j<current_data.length;j++){
if (current_data[j].recordtime = min || !out_node.recordtime){
out_node.Spot = current_data[j].spotid;
out_node.recordtime = current_data[j].recordtime;
out_node.tripname = current_data[j].tripname;
out_node.sitename = current_data[j].sitename;
out_node.sectorname = current_data[j].sectorname;
out_node.elevation = current_data[j].elevation;
out_node.longitude = current_data[j].longitude;
out_node.latitude = current_data[j].latitude;
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_1;
}
}else if (!out_node[current_data[j].sensortype]){
out_node[current_data[j].sensortype] = current_data[j].value_1;
}
}
spots_out.push(out_node);
}
}
return spots_out;
}
function loadQuery(params){
console.info('Loading query from permalink...')
document.getElementById("button_permalink").disabled = true;
document.getElementById("button_csv").disabled = true;
if (params.length == 8 && params[1] == 1){ // streaming query
console.log("PARAMS");
console.log(params);
query_type = params[1]
query_selection[0] = params[2]; // load trip
query_selection[1] = params[3]; // load site
query_selection[2] = params[4]; // load sector
query_selection[3] = params[5]; // load hostid
query_selection[4] = params[6]; // load platform
query_selection[5] = params[7]; // load date
document.getElementById('query_type').innerHTML = "<label><div style='padding-top:10px;padding-bottom:10px;'><strong>Query loaded from permalink!</br><button onclick='removeQuery()'>Return to regular selection</button></strong></div></label>";
getStreamings(query_selection[5]);
}else if (params.length == 6 && params[1] == 0){ //reading query
query_type = params[1]
query_selection[0] = params[2]; // load trip
query_selection[1] = params[3]; // load site
query_selection[2] = params[4]; // load sector (skip spot)
query_selection[3] = params[5].split('$'); // load spots
console.log(query_selection[3]);
console.log(query_selection);
document.getElementById('query_type').innerHTML = "<label><div style='padding-top:10px;padding-bottom:10px;'><strong>Query loaded from permalink!</br><button onclick='removeQuery()'>Return to regular selection</button></strong></div></label>";
getReadings(query_selection[0],true);
}
}
function buildQuery(){
console.log(query_selection);
query_string = document.location.href.split('/?')[0];
query_string += "?" + "query"
query_string += "/" + query_type
if (query_type == 1){ // streaming
query_string += "/" + query_selection[0];
query_string += "/" + query_selection[1];
query_string += "/" + query_selection[2];
query_string += "/" + query_selection[3];
query_string += "/" + query_selection[4];
query_string += "/" + query_selection[5];
}else{
query_string += "/" + query_selection[0];
query_string += "/" + query_selection[1];
query_string += "/" + query_selection[2];
query_string += "/"
for (x in query_selection[3]){
if (x > 0){
query_string += "$";
}
query_string += query_selection[3][x];
}
}
document.getElementById('data-prompt').innerHTML = "Query Permalink: " + query_string;
}
function removeQuery(){
query_type = null;
query_selection = [null,null,null,null,null,null];
current = document.location.href;
base = current.split('?')[0];
location.replace(base);
}
function toggleDetails(){
var all = document.getElementsByClassName('data-catagory');
for (var i = 0; i < all.length; i++) {
if (all[i].classList.contains('data-catagory-simple')){
all[i].classList.remove('data-catagory-simple');
all[i].classList.add('data-catagory-detail');
$("#button_details").css("opacity", "1.0");
}else{
all[i].classList.add('data-catagory-simple');
all[i].classList.remove('data-catagory-detail');
$("#button_details").css("opacity", "0.5");
}
}
}
function createCSV(){
const rows = [["tripid","platformid","sensorid","hostid","recordtime","value_1","quality","latitude","longitude","elevation","accuracy","satellites","value_2","value_3","siteid","sectorid","value_4","value_5","value_6"]];
console.log(query_data[0]);
for (x=0; x< query_data.length; x++){
// ROW STRUCTURE
current_row = [
query_data[x].tripid.toString(),
query_data[x].platformid.toString(),
query_data[x].sensorid.toString(),
query_data[x].hostid.toString(),
query_data[x].recordtime.toString(),
query_data[x].value_1 || "Null",
query_data[x].quality.toString(),
query_data[x].latitude.toString(),
query_data[x].longitude.toString(),
query_data[x].elevation.toString(),
query_data[x].accuracy.toString(),
query_data[x].satellites.toString(),
query_data[x].value_2 || "Null",
query_data[x].value_3 || "Null",
query_data[x].siteid.toString(),
query_data[x].sectorid.toString(),
query_data[x].value_4 || "Null",
query_data[x].value_5 || "Null",
query_data[x].value_6 || "Null",
];
rows.push(current_row)
}
console.log(rows);
let csvContent = "data:text/csv;charset=utf-8,"
+ rows.map(e => e.join(",")).join("\n");
name = "data_" + query_selection[4] + "_" + query_selection[5];
var encodedUri = encodeURI(csvContent);
var link = document.createElement("a");
link.setAttribute("href", encodedUri);
link.setAttribute("download", name + ".csv");
document.body.appendChild(link); // Required for FF
link.click(); // This will download the data file named "my_data.csv".
}
\ No newline at end of file
queries.js
View file @ b4cf369b
......@@ -100,8 +100,11 @@ 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"
+"(SELECT DISTINCT tripname FROM fieldday_trip where tripid=fieldday_reading.tripid), "
+"(SELECT DISTINCT sitename FROM fieldday_site where siteid=fieldday_reading.siteid AND tripid=fieldday_reading.tripid), "
+"(SELECT DISTINCT sectorname FROM fieldday_sector where sectorid=fieldday_reading.sectorid AND siteid=fieldday_reading.siteid AND tripid=fieldday_reading.tripid), "
+"(SELECT DISTINCT sensortype FROM fieldday_sensor where sensorid=fieldday_reading.sensorid)"
+",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 ';
......
views/index.ejs
View file @ b4cf369b
......@@ -109,7 +109,7 @@
<div id='dataView'>
<div id='title'>
<span style='font-size:20px;'>IFS Datavis Tool v0.1.2</span><br>
<span style='font-size:20px;'>IFS Datavis Tool v0.1.4</span><br>
</div>
<div id='data'>
<div class='data-catagory' id='query_type'>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment