backlog 0.10.5 → 0.10.6

data/History.txt

@@ -1,3 +1,11 @@
+== 0.10.6 2007-09-25
+
+=== Fixes
+
+* Fixed calculation of work in time sheet.
+* Corrected link to Time sheet for older weeks.
+* Fixed extraction of changes when releasing.
+
 == 0.10.5 2007-09-25
 
 === Fixes

data/Rakefile

@@ -19,7 +19,7 @@ Hoe.new("backlog", APP::VERSION) do |p|
   p.author = 'Uwe Kubosch'
   p.email = 'uwe@kubosch.no'
   p.remote_rdoc_dir = '' # Release to root
-  p.changes = p.paragraphs_of('History.txt', 0..4).join("\n\n")
+  p.changes = File.read('History.txt').scan(/^== .*?(?=^== )/m).first
   p.rdoc_pattern = /^(app\/(controllers|helpers|models)|lib|bin)|txt$/
   p.clean_globs = ['doc', 'log/*']
   p.spec_extras = {

data/app/models/work.rb

@@ -44,7 +44,7 @@ class Work < ActiveRecord::Base
   #   backlog1.id => [[m, t, w, t, f, s, s], [m, t, w, t, f, s, s]],
   #   backlog2.id => [<work for monday>, 0, <work for wednesday>, <work for thursday>, <work for friday>, 0, <work for sunday>]
   # }
-  def self.work_totals_for_week(week_no, user_id = current_user)
+  def self.work_totals_for_week(week_no, user = current_user)
     first = Date.commercial(Date.today.year, week_no, 1)
     last = first + 7
     works = find(:all, :conditions => "completed_at IS NOT NULL AND started_at BETWEEN '#{first.to_time.iso8601}' AND '#{last.to_time.iso8601}'", :order => 'started_at')
@@ -52,7 +52,7 @@ class Work < ActiveRecord::Base
     Backlog.find(:all).each do |backlog|
       totals_per_backlog[backlog.id] = [[], []]
       (0..6).each do |day|
-        works_for_day = works.select {|work| (work.task.backlog == backlog) && (work.started_at.to_date == (first + day)) && (user_id && work.user_id == user_id) }
+        works_for_day = works.select {|work| (work.task.backlog == backlog) && (work.started_at.to_date == (first + day)) && (work.user_id.nil? || (user && work.user_id == user.id)) }
         invoice_works_for_day = works_for_day.select {|work| work.invoice? }
         internal_works_for_day = works_for_day.select {|work| !work.invoice? }
 

data/app/views/works/weekly_work_sheet.rhtml

@@ -12,7 +12,7 @@
 
 <div align="right">
 [<%=detour_to l(:new_work), :controller => 'works', :action => :new %>]
-[<%=link_to 'Timeliste', :action => :timeliste %>]
+[<%=link_to 'Timeliste', :action => :timeliste, :id => @week %>]
 [<%= if params[:with_empty]
   link_to 'Hide empty work records'
 else

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.10.5
+  version: 0.10.6
 date: 2007-09-25 00:00:00 +02:00
 summary: Application to aid collecting, processing, organizing, reviewing and doing tasks.
 require_paths: