backlog 0.7.1 → 0.7.2

data/History.txt

@@ -1,3 +1,9 @@
+== 0.7.2 2007-08-17
+
+* Fixed bugs in task reordering links
+* Switched default language to English
+* Fixed English mailer views
+
 == 0.7.1 2007-08-14
 
 * Added author and email to the gem to avoid false listing in Hoe Down!

data/app/controllers/backlogs_controller.rb

@@ -57,13 +57,7 @@ class BacklogsController < ApplicationController
   def edit
     @backlog = Backlog.find(params[:id])
     unplanned_tasks = @backlog.tasks.select {|t| t.period.nil? && t.finished_at.nil?}.sort_by {|t| t.position}
-    planned_tasks = @backlog.tasks.select {|t| t.period && t.finished_at.nil?}.sort do |t1, t2|
-      if (cmp_period = t1.period.end_on <=> t2.period.end_on) != 0
-        cmp_period
-      else
-        t1.position <=> t2.position
-      end
-    end
+    planned_tasks = @backlog.tasks.select {|t| t.period && t.finished_at.nil?}.sort_by {|t| [t.period.end_on, t.position]}
     @tasks = planned_tasks + unplanned_tasks
     @completed_tasks = @backlog.tasks.select {|t| t.finished_at}.sort {|t1, t2| t2.finished_at <=> t1.finished_at}
   end

data/app/controllers/tasks_controller.rb

@@ -147,7 +147,8 @@ class TasksController < ApplicationController
   end
   
   def move_to_period(with_layout = false)
-    task = Task.find(params[:id][5..-1])
+    params[:id] = $1 if params[:id] =~ /^task_(\d*)$/
+    task = Task.find(params[:id])
     if request.post?
       period = params[:period_id] && Period.find(params[:period_id])
       if period && period.active_or_future?
@@ -170,7 +171,7 @@ class TasksController < ApplicationController
     task = Task.find(params[:id])
     if task.period
       params[:period_id] = task.period.lower_item && task.period.lower_item.id
-      params[:id] = 'task_' + task.id.to_s
+      params[:id] = task.id
       move_to_period(true)
     else
       redirect_to :action => :edit, :id => task

data/app/models/task.rb

@@ -9,15 +9,19 @@ class Task < ActiveRecord::Base
   
   belongs_to :backlog
   belongs_to :period
-  acts_as_list :scope => :period_id
+  belongs_to :ancestor_task, :class_name => 'Task', :foreign_key => 'previous_task_id' 
+  has_many :descendant_tasks, :class_name => 'Task', :foreign_key => 'previous_task_id', :dependent => :destroy
+  
+  #before_validation_on_create {|task| task.position = -1}
+  acts_as_list :scope => '#{period_id ? "period_id = #{period_id}" : "period_id IS NULL AND backlog_id = #{backlog_id}"} AND finished_at IS NULL'
   has_many :estimates, :order => 'created_at', :dependent => :destroy
   has_many :works, :order => 'completed_at', :dependent => :destroy
   acts_as_tree :order => 'position'
   
   validates_presence_of :backlog_id, :if => Proc.new { |task| task.parent_id.nil? }
   validates_presence_of :parent_id, :if => Proc.new { |task| task.backlog_id.nil? }
-  validates_presence_of :position, :if => Proc.new { |task| task.finished_at.nil? }
-  validates_presence_of :finished_at, :if => Proc.new { |task| task.position.nil? }
+  validates_presence_of :position, :on => :update, :if => Proc.new { |task| task.finished_at.nil? }
+  validates_presence_of :finished_at, :on => :update, :if => Proc.new { |task| task.position.nil? }
   validates_presence_of :resolution, :if => :finished_at
   validates_presence_of :description, :if => :backlog_id
   
@@ -113,10 +117,11 @@ class Task < ActiveRecord::Base
   
   def open
     if finished_at
-      insert_at 1
-      self.position = 1
       self.finished_at = nil
       self.resolution = nil
+      insert_at 1
+      self.position = 1
+      self.save!
       estimate(initial_estimate)
       parent.open if parent
     end
@@ -141,6 +146,7 @@ class Task < ActiveRecord::Base
     self.position = nil
     
     if self.period
+      old_todo = self.todo
       self.finish(new_period.party == self.period.party ? Task::POSTPONED : Task::MOVED, true)
       ancestor_id = self.previous_task_id || self.id
       existing_task =   Task.find_by_period_id_and_id(new_period.id, ancestor_id)
@@ -151,18 +157,18 @@ class Task < ActiveRecord::Base
         existing_task.previous_task_id = self.previous_task_id || self.id
         existing_task.description = self.description
         existing_task.save!
-        existing_task.estimate(self.todo)
-        existing_task.move_to_top
-        existing_task.save!
+        existing_task.estimate(old_todo)
       else
         new_task = Task.new
-        new_task.previous_task_id = self.previous_task_id || self.id
+        new_task.previous_task_id = ancestor_id
         new_task.backlog = root_task.backlog
         new_task.period = new_period
         new_task.description = self.description
