From 57cec6730e37aa1b1e58a7b73b204760d032a535 Mon Sep 17 00:00:00 2001 From: ShujaatMirza Date: Sun, 17 Apr 2016 02:44:20 +0400 Subject: [PATCH 01/11] Hello --- model/index.html | 85 ++++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 47 deletions(-) diff --git a/model/index.html b/model/index.html index 0e1f207..eda6d11 100644 --- a/model/index.html +++ b/model/index.html @@ -20,9 +20,6 @@ - - - @@ -36,88 +33,82 @@ Ecaura - - -
- - - +
@@ -157,7 +148,7 @@
- Add + From 4f43e62d08ea65392bc03e10f3179411acffce50 Mon Sep 17 00:00:00 2001 From: Guyu Fan Date: Sun, 17 Apr 2016 09:30:49 +0400 Subject: [PATCH 02/11] merge --- Column/column.html | 12 +- TestingLineChart/.plot.js.swp | Bin 0 -> 1024 bytes View/EcAura/output/average.json | 48 +++ View/EcAura/output/timeline.json | 2 +- View/EcAura/sbar.html | 235 ++++++----- View/aggregate/index.html | 0 model/.index.html.swp | Bin 0 -> 1024 bytes model/.test.html.swp | Bin 0 -> 1024 bytes model/index.html | 698 +++++++++++++++---------------- model/nano.save | 1 + model/test.html.save | 45 ++ 11 files changed, 573 insertions(+), 468 deletions(-) create mode 100644 TestingLineChart/.plot.js.swp create mode 100644 View/EcAura/output/average.json create mode 100644 View/aggregate/index.html create mode 100644 model/.index.html.swp create mode 100644 model/.test.html.swp create mode 100644 model/nano.save create mode 100644 model/test.html.save diff --git a/Column/column.html b/Column/column.html index 71557d0..309b900 100644 --- a/Column/column.html +++ b/Column/column.html @@ -26,7 +26,7 @@ - + @@ -41,8 +41,8 @@ var firebasepath = "https://ecaura.firebaseIO.com" var myDataRef = new Firebase(firebasepath); - - + + var margin = {top: 20, right: 20, bottom: 30, left: 40}, width = 960 - margin.left - margin.right, height = 500 - margin.top - margin.bottom; @@ -76,16 +76,16 @@ //d3.json("column.json", function(error, data) { // if (error) throw error; var myDataRef = new Firebase(firebasepath); - + myDataRef.on('value', function(snapshot) { //get_feature(firebasepath, "electricity") - console.log("hi") + console.log("hi") d3.select("svg").remove(); var x1 = get_feature(firebasepath, "water");//get_org_feature(firebasepath, "nyuad", "water"); console.log(x1); data = x1["water"] console.log(data) - + var ageNames = d3.keys(data[0]).filter(function(key) { return key !== "Date"; }); data.forEach(function(d) { diff --git a/TestingLineChart/.plot.js.swp b/TestingLineChart/.plot.js.swp new file mode 100644 index 0000000000000000000000000000000000000000..00bf0b792a8949b8cd986190fa20d510a6b221d2 GIT binary patch literal 1024 zcmYc?$V<%2S1{5u(KBK|0tdVp7}85COOb?dGC}HeLozb+vI7!RbVE!`4T`a - + rect:hover { + opacity: 0.8; + } + .tooltip{ + text-anchor: middle; + font-size: 12px; + font-weight: bold; + fill:green; + } + + + .node.active { + fill: blue; + } + + + --> - - - + + + @@ -64,7 +62,7 @@ height = 500 - margin.top - margin.bottom; var x = d3.scale.ordinal() - //.domain(data.map(function(d) { return d.date;} )) + //.domain(data.map(function(d) { return d.date;} )) .rangeRoundBands([0, width], .1); var y = d3.scale.linear() @@ -81,40 +79,42 @@ .scale(y) .orient("left"); - var tip = d3.tip() - .attr('class', 'd3-tip') - .offset([0, 0]) - .html(function(d) { - return "
Count: " + d.date + "
"; - }); +var tip = d3.tip() + .attr('class', 'd3-tip') + .offset([0, 0]) + .html(function(d) { + return "
Count: " + d.date + "
"; + }); + var svg = d3.select("body").append("svg") .attr("width", width + margin.left + margin.right) .attr("height", height + margin.top + margin.bottom) - .append("g") + .append("g") .attr("transform", "translate(" + margin.left + "," + margin.top + ")"); - - var url = "http://localhost/EcAura/output/timeline.json"; - + +// var url = "http://localhost/EcAura/output/timeline.json"; + -d3.json(url, function(error, data) { +d3.json('output/timeline.json', function(error, data) { if (error) throw error; - - - var layers = d3.layout.stack()(sentiment.map(function(c) { - return data.map(function(d) { - return {x: d.date, y: d[c]}; + var layers = d3.layout.stack()( + sentiment.map( + function(c) { + return data.map( + function(d) { + return {x: d.date, y: d[c]}; }); })); data.forEach(function(d) { d.date = parseDate(d.date); }); - data = data.sort(function(a, b) { - a = new Date(a.date); - b = new Date(b.date); - return a>b ? -1 : ab ? -1 : ab ? -1 : a diff --git a/View/aggregate/index.html b/View/aggregate/index.html new file mode 100644 index 0000000..e69de29 diff --git a/model/.index.html.swp b/model/.index.html.swp new file mode 100644 index 0000000000000000000000000000000000000000..44cab241dd99a98c00f0cec9b5c4c78773c3ab58 GIT binary patch literal 1024 zcmYc?$V<%2S1{5u(KBK|0@aZW4C$qnrAR_JnILt#AsLx@*#U_ux*;Z}2E|y_X6B`& XR_JAv literal 0 HcmV?d00001 diff --git a/model/.test.html.swp b/model/.test.html.swp new file mode 100644 index 0000000000000000000000000000000000000000..fc8365e7d7b719d876d2bc1e82ea3826e544ddeb GIT binary patch literal 1024 zcmYc?$V<%2S1{5u(KBK|0^U{(4C$qnrAR_JnILt#AsLx@*#U_ux*;Z}2E|y_>SyHV zrs{)K>${{DXP4v`=%*$pmKG)I=jNxR=IEEC7MJK{l;q}M)jcXW8UmvsKw$`kqU#3$ D4U-%i literal 0 HcmV?d00001 diff --git a/model/index.html b/model/index.html index 811ddf7..5c93a53 100644 --- a/model/index.html +++ b/model/index.html @@ -13,396 +13,392 @@ shape-rendering: crispEdges; } - - - - - - - - - - - - - - - - - - Ecaura - - - - - - -
- + + + + + + + + + + + + + + + + + + + Ecaura + + + + + +
+ + + + + + + + Water + Electricity + Waste + Fuel + Food + +
+ + - - - - - - Water - Electricity - Waste - Fuel - Food - -
- - - - - - - - - - - - - - - - -
- + + - Add - - + -
-
- ​ +
+
+
+
+

