backlog 0.21.3 → 0.22.0

data/History.txt

@@ -1,3 +1,16 @@
+== 0.22.0 2008-02-14
+
+=== Features
+
+* Added report for displaying all work records relating to tasks in a backlog for a given time period.
+* Aded ability to look at other users weekly work sheets.
+  Used in the Work Lock Notification mail.
+
+=== Fixes
+
+* Fixed filtering of other users work records in weekly work sheet.
+* Changed to display full name instead of login in weekly work sheet.
+
 == 0.21.3 2008-02-13
 
 === Features

data/Rakefile

@@ -34,7 +34,7 @@ Hoe.new("backlog", APP::VERSION) do |p|
   p.url = 'http://rubyforge.org/projects/backlog/'
   p.extra_deps = [['rails', '>= 1.2.4'], ['gruff', '>= 0.2.9'], ['rmagick', '= 1.15.12'],
   ['postgres', '>= 0.7.9'], ['slave', '>= 1.2.1']]
-  p.rsync_args = "-acuv --delete --exclude=wiki*"
+  p.rsync_args = "-acv --delete --exclude=wiki*"
 end
 
 desc 'Release the application to RubyForge'

data/app/controllers/backlogs_controller.rb

@@ -174,6 +174,13 @@ class BacklogsController < ApplicationController
     render :text => 'alert("Updated sort order");'
   end
   
+  def works
+    backlog = Backlog.find(params[:id])
+    @report_filter = ReportFilter.new(params[:report_filter])
+    @works = Work.paginate :conditions => ["completed_at BETWEEN ? AND ? AND task_id IN (SELECT id FROM tasks t where t.backlog_id = ?)", @report_filter.start_on, @report_filter.end_on, backlog.id], :page => params[:page]
+    render :template => '/works/list'
+  end
+  
   private
   
   def load_tasks(backlog)

data/app/controllers/work_locks_controller.rb

@@ -61,8 +61,8 @@ class WorkLocksController < ApplicationController
     user_subscribers = current_user.work_lock_subscribers
     notify_users = (work_account_subscribers + user_subscribers).uniq
     notify_users.each do |user|
-      week_url = url_for :controller => 'works', :action => :weekly_work_sheet_by_work_account, :year => @year, :week => @week
-      spreadsheet_url = url_for :controller => 'works', :action => :timeliste, :year => @year, :week => @week
+      week_url = url_for :controller => 'works', :action => :weekly_work_sheet_by_work_account, :year => @year, :week => @week, :user_id => current_user.id
+      spreadsheet_url = url_for :controller => 'works', :action => :timeliste, :year => @year, :week => @week, :user_id => current_user.id
       WorkLockNotify.deliver_lock(user, current_user, @week, week_url, spreadsheet_url)
     end
     back_or_redirect_to :controller => 'works', :action => :weekly_work_sheet, :year => @year, :week => @week

data/app/controllers/works_controller.rb

@@ -156,7 +156,8 @@ class WorksController < ApplicationController
   def weekly_work_sheet_by_work_account
     @year = (params[:year] && params[:year].to_i) || Date.today.year
     @week = (params[:week] && params[:week].to_i) || Date.today.cweek
-    @work_accounts = Work.works_for_week_by_work_account(@year, @week)
+    @user = params[:user_id] ? User.find(params[:user_id]) : current_user
+    @work_accounts = Work.works_for_week_by_work_account(@year, @week, @user)
     @first_date = Date.commercial(@year, @week, 1)
     @last_date = @first_date + 6
     @lock = WorkLock.find(:first, :conditions => ['user_id = ? AND start_on <= ? AND end_on >= ?', current_user.id, @first_date, @last_date])

data/app/models/backlog.rb

@@ -8,6 +8,7 @@ class Backlog < ActiveRecord::Base
   validates_inclusion_of :enable_users, :in => [true, false], :allow_nil => true, :message => ActiveRecord::Errors.default_error_messages[:blank]
 
   belongs_to :work_account
+  belongs_to :customer
   has_many :tasks, :order => 'period_id, position', :dependent => :destroy
   has_many :unplanned_tasks, :class_name => 'Task', :conditions => 'period_id IS NULL', :order => 'position'
 

data/app/models/report_filter.rb

@@ -0,0 +1,15 @@
+class ReportFilter
+  attr_reader :start_on
+  attr_reader :end_on
+  
+  def initialize(attributes)
+    if attributes
+      attributes = attributes.clone
+      @start_on = Date.parse attributes.delete(:start_on) || Date.local(2007, 01, 01)
+      end_on_param = attributes.delete(:end_on)
+      @end_on = end_on_param && end_on_param.size > 0 ? Date.parse(end_on_param) : Date.today
+      raise "Unknown parameters: #{attributes.inspect}" unless attributes.empty?
+    end
+  end
+  
+end

data/app/models/work.rb

@@ -5,6 +5,7 @@ class Work < ActiveRecord::Base
   belongs_to :task
   belongs_to :user
   belongs_to :work_account
