backlog 0.10.8 → 0.11.0

data/History.txt

@@ -1,3 +1,17 @@
+== 0.11.0 2007-10-26
+
+===Features
+
+* Added work accounts, required for all work records.
+* Allow work records to be entered without task reference.
+* Improved the Daily Work Sheet slightly.  STILL EXPERIMENTAL!
+
+=== Fixes
+
+* Added init scripts on unix to start at boot.
+* Now display validation errors on the Works form when editing.
+* Locked the backlog application to Rails 1.2.4 since Rails 1.2.5 broke acts_as_list
+
 == 0.10.8 2007-09-27
 
 === Fixes

data/app/controllers/backlogs_controller.rb

@@ -46,6 +46,7 @@ class BacklogsController < ApplicationController
   
   def new
     @backlog = Backlog.new
+    @work_accounts = WorkAccount.find(:all)
   end
   
   def create
@@ -60,6 +61,7 @@ class BacklogsController < ApplicationController
   
   def edit
     @backlog = Backlog.find(params[:id])
+    @work_accounts = WorkAccount.find(:all)
   end
   
   def edit_no_layout

data/app/controllers/work_accounts_controller.rb

@@ -0,0 +1,51 @@
+class WorkAccountsController < ApplicationController
+  def index
+    list
+    render :action => 'list'
+  end
+
+  # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
+  verify :method => :post, :only => [ :destroy, :create, :update ],
+         :redirect_to => { :action => :list }
+
+  def list
+    @work_account_pages, @work_accounts = paginate :work_accounts, :per_page => 10
+  end
+
+  def show
+    @work_account = WorkAccount.find(params[:id])
+  end
+
+  def new
+    @work_account = WorkAccount.new
+  end
+
+  def create
+    @work_account = WorkAccount.new(params[:work_account])
+    if @work_account.save
+      flash[:notice] = 'WorkAccount was successfully created.'
+      redirect_to :action => 'list'
+    else
+      render :action => 'new'
+    end
+  end
+
+  def edit
+    @work_account = WorkAccount.find(params[:id])
+  end
+
+  def update
+    @work_account = WorkAccount.find(params[:id])
+    if @work_account.update_attributes(params[:work_account])
+      flash[:notice] = 'WorkAccount was successfully updated.'
+      redirect_to :action => 'show', :id => @work_account
+    else
+      render :action => 'edit'
+    end
+  end
+
+  def destroy
+    WorkAccount.find(params[:id]).destroy
+    redirect_to :action => 'list'
+  end
+end

data/app/controllers/works_controller.rb

@@ -3,7 +3,8 @@ class WorksController < ApplicationController
   in_place_edit_for :work, :invoice
   in_place_edit_for :work, :started_at_time
   in_place_edit_for :work, :completed_at_time
-  skip_before_filter :populate_layout, :only => [ :set_work_hours, :weekly_work_sheet, :weekly_work_sheet2, :timeliste ]
+  skip_before_filter :populate_layout, :only => [ :auto_complete_for_work_description, :daily_work_sheet, :set_work_hours, :timeliste, :weekly_work_sheet, :weekly_work_sheet2 ]
+  auto_complete_for :work, :description
   
   def index
     list
@@ -24,36 +25,47 @@ class WorksController < ApplicationController
   end
   
   def new
-    @work = Work.new(params[:work])
-    @work.user = user
-    @estimate = Estimate.new(params[:estimate])
+    unless @work
+      @work = Work.new(params[:work])
+      @work.user = user
+    end
+    @estimate ||= Estimate.new(params[:estimate])
+    @work_accounts = WorkAccount.find(:all, :order => :name)
     @tasks = Task.find_open
     @users = User.find(:all)
   end
   
   def create