-
-

OVERVIEW

-
-
- - - + $('
').text(text).prepend($('').text(name+': ')).appendTo($('#messagesDiv')); + $('#messagesDiv')[0].scrollTop = $('#messagesDiv')[0].scrollHeight; + }; + - + diff --git a/model/nano.save b/model/nano.save new file mode 100644 index 0000000..e97a5c8 --- /dev/null +++ b/model/nano.save @@ -0,0 +1 @@ +ewdate, diff --git a/model/test.html.save b/model/test.html.save new file mode 100644 index 0000000..fb9e26d --- /dev/null +++ b/model/test.html.save @@ -0,0 +1,45 @@ + + + + + + + + +
+ + + + + + + + + From 4999fdf58eeb4729ec7ac6b234b1c131485b55a2 Mon Sep 17 00:00:00 2001 From: Ankit Gupta Date: Sun, 17 Apr 2016 09:57:48 +0400 Subject: [PATCH 03/11] css changes --- model/bk.png | Bin 0 -> 25768 bytes model/index.css | 36 ++++++++++++------------------------ model/index.html | 5 +++-- 3 files changed, 15 insertions(+), 26 deletions(-) create mode 100644 model/bk.png diff --git a/model/bk.png b/model/bk.png new file mode 100644 index 0000000000000000000000000000000000000000..684f4469ae119b53a4a396d12a4f86fb7b6211d6 GIT binary patch literal 25768 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 B8&3cL literal 0 HcmV?d00001 diff --git a/model/index.css b/model/index.css index b15774e..83f9e69 100644 --- a/model/index.css +++ b/model/index.css @@ -3,32 +3,25 @@ float: left; width: 35%; height: 100vh; + overflow-y: auto; + display:block; background-color: #EFEFEF; } - paper-tabs paper-tab.iron-selected{ background-color: #303F9F; color: white; } - paper-tabs{ - background-color: #69F0AE; + color:#1A237E; + background-color: #C5CAE9; } - paper-input { - padding-left: 15px; -width:50%; - - +width:65%; } - - - paper-button{ background-color: #E8EAF6; - } #OutputBox { position: relative; @@ -43,7 +36,8 @@ paper-button{ height: 50vh; border-bottom: 1px solid black; background-color: white; - overflow: scroll; + overflow-y: scroll; + overflow-x: hidden; }#OverallVisualization { position: relative; float: right; @@ -51,8 +45,6 @@ paper-button{ height: 50vh; background-color: white; } - - li { display: block; color: #000; @@ -60,19 +52,15 @@ li { vertical-align:middle; margin: 0px; } - - #logo img{ - -margin: 6px; - - +margin: 20px; +padding-bottom: 3px; } #logo{ - background-color: #DDD; + background-color: white; + width: 100%; + background-image: url(bk.png); } - - /*This is to style the headings within each tab, e.g. Water, Fuel, etc.*/ .ParameterHeading {} Add Comment \ No newline at end of file diff --git a/model/index.html b/model/index.html index 9505800..b30b148 100644 --- a/model/index.html +++ b/model/index.html @@ -44,7 +44,7 @@ +
- Water From 2ff379b8b0af59a8783e746a81951600bc9de02b Mon Sep 17 00:00:00 2001 From: Ankit Gupta Date: Sun, 17 Apr 2016 10:13:08 +0400 Subject: [PATCH 07/11] changed div --- model/index.html | 82 ++++++++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/model/index.html b/model/index.html index b30b148..fb36727 100644 --- a/model/index.html +++ b/model/index.html @@ -35,53 +35,53 @@ - +
- + From bd2514b428600b03e0ffa2edab176d796d61a639 Mon Sep 17 00:00:00 2001 From: Ankit Gupta Date: Sun, 17 Apr 2016 10:19:53 +0400 Subject: [PATCH 08/11] manaul revert --- model/index.css | 5 ++++- model/index.html | 32 ++++++++++++++++++++++---------- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/model/index.css b/model/index.css index 7ddb912..83f9e69 100644 --- a/model/index.css +++ b/model/index.css @@ -59,5 +59,8 @@ padding-bottom: 3px; #logo{ background-color: white; width: 100%; - background-image: url(bk.png); + background-image: url(bk.png); } +/*This is to style the headings within each tab, e.g. Water, Fuel, etc.*/ +.ParameterHeading {} +Add Comment \ No newline at end of file diff --git a/model/index.html b/model/index.html index 0fa3437..fb36727 100644 --- a/model/index.html +++ b/model/index.html @@ -18,6 +18,9 @@ + + + @@ -73,11 +76,12 @@
-
+ + @@ -89,11 +93,15 @@
+
+ + +

- +


@@ -114,42 +122,46 @@

+

-



+

-

+

-
-
-
-
-
-

+
+
+
+
+
+

Add
+ + +
From 95a19fe80331d299b0fa5fe0591f9b729b84d1a9 Mon Sep 17 00:00:00 2001 From: Ankit Gupta Date: Sun, 17 Apr 2016 10:27:06 +0400 Subject: [PATCH 09/11] 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) { From 86c7f427197108266030a164ab2c3f9e2198e7a7 Mon Sep 17 00:00:00 2001 From: Ankit Gupta Date: Sun, 17 Apr 2016 10:27:26 +0400 Subject: [PATCH 10/11] removed commented code --- model/index.html | 62 +----------------------------------------------- 1 file changed, 1 insertion(+), 61 deletions(-) diff --git a/model/index.html b/model/index.html index f69691a..18431f0 100644 --- a/model/index.html +++ b/model/index.html @@ -384,67 +384,7 @@

OVERVIEW

}); - // $('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) { From f8d72111364bfb48039a4b99e6134ef78da52eae Mon Sep 17 00:00:00 2001 From: ShujaatMirza Date: Sun, 17 Apr 2016 10:36:50 +0400 Subject: [PATCH 11/11] graphs --- model/index.css | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/model/index.css b/model/index.css index 83f9e69..4a5c02c 100644 --- a/model/index.css +++ b/model/index.css @@ -31,20 +31,34 @@ paper-button{ background-color: white; }#InputVisualization { position: relative; - float: right; + float: left; width: 100%; height: 50vh; border-bottom: 1px solid black; background-color: white; overflow-y: scroll; overflow-x: hidden; -}#OverallVisualization { +} +#InputVisualization svg{ + width: 600px; + display:block; + margin: auto; +} + + +#OverallVisualization { position: relative; float: right; width: 100%; height: 50vh; background-color: white; } + +#OverallVisualization svg{ + width: 600px; + display:block; + margin: auto; +} li { display: block; color: #000;