mods to produce correct table output in gitstats

FlaskTest/static/data/commits_by_author.dat

@@ -1,4 +1,3 @@
-date	author1	author2	author3	author4	author5	author6	author7
 1392392111 16 0 0 0 0 0 0
 1392397527 17 0 0 0 0 0 0
 1392830779 18 0 0 0 0 0 0

FlaskTest/static/js/script.js

@@ -24,7 +24,7 @@ const margin = { top: 50, right: 0, bottom: 100, left: 30 },
 
   days = ["Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"],
   times = ["1a", "2a", "3a", "4a", "5a", "6a", "7a", "8a", "9a", "10a", "11a", "12a", "1p", "2p", "3p", "4p", "5p", "6p", "7p", "8p", "9p", "10p", "11p", "12p"];
-  datasets = ["../static/data/data.tsv", "../static/data/data2.tsv"];
+  datasets = ["../static/data/data_dummy.tsv", "../static/data/data2_dummy.tsv"];
 
 const svg = d3.select("#chart").append("svg")
   .attr("width", width + margin.left + margin.right)
@@ -170,7 +170,6 @@ function generateBarChart (pathToTSV,divID){
       var width=520
       var height=380
       var chartWidth, chartHeight
-      var margin
       var svg = d3.select(divID).append("svg")
       var axisLayer = svg.append("g").classed("axisLayer", true)
       var chartLayer = svg.append("g").classed("chartLayer", true)
@@ -183,14 +182,14 @@ function generateBarChart (pathToTSV,divID){
       .style("opacity", 0);
       
       function main(data) {
-          setSize(data)
-          drawAxis()
-          drawChart(data)    
+          setSize();
+          drawAxisBarChart();
+          drawChartBarChart();    
       }
       
-      function setSize(data) {
+      function setSize() {
 
-          margin = {top:50, right:0, bottom:100,  left:30}
+          var margin = {top:50, right:0, bottom:100,  left:30}
           chartWidth = width - margin.left - margin.right,
           chartHeight = height - margin.top - margin.bottom,        
           
@@ -215,13 +214,13 @@ function generateBarChart (pathToTSV,divID){
               
       }
       
-      function drawChart(data) {
+      function drawChartBarChart() {
          // monitor the transition
           var t = d3.transition()
-              .duration(1000)
+              .duration(1100)
               .ease(d3.easeLinear)
-              .on("start", function(d){ console.log("Transiton start") })
-              .on("end", function(d){ console.log("Transiton end") })
+              .on("start", function(d){ console.log("Bar Chart Transiton start") })
+              .on("end", function(d){ console.log("Bar Chart Transiton end") })
           
           var bar = chartLayer
             .selectAll(".bar")
@@ -229,11 +228,6 @@ function generateBarChart (pathToTSV,divID){
           
           bar.exit().remove() 
 
-
-          var labels = chartLayer
-            .selectAll("labels")
-            .data(data)
-
           bar
             .enter()
             .append("rect")
@@ -245,18 +239,22 @@ function generateBarChart (pathToTSV,divID){
             //setup for cool transition
             .attr("height", 0)
             .attr("transform", function(d){ return "translate("+[xScale(d.day_name), chartHeight]+")"})
-              
 
+          var labels = chartLayer
+            .selectAll("labels")
+            .data(data)
+              
+          //setup for percentage display
           var totalCommits=0
           data.forEach(function(d){
             totalCommits+=d.commits
           })   
+
           labels
             .enter()
             .append("text")
             .text(function(d){
               var percentage= (d.commits/totalCommits *100).toFixed(2)
-
               return ""+percentage+"%";
             })
             .attr("transform", function(d){
@@ -269,7 +267,7 @@ function generateBarChart (pathToTSV,divID){
               .attr("transform", function(d){ return "translate("+[xScale(d.day_name), yScale(d.commits)]+")"})
       }
       
-      function drawAxis(){
+      function drawAxisBarChart(){
           var yAxis = d3.axisLeft(yScale)
               .tickSizeInner(-chartWidth)
           
@@ -284,17 +282,17 @@ function generateBarChart (pathToTSV,divID){
               .attr("class", "axis x")
               .attr("transform", "translate("+[margin.left, (height-margin.bottom)]+")")
               .call(xAxis);
-          
       }  
       
       //kicks of execution of the bar chart
-      main(data);
-  }); 
+      main();
+
+  }); //end of tsv read in
 
 } //end of generateBarChart
 
-generateLineChart("../static/data/commits_by_author.tsv", "#lineChart");
-generateLineChart("../static/data/lines_of_code_by_author.tsv", "#lineChart2");
+generateLineChart("../static/data/commits_by_author_copy.tsv", "#lineChart");
+generateLineChart("../static/data/lines_of_code_by_author_copy.tsv", "#lineChart2");
 
 function generateLineChart(pathToTSV, divID){
 
@@ -337,12 +335,7 @@ function generateLineChart(pathToTSV, divID){
     var xScale = d3.scaleTime().range([0, width]),
         yScale = d3.scaleLinear().range([height, 0]),
         // 10 nice colors
-        z = d3.scaleOrdinal(d3.schemeCategory10);
-
-    var line = d3.line()
-      .curve(d3.curveBasis)
-      .x(function(d) { return xScale(d.date); })
-      .y(function(d) { return yScale(d.commits);});
+        colors = d3.scaleOrdinal(d3.schemeCategory10);
 
     xScale.domain(d3.extent(data, function(d) { return d.date; }));
 
@@ -351,7 +344,14 @@ function generateLineChart(pathToTSV, divID){
       d3.max(authors, function(c) { return d3.max(c.values, function(d) { return d.commits; }); })
     ]);
 
-    z.domain(authors.map(function(c) { return c.id; }));
+    var line = d3.line()
+    // different types of interpolations here
+    // https://bl.ocks.org/d3noob/ced1b9b18bd8192d2c898884033b5529
+      .curve(d3.curveBasis)
+      .x(function(d) { return xScale(d.date); })
+      .y(function(d) { return yScale(d.commits);});
+
+    colors.domain(authors.map(function(c) { return c.id; }));
 
     function main(){
       drawAxisLineChart();
@@ -372,6 +372,7 @@ function generateLineChart(pathToTSV, divID){
     }
 
     function drawAxisLineChart(){
+
       g.append("g")
         .attr("class", "axis axis--x")
         .attr("transform", "translate(0," + height + ")")
@@ -380,11 +381,11 @@ function generateLineChart(pathToTSV, divID){
       g.append("g")
           .attr("class", "axis axis--y")
           .call(d3.axisLeft(yScale))
-        .append("text")
-          .attr("transform", "rotate(-90)")
-          .attr("y", 6)
-          .attr("dy", "0.71em")
-          .attr("fill", "#000")
+        // .append("text")
+        //   .attr("transform", "rotate(-90)")
+        //   .attr("y", 6)
+        //   .attr("dy", "0.71em")
+        //   .attr("fill", "#000")
 
       // add the X gridlines
       g.append("g")     
@@ -414,7 +415,7 @@ function generateLineChart(pathToTSV, divID){
       author.append("path")
           .attr("class", "line")
           .attr("d", function(d) { return line(d.values); })
-          .style("stroke", function(d) { return z(d.id); });
+          .style("stroke", function(d) { return colors(d.id); });
 
       // Enable to show author at the end of the line
       // author.append("text")
@@ -441,7 +442,7 @@ function generateLineChart(pathToTSV, divID){
             .attr('width', 10)
             .attr('height', 10)
             .style('fill', function(d) {
-              return z(d.id);
+              return colors(d.id);
             });
         legend.append('text')
             .attr('x', chartWidth - 8)

Tools_Portal_TESTING

@@ -0,0 +1 @@
+Subproject commit ed2cb53a85e992cebd942b39c1f7b6fc5a2eebf4

gitstats

@@ -872,6 +872,32 @@ class HTMLReportCreator(ReportCreator):
         f.write('<img src="day_of_week.png" alt="Day of Week">')
         fp.close()
 
+        # New function for TSV write ins, put this in a more organized place later
+
+        def writeHeaderstoNewTSV(fileName,headers):
+            """
+            Writes the headers to the first line of the .tsv file
+
+            Args:
+                fileName (String): Name of the destination file, ex: "data.tsv"
+                headers (List(String)): Headers to be written, ex: ["header1","header2"....]
+
+            """
+            assert fileName[-4:] ==".tsv", "fileName must be '.tsv' file not '%s'" %(fileName)
+
+            f = open (fileName,"w")
+            for headerIndex in range(len(headers)):
+                if headerIndex!=len(headers)-1:
+                    # write header along with\t 
+                    f.write(headers[headerIndex]+"\t")
+                else:
+                    # write last word along with\n
+                    f.write(headers[len(headers)-1]+"\n")
+            f.close()
+
+        writeHeaderstoNewTSV("FlaskTest/static/data/commits_by_author_TEST.tsv", ['day','hour','value'])
+        commits_by_author_tsv=open("FlaskTest/static/data/commits_by_author_TEST.tsv", "w")
+
         # Hour of Week
         f.write(html_header(2, 'Hour of Week'))
         f.write('<table>')
@@ -880,7 +906,6 @@ class HTMLReportCreator(ReportCreator):
         for hour in range(0, 24):
             f.write('<th>%d</th>' % (hour))
         f.write('</tr>')
-
         for weekday in range(0, 7):
             f.write('<tr><th>%s</th>' % (WEEKDAYS[weekday]))
             for hour in range(0, 24):
@@ -890,11 +915,13 @@ class HTMLReportCreator(ReportCreator):
                     commits = 0
                 if commits != 0:
                     f.write('<td')
-                    r = 127 + int((float(commits) / data.activity_by_hour_of_week_busiest) * 128)
-                    f.write(' style="background-color: rgb(%d, 0, 0)"' % r)
+                    value = 127 + int((float(commits) / data.activity_by_hour_of_week_busiest) * 128)
+                    f.write(' style="background-color: rgb(%d, 0, 0)"' % value)
                     f.write('>%d</td>' % commits)
+                    commits_by_author_tsv.write("%d\t%d\%d\n" %(weekday,hour,value))
                 else:
                     f.write('<td></td>')
+                    commits_by_author_tsv.write("%d\t%d\%d\n" %(weekday,hour,0))
             f.write('</tr>')
 
         f.write('</table>')

toWriteTest.py

@@ -0,0 +1,35 @@
+def writeHeaderstoNewTSV(fileName,headers):
+	"""
+	Writes the headers to the first line of the .tsv file
+
+	Args:
+		fileName (String): Name of the destination file, ex: "data.tsv"
+		headers (List(String)): Headers to be written, ex: ["header1","header2"....]
+
+	"""
+	assert fileName[-4:] ==".tsv", "fileName must be '.tsv' file not '%s'" %(fileName)
+
+	f = open (fileName,"w")
+	for headerIndex in range(len(headers)):
+		if headerIndex!=len(headers)-1:
+			# write header along with\t 
+			f.write(headers[headerIndex]+"\t")
+		else:
+			# write last word along with\n
+			f.write(headers[len(headers)-1]+"\n")
+	f.close()
+
+writeHeaderstoNewTSV("FlaskTest/static/data/commits_by_author.tsv",["date","author1","author2","author3","author4","author5","author6","author7"])
+a= open("FlaskTest/static/data/commits_by_author.tsv","r")
+print (a.readlines())
+
+
+
+
+# conversion from space to tsv for fallback if all else fails
+# sed 's/ /\t/g' file.dat > file.tsv
+
+
+
+
+# ./gitstats ~/Desktop/tony_gitstats/gitstats/Tools_Portal_TESTING/ ~/Desktop/tony_gitstats/gitstats/output_test