lib/timetrap/helpers.rb in samg-timetrap-1.1.0 vs lib/timetrap/helpers.rb in samg-timetrap-1.1.1
- old
+ new
@@ -42,10 +42,10 @@
def format_seconds secs
"%2s:%02d:%02d" % [secs/3600, (secs%3600)/60, secs%60]
end
def format_total entries
- secs = entries.inject(0){|m, e|e_end = e.end || Time.now; m += e_end.to_i - e.start.to_i if e_end && e.start;m}
+ secs = entries.inject(0){|m, e|e_end = e.end_or_now; m += e_end.to_i - e.start.to_i if e_end && e.start;m}
"%2s:%02d:%02d" % [secs/3600, (secs%3600)/60, secs%60]
end
def sheet_name_from_string string
return "all" if string =~ /^\W*all\W*$/