backlog 0.10.3 → 0.10.4

data/History.txt

@@ -1,3 +1,15 @@
+== 0.10.4 2007-09-25
+
+=== Features
+
+* Now you can move tasks in and out of supertasks. 
+
+=== Fixes
+
+* Changed name of released WAR file back to include the version number since RubyForge only allows unique file names.
+* Fixed bug where the "show period" action would fail if you tried to display the period of an unplanned task.
+* Fixed bugs in the calculation of weekly work sheet and time sheet.
+
 == 0.10.3 2007-09-24
 
 * Removed "Active Sprint" from Group edit view, when there is no active sprint.

data/Rakefile

@@ -44,7 +44,7 @@ end
 
 task :release_war do
   Rake::Task['war:standalone:create'].invoke
-  war_pkg_file = "pkg/backlog.war"
+  war_pkg_file = "pkg/backlog-#{APP::VERSION}.war"
   if File.exists? 'backlog.war'
     File.makedirs 'pkg'
     File.move 'backlog.war', war_pkg_file

data/app/controllers/periods_controller.rb

@@ -22,6 +22,10 @@ class PeriodsController < ApplicationController
     end
     if @selected_task
       @period = @selected_task.period
+      if @period.nil?
+        redirect_to :controller => 'backlogs', :action => :show, :id => @selected_task.backlog.id
+        return
+      end
     elsif params[:id] && @period = Period.find_by_id(params[:id])
     elsif @period = Period.find(:first)
     else
@@ -29,7 +33,7 @@ class PeriodsController < ApplicationController
       return
     end
     if @selected_task.nil?
-      @selected_task = Task.find(:first, :conditions => "position = 1 AND period_id = #{@period.id}")
+      @selected_task = @period.open_tasks.first
     end
     @tasks = @period.open_tasks
     @completed_tasks = @period.completed_tasks.reverse
@@ -103,7 +107,7 @@ class PeriodsController < ApplicationController
     @works = Work.find_by_sql("SELECT w.* FROM works w LEFT OUTER JOIN tasks t ON t.id = w.task_id WHERE t.period_id = #{@period.id} ORDER BY w.completed_at")
     render :template => '/works/list'
   end
-
+  
   def make_link
     if params[:id].to_i > 0
       render :partial => 'link', :layout => false, :locals => {:period => Period.find(params[:id])}

data/app/controllers/tasks_controller.rb

@@ -24,7 +24,7 @@ class TasksController < ApplicationController
       detour_to :controller => 'periods', :action => :new, :group_id => params[:task][:period_id][1..-1].to_i
       return
     end
-
+    
     file = params[:task].delete(:file)
     
     @task = Task.new(params[:task])
@@ -84,7 +84,7 @@ class TasksController < ApplicationController
         end
       end
     end
-
+    
     file = params[:task].delete(:file)
     
     if params[:task] && @task.update_attributes(params[:task])
@@ -156,14 +156,33 @@ class TasksController < ApplicationController
     redirect_to :action => :list, :id => task
   end
   
+  # Move the indicated task to the indicated position.
   def move_to
-    task = Task.find(params[:id][5..-1])
-    if params[:period_id] && params[:period_id].to_i != task.period_id
-      task.remove_from_list
-      task.period_id = params[:period_id]
+    params[:id] = $1 if params[:id] =~ /^task_(\d*)$/
+    if params[:id] && task = Task.find(params[:id])
+      if params[:target_id]
+        if target_task = Task.find_by_id(params[:target_id])
+          if task.parent_id != target_task.parent_id
+            task.remove_from_list
+            task.position = nil
+            task.parent_id = target_task.parent_id
+            task.backlog_id = target_task.backlog_id
+            task.period_id = target_task.period_id
+          end
+          task.insert_at target_task.position
+        end
+      elsif params[:period_id] && params[:period_id].to_i != task.period_id
+        task.remove_from_list
+        task.period_id = params[:period_id]
+        task.insert_at 1
+        task.save!
+      else
+        flash[:notice] = "Target position is missing for move."
+      end
+    else
+      flash[:notice] = "Task not found"
     end
-    task.insert_at params[:position]
-    back_or_redirect_to :controller => 'periods', :action => :show_no_layout, :id => task.period, :task => task.id
+    back_or_redirect_to :controller => 'periods', :action => :show_no_layout, :id => task.period_id, :task => task.id
   end
   
   def move_to_period(with_layout = false)

data/app/controllers/works_controller.rb

@@ -97,13 +97,13 @@ class WorksController < ApplicationController
   
   def weekly_work_sheet
     @week = (params[:id] && params[:id].to_i) || Date.today.cweek
-    @rows = Work.works_for_week(@week, user)
+    @rows = Work.works_for_week(@week)
     render :layout => 'wide'
   end
   
   def timeliste
     @week = (params[:id] && params[:id].to_i) || Date.today.cweek
-    @backlogs = Work.work_totals_for_week(@week, user_id)
+    @backlogs = Work.work_totals_for_week(@week)
     headers["Content-Type"] = "application/vnd.ms-excel"
     headers["Content-Disposition"] = 'attachment; filename="export.xml"'
     render :layout => false

data/app/models/work.rb

@@ -1,4 +1,7 @@
 class Work < ActiveRecord::Base
+  extend UserSystem
+  include UserSystem
+
   belongs_to :task
   belongs_to :user
   
@@ -22,13 +25,13 @@ class Work < ActiveRecord::Base
   #   [m2, t2, nil,t2, nil,nil, nil],
   #   [nil,t2, nil,nil,nil,nil, nil],
   # ]
-  def self.works_for_week(week_no, user)
+  def self.works_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 BETWEEN '#{first.to_time.iso8601}' AND '#{last.to_time.iso8601}'", :order => 'completed_at')
     length = 0
     works_per_day = (0..6).map do |day|
-      works_for_day = works.select {|work| work.completed_at.to_date == (first + day) && (!work.task.enable_users? || (user && work.user_id == user.id)) }
+      works_for_day = works.select {|work| work.completed_at.to_date == (first + day) && (work.user_id.nil? || (user && work.user_id == user.id)) }
       length = [length, works_for_day.length].max
       works_for_day
     end
@@ -41,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 = nil)
+  def self.work_totals_for_week(week_no, user_id = current_user)
     first = Date.commercial(Date.today.year, week_no, 1)
     last = first + 7
     works = find(:all, :conditions => "completed_at BETWEEN '#{first.to_time.iso8601}' AND '#{last.to_time.iso8601}'", :order => 'completed_at')
@@ -49,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.completed_at.to_date == (first + day) && (!work.task.backlog.enable_users || (user_id && work.user_id == user_id)) }
+        works_for_day = works.select {|work| (work.task.backlog == backlog) && (work.completed_at.to_date == (first + day)) && (user_id && 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/tasks/_task.rhtml

@@ -94,7 +94,7 @@
 <% if active && (@task.period.nil? || @task.period.active_or_future?) %>
 <%=draggable_element "task_#{@task.id}" %>
 <%=drop_receiving_element "task_#{@task.id}",
-      :update => update, :url => with_detour({:controller => 'tasks', :action => "move_to", :period_id => @task.period_id, :position => @task.position, :layout => false}),
+      :update => update, :url => with_detour({:controller => 'tasks', :action => "move_to", :target_id => @task.id, :layout => false}),
       :accept => "tasks",
       :loading => "",
       :complete => "",

data/app/views/works/weekly_work_sheet.rhtml

@@ -56,7 +56,7 @@ end %>]
       <% week_total += @work.hours %>
     <td>
       <%=link_to(h(@work.task.period.name), :controller => 'periods', :action => :show, :id => @work.task.period) if @work.task.period %>
-      <%=link_to(h(@work.task.backlog.name), :controller => 'backlogs', :action => :show, :id => @work.task.backlog) %>
+      <%=link_to(h(@work.task.root_task.backlog.name), :controller => 'backlogs', :action => :show, :id => @work.task.root_task.backlog) %>
       <%=link_to(h(@work.task.description), :controller => 'periods', :action => :show, :id => @work.task.period, :task_id => @work.task.id) %>
     </td>
       <% if invoicing %>

data/test/fixtures/works.yml

@@ -4,7 +4,15 @@ first:
   task_id: 1
   started_at: 2007-06-12T13:35:00
   completed_at: 2007-06-12T14:35:00
+  hours: 40.0
 started:
   id: 2
   task_id: 4
   started_at: 2007-06-12T13:35:00
+personal:
+  id: 3
+  task_id: 1
+  started_at: 2007-06-12T13:35:00
+  completed_at: 2007-06-12T14:35:00
+  user_id: 1000001
+  hours: 40.0

data/test/functional/tasks_controller_test.rb

@@ -172,6 +172,7 @@ class TasksControllerTest < Test::Unit::TestCase
   
   def test_end_work
     before = Task.find(1)
+    assert_equal 80, before.total_done
     
     post :end_work, :id => 1, :work => {:work_started_at_time => (Time.now - 3600).strftime('%H:%M')}
     assert_response :redirect
@@ -183,7 +184,23 @@ class TasksControllerTest < Test::Unit::TestCase
                           'estimate[todo]' => 1
     
     after = Task.find(1)
-    assert((after.total_done == BigDecimal('1')) || (after.total_done - 1 < 0.2))
+    assert_equal 80, after.total_done
+  end
+  
+  def test_move_to__subtask_to_top
+    subtask = tasks(:subtask)
+    subtask_before = Task.find(subtask.id)
+    supertask = tasks(:supertask)
+    supertask_before = Task.find(supertask.id)
+    
+    post :move_to, :id => subtask.id.to_s, :target_id => supertask.id.to_s
+    
+    assert_response :redirect
+    assert_redirected_to :controller => 'periods', :action => :show_no_layout, :id => subtask_before.root_task.period_id
+    
+    subtask_after = Task.find(subtask.id)
+    assert_equal subtask.root_task.period_id, subtask_after.period_id
+    assert_equal 3, subtask_after.position
   end
   
   def test_move_to_next_period

data/test/integration/user_system_test.rb

@@ -4,7 +4,7 @@ require 'user_notify'
 
 class UserSystemTest < ActionController::IntegrationTest
   self.use_transactional_fixtures = false
-  fixtures :users, :groups_users
+  fixtures :users, :groups_users, :works
 
   def setup
     ActionMailer::Base.inject_one_error = false

data/test/unit/user_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class UserTest < Test::Unit::TestCase
-  fixtures :users, :groups_users
+  fixtures :users, :groups_users, :works
   self.use_transactional_fixtures = false
   
   def test_authenticate

data/test/unit/work_test.rb

@@ -2,9 +2,20 @@ require File.dirname(__FILE__) + '/../test_helper'
 
 class WorkTest < Test::Unit::TestCase
   fixtures :works
-
-  # Replace this with your real tests.
-  def test_truth
-    assert true
+  
+  def test_work_totals_for_week
+    work_totals = Work.work_totals_for_week(24, 1000001)
+    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 40, 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]
+    assert_equal  0, work_totals[1][1][5]
+    assert_equal  0, work_totals[1][1][6]
   end
 end

metadata

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