+        new_task.initial_estimate = self.initial_estimate
         new_task.insert_at 1
+        new_task.position = 1
         new_task.save!
-        new_task.estimate(self.todo)
+        new_task.estimate(old_todo)
       end
     else
       self.period_id = new_period.id

data/config/environments/localization_environment.rb

@@ -1,8 +1,6 @@
 module Localization
   CONFIG = {
-    # Default language
-    :default_language => 'no',
-
+    :default_language => 'en',
     :web_charset => 'utf-8'
   }
 

data/test/fixtures/tasks.yml

@@ -1,4 +1,3 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 first:
   id: 1
   created_at: 2007-06-11
@@ -13,22 +12,32 @@ another:
   period_id: 2
   description: second task
   position: 1
-started:
+postponed:
   id: 3
+  created_at: 2007-06-12
+  backlog_id: 1
+  period_id: 2
+  description: postponed task
+  finished_at: 2007-08-02 14:15:42
+  resolution: POSTPONED
+started:
+  id: 4
   created_at: 2007-08-02 14:15:42
   backlog_id: 2
   period_id: 2
   description: third task
   position: 2
 in_last_period:
-  id: 4
+  id: 5
   created_at: 2007-08-02 14:15:42
   backlog_id: 1
   period_id: 3
   description: task in last period
+  initial_estimate: 1.0
   position: 1
+  previous_task_id: 3
 not_planned:
-  id: 5
+  id: 6
   created_at: 2007-08-02 14:15:42
   backlog_id: 1
   description: unplanned task

data/test/fixtures/works.yml

@@ -6,5 +6,5 @@ first:
   completed_at: 2007-06-12T14:35:00
 started:
   id: 2
-  task_id: 3
+  task_id: 4
   started_at: 2007-06-12T13:35:00

data/test/functional/tasks_controller_test.rb

@@ -6,115 +6,114 @@ class TasksController; def rescue_action(e) raise e end; end
 
 class TasksControllerTest < Test::Unit::TestCase
   fixtures :parties, :users, :groups, :groups_users, :backlogs, :periods, :tasks, :works, :estimates
-
+  
   def setup
     @controller = TasksController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
     @request.session[:user_id] = 1000001
   end
-
+  
   def test_index
     get :index
     assert_redirected_to :controller => 'backlogs'
   end
-
+  
   def test_list
     get :list
     assert_redirected_to :controller => 'backlogs'
   end
-
+  
   def test_list_started
     get :list_started, :id => '1'
     assert_response :success
     assert_template 'list_started'
-
+    
     assert_not_nil assigns(:tasks)
     assert_not_nil assigns(:selected_task)
   end
-
+  
   def test_list_started_no_selected_task
     get :list_started
     assert_response :success
     assert_template 'list_started'
-
+    
     assert_not_nil assigns(:tasks)
     assert_nil assigns(:selected_task)
   end
-
+  
   def test_new
     get :new
-
+    
     assert_response :success
     assert_template 'new'
-
+    
     assert_not_nil assigns(:task)
   end
-
+  
   def test_create
     num_tasks = Task.count
-
+    
     post :create, :task => {:description => 'an important task', :backlog_id => '2',
-                            :period_id => '2', :position => '4'}
-
+      :period_id => '2'}
+    
     task = assigns(:task)
     assert_equal [], task.errors.full_messages
-
+    
     assert_response :redirect
     assert_redirected_to :controller => 'periods', :action => 'show', :id => Period.find(2)
-
+    
     assert_equal num_tasks + 1, Task.count
   end
-
+  
   def test_create_without_period
     num_tasks = Task.count
-
-    post :create, :task => {:description => 'an important task', :backlog_id => '2',
-                            :position => '1'}
-
+    
+    post :create, :task => {:description => 'an important task', :backlog_id => '2'}
+    
     task = assigns(:task)
     assert_equal [], task.errors.full_messages
-
+    
     assert_response :redirect
     assert_redirected_to :controller => 'backlogs', :action => :edit, :id => 2
-
+    
     assert_equal num_tasks + 1, Task.count
   end
-
+  
   def test_edit
     get :edit, :id => 1
-
+    
     assert_response :success
     assert_template 'edit'
-
+    
     assert_not_nil assigns(:task)
     assert assigns(:task).valid?
   end
-
+  
   def test_update
     post :update, :id => 2, :task => {:description => 'Two'}
     assert_response :redirect
     assert_redirected_to :action => 'show', :id => 2
-
+    
     after = Task.find(2)
     assert_equal 'Two', after.description
   end
-
+  
   def test_destroy
     assert_not_nil Task.find(1)
-
+    
     post :destroy, :id => 1
     assert_response :redirect
     assert_redirected_to :controller => 'periods', :action => 'show', :id => Period.find(1)
-
+    
     assert_raise(ActiveRecord::RecordNotFound) {
       Task.find(1)
     }
   end
-
+  
   def test_end_work
     before = Task.find(1)
-
+    
     post :end_work, :id => 1, :work => {:work_started_at_time => (Time.now - 3600).strftime('%H:%M')}
     assert_response :redirect
     assert_redirected_to :controller => 'works', :action => :new, 
