From 95a19fe80331d299b0fa5fe0591f9b729b84d1a9 Mon Sep 17 00:00:00 2001 From: Ankit Gupta Date: Sun, 17 Apr 2016 10:27:06 +0400 Subject: [PATCH] major code cleaning --- model/index.html | 157 +++++++++++++++++++++++++++-------------------- 1 file changed, 92 insertions(+), 65 deletions(-) diff --git a/model/index.html b/model/index.html index fb36727..f69691a 100644 --- a/model/index.html +++ b/model/index.html @@ -197,9 +197,8 @@

OVERVIEW

} } - myDataRef.on('value', function(snapshot) { - - current_graph = $(".iron-selected").attr("href") + function update_graphs() { + current_graph = $(".iron-selected").attr("href") current_graph = current_graph.substring(1, current_graph.length); console.log(current_graph) //console.log($(".iron-selected").value); @@ -222,6 +221,33 @@

OVERVIEW

var averages = get_score(firebasepath, "nyuad") d3.selectAll("#OverallVisualization > *").remove(); add_many_series_to_svg(averages, parseDate, "#OverallVisualization") + } + + myDataRef.on('value', function(snapshot) { + update_graphs() + // current_graph = $(".iron-selected").attr("href") + // current_graph = current_graph.substring(1, current_graph.length); + // console.log(current_graph) + // //console.log($(".iron-selected").value); + // console.log("Change found.") + // //get_feature(firebasepath, "electricity") + // console.log(d3.select("svg")) + // //d3.select('svg').remove(); + // //d3.select('svg').remove(); + // console.log(d3.select("svg")) + + // var x1 = get_org(firebasepath, "nyuad") + // console.log(x1) + // data = x1[current_graph] + + // console.log(data) + // if (data) { + // d3.selectAll("#InputVisualization > *").remove(); + // add_series_to_svg(data, parseDate, "#InputVisualization"); + // } + // var averages = get_score(firebasepath, "nyuad") + // d3.selectAll("#OverallVisualization > *").remove(); + // add_many_series_to_svg(averages, parseDate, "#OverallVisualization") }); $('#submitButton').on('click', function () { @@ -350,74 +376,75 @@

OVERVIEW

console.log("Tab was clicked!"); for (i in fields) { - console.log($("#" + fields[i])) + //console.log($("#" + fields[i])) $("#" + fields[i]).val(''); } + update_graphs() }); - $('paper-tab[href="#water"]').on('click', function() { - d3.select("svg").remove(); - d3.select("svg").remove(); - d3.select("svg").remove(); - var x1 = get_org(firebasepath, "nyuad") - data = x1["water"] - if (data) { - add_series_to_svg(data, parseDate, "#InputVisualization") - } - var averages = get_score(firebasepath, "nyuad") - add_many_series_to_svg(averages, parseDate, "#OverallVisualization") - }); - - $('paper-tab[href="#electricity"]').on('click', function() { - d3.select("svg").remove(); - d3.select("svg").remove(); - d3.select("svg").remove(); - var x1 = get_org(firebasepath, "nyuad") - data = x1["electricity"] - if (data) { - add_series_to_svg(data, parseDate, "#InputVisualization") - } - var averages = get_score(firebasepath, "nyuad") - add_many_series_to_svg(averages, parseDate, "#OverallVisualization") - }); - $('paper-tab[href="#waste"]').on('click', function() { - d3.select("svg").remove(); - d3.select("svg").remove(); - d3.select("svg").remove(); - var x1 = get_org(firebasepath, "nyuad") - data = x1["oil"] - if (data) { - add_series_to_svg(data, parseDate, "#InputVisualization") - } - var averages = get_score(firebasepath, "nyuad") - add_many_series_to_svg(averages, parseDate, "#OverallVisualization") - }); - $('paper-tab[href="#fuel"]').on('click', function() { - d3.select("svg").remove(); - d3.select("svg").remove(); - d3.select("svg").remove(); - var x1 = get_org(firebasepath, "nyuad") - data = x1["fuel"] - if (data) { - add_series_to_svg(data, parseDate, "#InputVisualization") - } - var averages = get_score(firebasepath, "nyuad") - add_many_series_to_svg(averages, parseDate, "#OverallVisualization") - }); - $('paper-tab[href="#food"]').on('click', function() { - d3.select("svg").remove(); - d3.select("svg").remove(); - d3.select("svg").remove(); - var x1 = get_org(firebasepath, "nyuad") - data = x1["food"] - if (data) { - add_series_to_svg(data, parseDate, "#InputVisualization") - } - var averages = get_score(firebasepath, "nyuad") - add_many_series_to_svg(averages, parseDate, "#OverallVisualization") - }); + // $('paper-tab[href="#water"]').on('click', function() { + // d3.select("svg").remove(); + // d3.select("svg").remove(); + // d3.select("svg").remove(); + // var x1 = get_org(firebasepath, "nyuad") + // data = x1["water"] + // if (data) { + // add_series_to_svg(data, parseDate, "#InputVisualization") + // } + // var averages = get_score(firebasepath, "nyuad") + // add_many_series_to_svg(averages, parseDate, "#OverallVisualization") + // }); + + // $('paper-tab[href="#electricity"]').on('click', function() { + // d3.select("svg").remove(); + // d3.select("svg").remove(); + // d3.select("svg").remove(); + // var x1 = get_org(firebasepath, "nyuad") + // data = x1["electricity"] + // if (data) { + // add_series_to_svg(data, parseDate, "#InputVisualization") + // } + // var averages = get_score(firebasepath, "nyuad") + // add_many_series_to_svg(averages, parseDate, "#OverallVisualization") + // }); + // $('paper-tab[href="#waste"]').on('click', function() { + // d3.select("svg").remove(); + // d3.select("svg").remove(); + // d3.select("svg").remove(); + // var x1 = get_org(firebasepath, "nyuad") + // data = x1["oil"] + // if (data) { + // add_series_to_svg(data, parseDate, "#InputVisualization") + // } + // var averages = get_score(firebasepath, "nyuad") + // add_many_series_to_svg(averages, parseDate, "#OverallVisualization") + // }); + // $('paper-tab[href="#fuel"]').on('click', function() { + // d3.select("svg").remove(); + // d3.select("svg").remove(); + // d3.select("svg").remove(); + // var x1 = get_org(firebasepath, "nyuad") + // data = x1["fuel"] + // if (data) { + // add_series_to_svg(data, parseDate, "#InputVisualization") + // } + // var averages = get_score(firebasepath, "nyuad") + // add_many_series_to_svg(averages, parseDate, "#OverallVisualization") + // }); + // $('paper-tab[href="#food"]').on('click', function() { + // d3.select("svg").remove(); + // d3.select("svg").remove(); + // d3.select("svg").remove(); + // var x1 = get_org(firebasepath, "nyuad") + // data = x1["food"] + // if (data) { + // add_series_to_svg(data, parseDate, "#InputVisualization") + // } + // var averages = get_score(firebasepath, "nyuad") + // add_many_series_to_svg(averages, parseDate, "#OverallVisualization") + // }); function displayChatMessage(name, text) {