-    if params[:work] && params[:work][:backlog_name] && params[:work][:task_description]
-      backlog = Backlog.find_by_name(params[:work].delete(:backlog_name))
-      description = params[:work][:task_description]
-      task = Task.find_by_backlog_id_and_description(backlog.id, description)
-      params[:work][:task_id] = task.id
-      params[:work].delete(:task_description)
+    if params[:work]
+      backlog_name = params[:work].delete(:backlog_name)
+      task_description = params[:work].delete(:task_description)
+      if backlog_name && backlog_name.size > 0 && task_description && task_description.size > 0
+        backlog = Backlog.find_by_name(backlog_name)
+        task = backlog.tasks_with_children.find{|t| t.description == task_description}
+        params[:work][:task_id] = task.id
+      end
+      account_name = params[:work].delete(:work_account_name)
+      if account_name && account_name.size > 0
+        account = WorkAccount.find_by_name(account_name)
+        params[:work][:work_account_id] = account.id
+      end
     end
     convert_hours_param
     convert_start_time_param
     @work = Work.new(params[:work])
     @work.completed_at = Time.now unless @work.completed_at
     @work.user_id = current_user.id
-    if @work.save!
+    if @work.save
       flash[:notice] = 'Work was successfully created.'
     else
+      new
       render :action => 'new'
       return
     end
     
-    @work.task.estimates.create!(params[:estimate]) if params[:estimate]
+    @work.task.estimates.create!(params[:estimate]) if @work.task && params[:estimate]
     
-    back_or_redirect_to :controller => 'periods', :action => 'show', :id => @work.task.period, :task_id => @work.task.id
+    back_or_redirect_to :controller => 'periods', :action => 'show', :id => @work.task && @work.task.period, :task_id => @work.task && @work.task.id
   end
   
   def edit
@@ -65,27 +77,48 @@ class WorksController < ApplicationController
   end
   
   def update
+    if update_work
+      back_or_redirect_to :controller => 'periods', :action => 'show', :id => @work.task.period, :task_id => @work.task.id
+    else
+      @task = @work.task
+      edit
+      render :action => 'edit'
+    end
+  end
+  
+  def update_row
+    update_work
+    flash.discard
+    @field = params[:field] || 'started_at_time'
+  end
+  
+  def update_work
     @work = Work.find(params[:id])
-    
+    work = @work
     convert_start_time_param
     convert_hours_param
     if @work.update_attributes(params[:work])
       flash[:notice] = 'Work was successfully updated.'
-      if params[:estimate].nil? || (@estimate = @work.task.estimates.create(params[:estimate])).errors.size == 0
-        back_or_redirect_to :controller => 'periods', :action => 'show', :id => @work.task.period, :task_id => @work.task.id
-        return
+      if @work.task
+        if params[:estimate]
+          if (@estimate = @work.task.estimates.create(params[:estimate])).errors.size == 0
+            return true
+          end
+        else
+          return true
+        end
+      else
+        return true
       end
     end
-    @task = @work.task
-    edit
-    render :action => 'edit'
+    return false
   end
   
   def destroy
     work = Work.find(params[:id])
-    period = work.task.period
+    period = work.task && work.task.period
     work.destroy
-    redirect_to :controller => 'periods', :action => :list_work, :id => period 
+    back_or_redirect_to :controller => 'periods', :action => :list_work, :id => period 
   end
   
   def daily_work_sheet
@@ -93,6 +126,7 @@ class WorksController < ApplicationController
     @periods = []
     @works = Work.find_work_for_day @date
     @started_works = Task.find_started
+    @work = Work.new(:started_at => Time.now, :completed_at => Time.now)
     render :layout => 'wide'
   end
   
@@ -110,6 +144,15 @@ class WorksController < ApplicationController
     render :layout => false
   end
   
