8 gadus atpakaļ · 05c630aeeb
--- a/FlaskTest/app.py
+++ b/FlaskTest/app.py
@@ -11,6 +11,7 @@ def dashboard():
 
				 		"heatmap" : {
			
 
				 			"divID" : "heatmap",
			
 
				 			"title" : "Commits by Hour of Week - dummy data",
			
 
				+			# NOTE these paths are relative to where the script.js file is
			
 
				 			"data_path1" : "../static/data/data_dummy.tsv",
			
 
				 			"data_path2" : "../static/data/data2_dummy.tsv",
			
 
				 			"summary" : "This data shows cool stuff",
			
--- a/FlaskTest/templates/base.html
+++ b/FlaskTest/templates/base.html
@@ -6,15 +6,6 @@
 
				      
			
 
				      <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
			
 
				 
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				   </head>
			
 
				   <body class="bg-faded">
			
 
				 
			
@@ -84,18 +75,14 @@
 
				  //    generateLineChart("../static/data/commits_by_author_copy.tsv", "#lineChart");
			
 
				 	// generateLineChart("../static/data/lines_of_code_by_author_copy.tsv", "#lineChart2");
			
 
				 
			
 
				-	generateHeatMap(['{{data.heatmap.data_path1}}', '{{data.heatmap.data_path2}}'], "#{{data.heatmap.divID}}");
			
 
				-	
			
 
				-    generateBarChart('{{data.barchart.data_path}}', "#{{data.barchart.divID}}");
			
 
				-
			
 
				-    generateLineChart('{{data.linegraph1.data_path}}', "#{{data.linegraph1.divID}}");
			
 
				-	generateLineChart('{{data.linegraph2.data_path}}', "#{{data.linegraph2.divID}}");
			
 
				-
			
 
				-
			
 
				+		generateHeatMap(['{{data.heatmap.data_path1}}', '{{data.heatmap.data_path2}}'], "#{{data.heatmap.divID}}");
			
 
				 
			
 
				+	    generateBarChart('{{data.barchart.data_path}}', "#{{data.barchart.divID}}");
			
 
				 
			
 
				+	    generateLineChart('{{data.linegraph1.data_path}}', "#{{data.linegraph1.divID}}");
			
 
				+		generateLineChart('{{data.linegraph2.data_path}}', "#{{data.linegraph2.divID}}");
			
 
				 
			
 
				-     </script>
			
 
				+    </script>