Some updates.

Author: xuwenyihust

web/static/count.js

@@ -3,7 +3,7 @@
 // Counts Chart
 //
 var count_margin = {top: 20, right: 100, bottom: 70, left: 60},
-    count_width = 1000 - count_margin.left - count_margin.right,
+    count_width = 800 - count_margin.left - count_margin.right,
     count_height = 300 - count_margin.top - count_margin.bottom;
 
 // set the ranges

web/static/total.js

@@ -0,0 +1,29 @@
+//////////////////////////////////////////////////////////////////
+//
+// 
+//
+var total = d3.select("#total").append("svg")
+    .attr("height", 120)
+    .append("g")
+    .attr("transform",
+          "translate(" + 40 + "," + 70 + ")");
+
+var t = 0
+// load the data
+d3.json("/data/counts", function(error, data) {
+    data.forEach(function(d) {
+	t += d.Count;
+    });  
+
+   total.append("text")
+        .text(t)
+        .style("font-size","50px");
+
+});
+
+
+
+
+
+
+

web/static/track.js

@@ -0,0 +1,43 @@
+//////////////////////////////////////////////////////////////////
+//
+// 
+//
+var track = d3.select("#track").append("svg")
+              .attr("height", 120)
+              .append("g")
+              .attr("transform",
+                    "translate(" + 40 + "," + 70 + ")");
+
+track.append("text")
+     .text("#overwatch")
+     .style("font-size","50px");
+
+// load the data
+//d3.json("../../conf/parameters.json", function(error, data) {
+//    data.forEach(function(d) {
+//        d.hashtag = d.hashtag;
+//    });
+
+  //track.text(d.hashtag)
+//  track.text("#overwatch");
+
+//});
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

web/templates/dashboard.html

@@ -55,6 +55,12 @@
 			padding: 5px 10px;
 			position: relative;
 		}
+		.chart_wrapper .text_stage {
+			font: 20px;
+			padding: 5px 10px;
+			position: relative;
+		}
+
 	</style>
 	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
@@ -74,16 +80,41 @@
 
 
 	<div class="row">
-		<div class="col-sm-12">
+
+		<div class="col-sm-8">
 			<div class="chart_wrapper">
 				<div class="chart_title">
-        	Tweet Counts Timeline 
+        			Tweet Counts Timeline 
       	</div>
 				<div class="chart_stage" id="count">
   				<script src="static/count.js"></script>	
 				</div>
 			</div>			
 		</div>
+
+		<div class="col-sm-4">
+			<div class="chart_wrapper">
+				<div class="chart_title">
+					Total Number of Tracked Tweets
+				</div>
+				<div class="chart_stage" id="total">
+					<script src="static/total.js"></script>
+				</div>
+			</div>
+		</div>
+
+		<div class="col-sm-4">
+			<div class="chart_wrapper">
+				<div class="chart_title">
+					Tracked Hashtag
+				</div>
+				<div class="text_stage" id="track">
+					<script src="static/track.js"></script>
+				</div>
+			</div>
+		</div>
+
+
 	</div>	
 
 	<div class="row">