hours[-1] = (typeof(hours[-1]) == 'undefined') ? {} : hours[-1];
hours[-1][project] = (typeof(hours[-1][project]) == 'undefined') ?
- { total : 0, items : [] }
- : hours[hour][project];
+ { total : 0, items : {} }
+ : hours[-1][project];
hours[-1][project].total += line.span;
- hours[-1][project].items.push(line);
+ hours[-1][project].items[line.desc] = (typeof(hours[-1][project].items[line.desc]) == 'undefined' ?
+ 0 : hours[-1][project].items[line.desc]) + line.span;
shours[hour] = (typeof(shours[hour]) == 'undefined') ? {} : shours[hour];
shours[hour][line.desc] = (typeof(shours[hour][line.desc] ) == 'undefined') ? 0 : shours[hour][line.desc] ;
}
- this.total = total;
- this.shours = shours;
+ this.shours = shours;
return hours;
},
for(var proj in this.regexes) {
for(var r in this.regexes[proj]) {
- if (ret.line.match(r)) {
+ if (ret.line.match(this.regexes[proj][r])) {
+ //print("Match " + proj + " on " + r + ret.line + )
ret.project = proj;
break;
}
//print(h + ' ' + Math.floor(res[h][p].total/60000) +'m ' + p );
totals.work += Math.floor(res[h][p].total/60000) ;
- for (var k in res[h][p].items) {
-
- //print( ' ' + Math.floor(res[h][p].items[k].span/60000) +'m ' + res[h][p].items[k].line );
-
- }
+ var unknown = [];
+ if (h == -1) {
+
+ print( "\n" + p + ':' + Math.floor(res[h][p].total/60000) + 'm');
+
+ if (p != 'Unknown') {
+ for (var k in res[h][p].items) {
+
+ print( ' ' + Math.floor(res[h][p].items[k]/60000) +'m ' + k );
+
+ }
+ } else {
+
+ for (var k in res[h][p].items) {
+ unknown.push({ desc : k , tot : (res[h][p].items[k]/60000).toFixed(2)*1 }) ;
+
+
+ }
+ }
+ }
}
}
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");
-hsum.forEach(function(r) {
+
+unknown.sort(function(a,b) { if (a.tot == b.tot) { return 0; } return a.tot < b.tot ? 1 : -1 });
+print("\n\nUnclassified");
+unknown.forEach(function(r) {
print (" " + (r.tot.toFixed(2)*1) + " : " + r.desc);
});