+  belongs_to :customer
   
   validates_associated :task
   validates_presence_of :work_account
@@ -53,7 +54,7 @@ class Work < ActiveRecord::Base
   def self.works_for_week_by_work_account(year, week_no, user = current_user)
     first_date = Date.commercial(year, week_no, 1)
     last_date = first_date + 6
-    works = find(:all, :conditions => "completed_at IS NOT NULL AND completed_at BETWEEN '#{first_date.to_time.iso8601}' AND '#{(last_date+1).to_time.iso8601}'", :order => 'completed_at, started_at')
+    works = find(:all, :conditions => "user_id #{user ? " = #{user.id}" : "IS NULL"} AND completed_at IS NOT NULL AND completed_at BETWEEN '#{first_date.to_time.iso8601}' AND '#{(last_date+1).to_time.iso8601}'", :order => 'completed_at, started_at')
     result = {}
     works.each do |work|
       day_of_week = work.completed_at.to_date.cwday - 1
@@ -79,7 +80,7 @@ class Work < ActiveRecord::Base
     works.map{|w| w.work_account}.uniq.each do |work_account|
       totals_per_work_account[work_account.id] = [[], []]
        (0..6).each do |day|
-        works_for_day = works.select {|work| (work.work_account == work_account) && (work.completed_at.to_date == (first + day)) && (work.user_id.nil? || (user && work.user_id == user.id)) }
+        works_for_day = works.select {|work| (work.work_account == work_account) && (work.completed_at.to_date == (first + day)) && ((user.nil? && 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/backlogs/_buttons.rhtml

@@ -1,3 +1,4 @@
     	<%=image_link_to 'arrow_up.png', l(:backlogs), :action => :list %>
         <%=image_detour_to('clipboard.png', l(:edit), :controller => 'backlogs', :action => :edit, :id => @backlog) unless controller.action_name == 'edit' %>
+        <%=image_detour_to('hammer.png', l(:work), :controller => 'backlogs', :action => :works, :id => @backlog) %>
         <%=detour_to(image_tag(url_for("add.png"), :alt => l(:add_task), :title => l(:add_task), :class => 'image-submit'), :controller => 'tasks', :action => 'new', :task => {:backlog_id => @backlog.id} ) %>

data/app/views/works/list.rhtml

@@ -3,6 +3,51 @@
   <% if @period %>
   <%=render :partial => '/periods/title' %>
   <% end %>
+
+<% if @report_filter %>
+	<% form_for :report_filter do |f| %>
+	<p><label for="report_filter_start_on"><%=l :start_on%></label>
+<%=f.text_field 'start_on', :size => 16, :value => @report_filter.start_on ? @report_filter.start_on.strftime('%Y-%m-%d') : nil %>
+    <button id="trigger1">...</button>
+    <script type="text/javascript">//<![CDATA[
+      Zapatec.Calendar.setup({
+        firstDay          : 1,
+        showOthers        : true,
+        showsTime         : true,
+        step              : 1,
+        electric          : false,
+        inputField        : "report_filter_start_on",
+        button            : "trigger1",
+        ifFormat          : "%Y-%m-%d",
+        daFormat          : "%Y/%m/%d",
+        timeInterval          : 15
+      });
+    //]]></script>
+
+<label for="report_filter_end_on"><%=l :completed_at%></label>
+<%=f.text_field 'end_on', :size => 16, :value => (@report_filter.end_on && @report_filter.end_on.strftime('%Y-%m-%d'))  %>
+    <button id="trigger2">...</button>
+    <script type="text/javascript">//<![CDATA[
+      Zapatec.Calendar.setup({
+        firstDay          : 1,
+        showOthers        : true,
+        showsTime         : true,
+        step              : 1,
+        electric          : false,
+        inputField        : "report_filter_end_on",
+        button            : "trigger2",
+        ifFormat          : "%Y-%m-%d",
+        daFormat          : "%Y/%m/%d",
+        timeInterval          : 15
+      });
+    //]]></script>
+	<%=submit_tag l(:search) %>
+</p>
+
+	<% end %>
+<% end %>
+
+
 <table>
   <tr>
     <th><%=l :task %></th>

data/app/views/works/weekly_work_sheet_by_work_account.rhtml

@@ -1,4 +1,4 @@
-<% @page_title = l(:weekly_work_sheet) + " " + @week.to_s + (user? ? " for #{user.login}" : '')%>
+<% @page_title = l(:weekly_work_sheet) + " " + @week.to_s + (@user ? " for #{@user.name}" : '')%>
 
 <div id="spotlight">
 <% columns = 2 %>

data/test/fixtures/work_accounts.yml

@@ -1,7 +1,7 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-one:
+light_control:
   id: 1
   name: LightControl
-two:
+m2m_server:
   id: 2
   name: M2M Server

data/test/fixtures/works.yml

@@ -4,7 +4,7 @@ first:
   task_id: 1
   started_at: 2007-06-12T13:35:00
   completed_at: 2007-06-12T14:35:00
-  hours: 40.0
+  hours: 30.0
   work_account_id: 1
 started:
   id: 2

data/test/functional/tasks_controller_test.rb

@@ -175,7 +175,7 @@ class TasksControllerTest < Test::Unit::TestCase
   
   def test_end_work
     before = Task.find(1)
-    assert_equal 80, before.total_done
+    assert_equal 70, before.total_done
     
     post :end_work, :id => 1, :work => {:work_started_at_time => (Time.now - 3600).strftime('%H:%M')}
     assert_response :redirect
@@ -187,7 +187,7 @@ class TasksControllerTest < Test::Unit::TestCase
                           'estimate[todo]' => 1
     
     after = Task.find(1)
-    assert_equal 80, after.total_done
+    assert_equal 70, after.total_done
   end
   
   def test_move_to__subtask_to_top
@@ -215,4 +215,14 @@ class TasksControllerTest < Test::Unit::TestCase
     assert after.work_started?
   end
   
+  def test_start_work_xhr
+#    raise "This test fails alone, but not with other tests..."
+    task_id = tasks(:first).id
+
+    xhr :post, :start_work, :id => task_id
+    
+    after = Task.find(task_id)
+    assert after.work_started?
+  end
+  
 end

data/test/functional/work_accounts_controller_test.rb

@@ -13,7 +13,7 @@ class WorkAccountsControllerTest < Test::Unit::TestCase
     @response   = ActionController::TestResponse.new
     @request.session[:user_id] = 1000001
 
-    @first_id = work_accounts(:one).id
+    @first_id = work_accounts(:light_control).id
   end
 
   def test_index

data/test/unit/work_test.rb

@@ -5,10 +5,15 @@ class WorkTest < Test::Unit::TestCase
   include UserSystem
   
   main_scenario
+
+  def teardown
+    Thread.current[:user] = nil
+  end
   
   def test_work_totals_for_week
+    Thread.current[:user] = users(:tesla)
     # Week 24 is from 
-    work_totals = Work.work_totals_for_week(2007, 24, 1000001)
+    work_totals = Work.work_totals_for_week(2007, 24, users(:tesla))
     assert_equal 1, work_totals.size
     assert_equal Array, work_totals[1].class
     assert_equal 2, work_totals[1].size
@@ -16,6 +21,23 @@ class WorkTest < Test::Unit::TestCase
     assert_equal Array, work_totals[1][1].class
     assert_equal  0, work_totals[1][1][0]
     assert_equal 40, work_totals[1][1][1]
+    assert_equal  8, work_totals[1][1][2]
+    assert_equal  0, work_totals[1][1][3]
+    assert_equal  0, work_totals[1][1][4]
+    assert_equal  0, work_totals[1][1][5]
+    assert_equal  0, work_totals[1][1][6]
+  end
+  
+  def test_work_totals_for_week_anonymously
+    # Week 24 is from 
+    work_totals = Work.work_totals_for_week(2007, 24, nil)
+    assert_equal 1, work_totals.size
+    assert_equal Array, work_totals[1].class
+    assert_equal 2, work_totals[1].size
+    assert_equal Array, work_totals[1][0].class
+    assert_equal Array, work_totals[1][1].class
+    assert_equal  0, work_totals[1][1][0]
+    assert_equal 30, work_totals[1][1][1]
     assert_equal  0, work_totals[1][1][2]
     assert_equal  0, work_totals[1][1][3]
     assert_equal  0, work_totals[1][1][4]
@@ -27,14 +49,24 @@ class WorkTest < Test::Unit::TestCase
     Thread.current[:user] = users(:tesla)
     assert_equal 1, Work.find_work_for_day(Date.parse('2007-06-12')).size
   end
-  
+
+  def test_works_for_week_by_work_account
+    Thread.current[:user] = users(:tesla)
+    work_totals = Work.works_for_week_by_work_account(2007, 24, users(:tesla))
+    assert_equal({work_accounts(:light_control) => [nil, BigDecimal('40'), BigDecimal('8'), nil, nil, nil, nil]}, work_totals)
+  end
+
+  def test_works_for_week_by_work_account_anonymous
+    work_totals = Work.works_for_week_by_work_account(2007, 24, nil)
+    assert_equal({work_accounts(:light_control) => [nil, BigDecimal('30'), nil, nil, nil, nil, nil]}, work_totals)
+  end
+
   private
 
   # TODO (uwe): This method should be removed
   # It is here only because ClassTableInheritanceInRails broke reading fixtures by name
   def users(login)
     super(login)
-  end  
-  
+  end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.21.3
+  version: 0.22.0
 platform: ruby
 authors: 
 - Uwe Kubosch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-13 00:00:00 +01:00
+date: 2008-02-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -246,6 +246,7 @@ files:
 - app/models/user.rb
 - app/models/configuration.rb
 - app/models/chart.rb
+- app/models/report_filter.rb
 - app/models/group.rb
 - app/models/work_lock_subscription.rb
 - app/models/backlog.rb