GitLogParser.js

[gitlive] / GitLogParser.js

diff --git a/GitLogParser.js b/GitLogParser.js
index 9d601f7..e6302f5 100644 (file)
--- a/GitLogParser.js
+++ b/GitLogParser.js
@@ -20,6 +20,7 @@ GitLogParser = {
         
         
         }
+        
         var flines = File.read(  filename ).split("\n");        
         //print("loaded");
         // first just convert them..
@@ -51,7 +52,7 @@ GitLogParser = {
              
             
         }
-        print("parsed");
+        //print("parsed");
         //print(JSON.stringify(lines,null,4));
         
         // summarize data...
@@ -105,7 +106,7 @@ GitLogParser = {
         
         //ret.start = xDate.Date.parseDate(this.date.format('Y-m-d') + ' ' + time, 'Y-m-d H:i:s');
         ret.start = xDate.Date.parseDate(
-                            (this.date ? this.date.format('Y-m-d')  : (new xDate.Date()).format('Y-m-d')) +
+                            (this.date ? this.date.format('Y-m-d')  :'2013-01-01') +
                             ' ' + time, 'Y-m-d H:i:s');
 
         while (ret.cmd === false) {
@@ -237,7 +238,7 @@ print("\nShort Idle : " +(totals.shortidle/60).toFixed(2) +"h" );
 
 print("Worked: " + (totals.work/60).toFixed(2) +"h\n" );
  
-
+var totals = {};
 
 for (var h in GitLogParser.shours) {
     var hsum = [];
@@ -245,15 +246,25 @@ for (var h in GitLogParser.shours) {
     for (var desc in GitLogParser.shours[h]) {
         htot += (GitLogParser.shours[h][desc]/60000).toFixed(2)*1;
         hsum.push({ desc : desc, tot : (GitLogParser.shours[h][desc]/60000).toFixed(2)*1 })
+        totals[desc] = (typeof(totals[desc]) == 'undefined' ? 0 : totals[desc]) + ((GitLogParser.shours[h][desc]/60000).toFixed(2)*1);
     }
     hsum.sort(function(a,b) { if (a.tot == b.tot) { return 0; } return a.tot < b.tot ? 1 : -1 });
-    print(h+': Total (' + htot +')');
+    print("\n\n" + h+': Total (' + htot +')');
     hsum.forEach(function(r) {
         print ("  " + r.tot + "   : " + r.desc);
     });
 }
-
-
+print("\n\n" + h+': Totals (' + htot +')');
+ 
+var hsum = [];
+for (var desc in totals) {    
+    hsum.push({ desc : desc, tot : totals[desc] });
+}
+hsum.sort(function(a,b) { if (a.tot == b.tot) { return 0; } return a.tot < b.tot ? 1 : -1 });
+print("\n\nDay Total (" + htot +')');
+hsum.forEach(function(r) {
+    print ("  " + r.tot + "   : " + r.desc);
+});
 
 //print(JSON.stringify(GitLogParser.shours,null,4));