+  def auto_complete_for_work_work_account_name
+    @accounts = WorkAccount.find(:all, 
+                                 :conditions => [ 'LOWER(name) LIKE ?',
+    '%' + params[:work][:work_account_name].downcase + '%' ], 
+    :order => 'name ASC',
+    :limit => 16)
+    render :partial => '/work_accounts/name_list'
+  end
+  
   def auto_complete_for_work_backlog_name
     @backlogs = Backlog.find(:all, 
                              :conditions => [ 'LOWER(name) LIKE ?',
@@ -121,17 +164,17 @@ class WorksController < ApplicationController
   
   def auto_complete_for_work_task_description
     if backlog_name = params[:backlog_name]
-      if backlog = Backlog.find_by_name(backlog_name)
-        backlog_clause = " AND backlog_id = #{backlog.id}"
+      if @backlog = Backlog.find_by_name(backlog_name)
+        @tasks = @backlog.tasks_with_children.select {|t| t.description.downcase =~ /#{params[:work][:task_description].downcase}/}
       end
     end
-    
-    @tasks = Task.find(:all,
-                       :conditions => [ "finished_at IS NULL AND LOWER(description) LIKE ?#{backlog_clause}",
-    '%' + params[:work][:task_description].downcase + '%' ], 
+    @tasks ||= Task.find(:all,
+                         :conditions => [ "finished_at IS NULL AND LOWER(description) LIKE ?",
+                        '%' + params[:work][:task_description].downcase + '%' ], 
     :order => 'description ASC',
     :limit => 16)
-    render :partial => '/tasks/description_list'
+    
+    render :partial => 'description_list'
   end
   
   private

data/app/helpers/application_helper.rb

@@ -6,8 +6,7 @@ module ApplicationHelper
   include UrlForFix
   
   def image_button_to(image_source, title, options)
-    html = ''
-    html += image_submit_tag image_source, :class => 'image-submit', :alt => title, :title => title,
+    image_submit_tag image_source, :class => 'image-submit', :alt => title, :title => title,
     :id => "#{title}_#{options[:id]}", :name => title, 
     :onclick => "form.action='#{url_for(options)}'"
   end

data/app/helpers/work_accounts_helper.rb

@@ -0,0 +1,2 @@
+module WorkAccountsHelper
+end

data/app/models/backlog.rb

@@ -4,12 +4,11 @@ class Backlog < ActiveRecord::Base
   validates_uniqueness_of :name
   validates_inclusion_of :track_todo, :in => [true, false], :allow_nil => true, :message => ActiveRecord::Errors.default_error_messages[:blank]
   validates_inclusion_of :track_done, :in => [true, false], :allow_nil => true, :message => ActiveRecord::Errors.default_error_messages[:blank]
-  validates_inclusion_of :track_times, :in => [true, false], :allow_nil => true, :message => ActiveRecord::Errors.default_error_messages[:blank]
   validates_inclusion_of :enable_subtasks, :in => [true, false], :allow_nil => false, :message => ActiveRecord::Errors.default_error_messages[:blank]
   validates_inclusion_of :enable_customer, :in => [true, false], :allow_nil => true, :message => ActiveRecord::Errors.default_error_messages[:blank]
   validates_inclusion_of :enable_users, :in => [true, false], :allow_nil => true, :message => ActiveRecord::Errors.default_error_messages[:blank]
-  validates_length_of :invoice_code, :allow_nil => true, :maximum => 255
 
+  belongs_to :work_account
   has_many :tasks, :order => 'period_id, position', :dependent => :destroy
   has_many :unplanned_tasks, :class_name => 'Task', :conditions => 'period_id IS NULL', :order => 'position'
 
@@ -21,6 +20,10 @@ class Backlog < ActiveRecord::Base
     Task.find(:all, :conditions => "period_id = #{periods.first.id} AND (position IS NOT NULL OR finished_at >= '#{1.week.ago.iso8601}')", :order => "position, finished_at")
   end
 
+  def tasks_with_children
+    tasks.map {|t| t.self_with_children}.flatten
+  end
+  
   def estimate_data(date)
     total = 0
     periods.each do |period|
@@ -45,7 +48,11 @@ class Backlog < ActiveRecord::Base
   end
   
   def enable_invoicing?
-    !invoice_code.nil? && invoice_code.length > 0
+    work_account && work_account.invoice_code && work_account.invoice_code.length > 0
+  end
+  
+  def track_times?
+    work_account && work_account.track_times?
   end
   
 end

data/app/models/configuration.rb

@@ -0,0 +1,2 @@
+class Configuration < ActiveRecord::Base
+end

data/app/models/customer.rb

@@ -0,0 +1,2 @@
+class Customer < ActiveRecord::Base
+end

data/app/models/task.rb

@@ -10,6 +10,8 @@ class Task < ActiveRecord::Base
   belongs_to :backlog
   belongs_to :period
   belongs_to :ancestor_task, :class_name => 'Task', :foreign_key => 'previous_task_id' 
+  belongs_to :customer
+  belongs_to :work_account
   has_many :descendant_tasks, :class_name => 'Task', :foreign_key => 'previous_task_id', :dependent => :destroy
   has_many :estimates, :order => 'created_at', :dependent => :destroy
   has_many :works, :order => 'completed_at', :dependent => :destroy
@@ -61,6 +63,10 @@ class Task < ActiveRecord::Base
     return "finished_at >= '#{1.week.ago.iso8601}'"
   end
   
+  def self_with_children
+    [self] << children.map {|t| t.self_with_children}.flatten
+  end
+  
   def todo
     estimates.last ? estimates.last.todo : initial_estimate
   end
@@ -114,9 +120,8 @@ class Task < ActiveRecord::Base
     if finished_at
       self.finished_at = nil
       self.resolution = nil
+      self.position = nil
       insert_at 1
-      self.position = 1
-      self.save!
       estimate(initial_estimate)
       parent.open if parent
     end
@@ -160,9 +165,11 @@ class Task < ActiveRecord::Base
         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.position = nil
         new_task.save!
+        new_task.insert_at 1
+#        new_task.position = 1
+#        new_task.save!
         new_task.estimate(old_todo)
       end
     else
@@ -238,7 +245,7 @@ class Task < ActiveRecord::Base
   end
   
   def track_times?
-    root_task.backlog.track_times?
+    work_account && work_account.track_times?
   end
   
   def track_todo?
@@ -266,6 +273,16 @@ class Task < ActiveRecord::Base
     old_period || root_task.old_period
   end
   
+  alias_method :old_backlog, :backlog
+  def backlog
+    old_backlog || root_task.old_backlog
+  end
+  
+  alias_method :old_work_account, :work_account
+  def work_account
+    self.old_work_account || (parent ? parent.work_account : backlog.work_account)
+  end
+  
   def depth
     root_task = self 
     depth = 0
@@ -309,7 +326,10 @@ class Task < ActiveRecord::Base
     return if work_started?
     open
     new_work = works.new
+
+    # TODO (uwe): Only needed for rails 1.2.x branch.  Remove when moving to 1.3 or 2.0.
     new_work.task = self
+    
     new_work.started_at = Time.previous_quarter
     if works.size > 0
       if current_user
@@ -323,6 +343,7 @@ class Task < ActiveRecord::Base
       end
     end
     new_work.user = current_user
+    new_work.work_account_id = work_account.id
     new_work.save!
   end
   

data/app/models/work.rb

@@ -4,18 +4,23 @@ class Work < ActiveRecord::Base
   
   belongs_to :task
   belongs_to :user
+  belongs_to :work_account
   
-  validates_presence_of :task_id
   validates_associated :task
   validates_presence_of :started_at
-  validates_presence_of :user_id, :if => :validate_user?
+  validates_presence_of :work_account
   
-  def validate_user?
-    task.enable_users?
+  def validate
+    errors.add(:work, "Work account is missing") unless work_account
+  end
+
+  alias_method :old_work_account, :work_account
+  def work_account
+    self.old_work_account || (task && task.work_account)
   end
   
   def track_times?
-    task.backlog.track_times?
+    task && task.backlog && task.backlog.track_times?
   end
   
   # Return an array with an array of works per day:
@@ -48,24 +53,24 @@ class Work < ActiveRecord::Base
     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')
-    totals_per_backlog = {}
-    Backlog.find(:all).each do |backlog|
-      totals_per_backlog[backlog.id] = [[], []]
+    totals_per_work_account = {}
+    WorkAccount.find(:all).each do |work_account|
+      totals_per_work_account[work_account.id] = [[], []]
        (0..6).each do |day|
-        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)) }
+        works_for_day = works.select {|work| (work.work_account == work_account) && (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? }
         
         invoice_day_total = invoice_works_for_day.reduce(BigDecimal('0')){|total, work| total += work.hours}
         internal_day_total = internal_works_for_day.reduce(BigDecimal('0')){|total, work| total += work.hours}
-        totals_per_backlog[backlog.id][0] << invoice_day_total
-        totals_per_backlog[backlog.id][1] << internal_day_total
+        totals_per_work_account[work_account.id][0] << invoice_day_total
+        totals_per_work_account[work_account.id][1] << internal_day_total
       end
     end
-    totals_per_backlog.reject! do |backlog_id, day_totals|
+    totals_per_work_account.reject! do |work_account_id, day_totals|
       !day_totals[0].find{|day_total| day_total > 0} && !day_totals[1].find{|day_total| day_total > 0}
     end
-    totals_per_backlog
+    totals_per_work_account
   end
   
   def self.find_work_for_day date