@@ -123,34 +122,56 @@ class TasksControllerTest < Test::Unit::TestCase
                           'work[completed_at]' => Time.next_quarter.iso8601,
                           'work[started_at]' => Time.previous_quarter.iso8601,
                           'estimate[todo]' => 1
-
+    
     after = Task.find(1)
     assert((after.total_done == BigDecimal('1')) || (after.total_done - 1 < 0.2))
   end
   
+  def test_move_to_next_period
+    before = Task.find(tasks(:another).id)
+    
+    post :move_to_next_period, :id => tasks(:another).id
+    
+    assert_response :redirect
+    assert_redirected_to :controller => 'periods',
+    :action => :show, 
+    :id => 2
+    
+    after = Task.find(tasks(:another).id)
+    assert_equal tasks(:another).period_id, after.period_id
+    
+    new_task = Task.find_by_period_id_and_previous_task_id(periods(:future).id, before.id)
+    assert_nil new_task.finished_at
+    assert_nil new_task.resolution
+    tasks = Task.find_all_by_period_id(3)
+    assert_equal 1, new_task.position
+  end
+  
   def test_move_to_next_period_at_end
     before = Task.find(tasks(:in_last_period).id)
     assert_equal tasks(:in_last_period).period_id, before.period_id
-
+    
     post :move_to_next_period, :id => tasks(:in_last_period).id
     
     assert_response :redirect
     assert_redirected_to :controller => 'periods',
-                          :action => :new, 
-                          :period => {:party_id => 1}
-
+    :action => :new, 
+    :period => {:party_id => 1}
+    
     before.reload
     assert_equal tasks(:in_last_period).period_id, before.period_id
-
+    
     after = Task.find(tasks(:in_last_period).id)
     assert_equal before.period_id, after.period_id
   end
   
   def test_move_to_period
     highest = Task.find(:first, :order => 'id DESC')
+    
     post :move_to_period, :id => 'task_2',
-                          :detour => {:action => 'show_no_layout', :id => '2', :controller => 'periods'}, 
-                          :period_id => '3'
+    :detour => {:action => 'show_no_layout', :id => '2', :controller => 'periods'}, 
+    :period_id => '3'
+    
     new_task = Task.find(:first, :order => 'id DESC')
     assert new_task.id != highest.id
     assert_equal 3, new_task.period_id
@@ -158,9 +179,31 @@ class TasksControllerTest < Test::Unit::TestCase
   
   def test_move_to_period_past
     post :move_to_period, :id => 'task_2',
-                          :detour => {:action => 'show_no_layout', :id => '2', :controller => 'periods'}, 
-                          :period_id => '1'
+    :detour => {:action => 'show_no_layout', :id => '2', :controller => 'periods'}, 
+    :period_id => '1'
     assert_equal 2, tasks(:another).period_id
   end
   
+  def test_move_to_period_back_to_earlier_period
+    task_to_move = tasks(:in_last_period)
+    target_task = tasks(:postponed)
+    target_period = periods(:active)
+    
+    post :move_to_period, {"id"=> task_to_move.id,
+                          "detour"=>{"action"=>"edit_no_layout", "id"=>"39", "controller"=>"backlogs"}, 
+                          "period_id"=> target_period.id
+    }
+    
+    old_task = Task.find(task_to_move.id)
+    assert_not_nil old_task.finished_at
+    assert_equal Task::POSTPONED, old_task.resolution
+    assert_nil old_task.position
+
+    new_task = Task.find(target_task.id)
+    new_task.reload
+    assert_nil new_task.finished_at
+    assert_nil new_task.resolution
+    assert_equal 1, new_task.position
+  end
+  
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
-date: 2007-08-15 00:00:00 +02:00
+  version: 0.7.2
+date: 2007-08-17 00:00:00 +02:00
 summary: Application to aid collecting, processing, organizing, reviewing and doing tasks.
 require_paths: 
 - lib
@@ -227,7 +227,6 @@ files:
 - config/environments/datek_production.rb
 - LICENSE_LOCALIZATION
 - README.txt
-- doc
 - Manifest.txt
 - vendor
 - vendor/plugins
@@ -1750,12 +1749,12 @@ files:
 - app/views/works/weekly_work_sheet.rhtml
 - app/views/works/timeliste.rhtml
 - app/views/user_notify
-- app/views/user_notify/forgot_password.rhtml
-- app/views/user_notify/change_password.rhtml
 - app/views/user_notify/forgot_password_no.rhtml
 - app/views/user_notify/signup_no.rhtml
 - app/views/user_notify/change_password_no.rhtml
-- app/views/user_notify/signup.rhtml
+- app/views/user_notify/change_password_en.rhtml
+- app/views/user_notify/forgot_password_en.rhtml
+- app/views/user_notify/signup_en.rhtml
 - app/views/periods
 - app/views/periods/show.rhtml
 - app/views/periods/_show_active.rhtml
@@ -1785,5 +1784,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.2
+        version: 1.3.0
     version: