backlog 0.35.5 → 0.36.2

data/Gemfile

@@ -0,0 +1,19 @@
+source "http://rubygems.org"
+
+gem "rails", "~> 2.3.8"
+gem 'slave'
+gem 'mechanize'
+gem 'hpricot'
+gem 'simple_workflow'
+
+if RUBY_PLATFORM =~ /java/
+  gem 'jruby-openssl'
+  gem 'activerecord-jdbc-adapter'
+  gem 'activerecord-jdbcpostgresql-adapter'
+else
+  gem 'pg'
+end
+
+group :deployment do
+  gem 'hoe'
+end

data/Gemfile~

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+gem "nokogiri"
+gem "rack", "~>1.1"
+gem "rspec", :require => "spec"

data/History.txt

@@ -1,8 +1,33 @@
+== 0.36.2 2010-07-26
+
+=== Fixes
+
+* Renamed ActionMailer template files to standard localization variants.
+* Fixed ajax link to calculate hours in work form
+
+== 0.36.1 2010-07-22
+
+=== Features
+
+* Widened layout a bit.
+
+== Internal
+
+* Removed some deprecation warnings
+
+== 0.36.0 2010-07-21
+
+=== Features
+
+* Merged Work Account into Backlog for simpler setup and maintenance.
+* Upgraded to Rails 2.3.8
+
 == 0.35.5 2009-02-09
 
 === Fixes
 
 * Fixed file upload for task
+* Changed Excel export date format to work woth Excel.
 
 == 0.35.4 2009-01-26
 

data/Rakefile

@@ -24,7 +24,7 @@ Hoe.new("backlog", APP::VERSION) do |p|
   p.email = 'uwe@kubosch.no'
   p.remote_rdoc_dir = '' # Release to root
   p.changes = File.read('History.txt').scan(/^== .*?(?=^== )/m).first
-  p.rdoc_pattern = /^(app\/(controllers|helpers|models)|lib|bin)|txt$/
+  # p.extra_rdoc_files = [/^(app\/(controllers|helpers|models)|lib|bin)|txt$/]
   p.clean_globs = ['doc', 'log/*']
   p.spec_extras = {
     :files => Dir['**/*'].reject{|file_name| file_name =~ /^(doc|log|pkg|tmp|WEB-INF)/},
@@ -34,8 +34,8 @@ Hoe.new("backlog", APP::VERSION) do |p|
   }
   p.need_zip = true
   p.url = 'http://rubyforge.org/projects/backlog/'
-  p.extra_deps = [['rails', '= 1.2.4'], ['gruff', '~> 0.2.9'], ['postgres', '~> 0.7.9'],
-      ['slave', '~> 1.2.1'], ['mechanize', '~> 0.8.4']]
+  p.extra_deps = [['rails', '= 2.3.8'], ['gruff', '~> 0.2.9'], ['postgres', '~> 0.7.9'],
+      ['slave', '~> 1.2.1'], ['mechanize', '~> 0.8.4'], ['bundler', '~> 0.9.26']]
   # ['rmagick', '~> 1.15.12'],
   p.rsync_args = "-acv --delete --exclude=wiki*"
 end

data/app/controllers/{application.rb → application_controller.rb}

@@ -1,5 +1,4 @@
 class ApplicationController < ActionController::Base
-  include Localization
   include UserSystem
   include ApplicationHelper
   include ActionView::Helpers::TagHelper
@@ -36,7 +35,7 @@ class ApplicationController < ActionController::Base
   private
   
   def determine_layout
-    if request.accepts.find {|mt| mt == 'xml'}
+    if false && request.accepts.find {|mt| mt == 'xml'}
       'wap'
     else
       # Firefox

data/app/controllers/backlogs_controller.rb

@@ -44,7 +44,6 @@ class BacklogsController < ApplicationController
   
   def new
     @backlog = Backlog.new
-    @work_accounts = WorkAccount.find(:all)
   end
   
   def create
@@ -59,7 +58,6 @@ class BacklogsController < ApplicationController
   
   def edit
     @backlog = Backlog.find(params[:id])
-    @work_accounts = WorkAccount.find(:all)
   end
   
   def edit_no_layout
@@ -174,20 +172,6 @@ class BacklogsController < ApplicationController
     render :text => 'alert("Updated sort order");'
   end
   
-  def works
-    backlog = Backlog.find(params[:id])
-    @report_filter = WorksReportFilter.new(params[:report_filter])
-    @report_filter.title = "#{l :hours} for #{backlog.name} #{@report_filter.start_on && @report_filter.start_on.strftime('%Y-%m-%d - ')}#{@report_filter.end_on && @report_filter.end_on.strftime('%Y-%m-%d')}"
-    @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], :per_page => @report_filter.page_size
-    @work_accounts = WorkAccount.find(:all)
-    @users = User.find(:all)
-    if params[:export] == 'excel'
-      render :template => '/works/list_excel', :layout => false
-    else
-      render :template => '/works/list'
-    end
-  end
-  
   private
   
   def load_tasks(backlog)

data/app/controllers/search_controller.rb

@@ -5,12 +5,10 @@ class SearchController < ApplicationController
       @search = params[:q]
       @backlogs = Backlog.find(:all, :conditions => ["lower(name) LIKE ?", "%#{@search.downcase}%"])
       @tasks = Task.find(:all, :conditions => ["lower(description) LIKE ? OR lower(notes) LIKE ?", "%#{@search.downcase}%", "%#{@search.downcase}%"])
-      @work_accounts = WorkAccount.find(:all, :conditions => ["lower(name) LIKE ?", "%#{@search.downcase}%"])
       @works = Work.find(:all, :conditions => ["lower(description) LIKE ? OR lower(notes) LIKE ?", "%#{@search.downcase}%", "%#{@search.downcase}%"])
     else
       @backlogs = []
       @tasks = []
-      @work_accounts = []
       @works = []
     end
   end

data/app/controllers/user_controller.rb

@@ -37,7 +37,7 @@ class UserController < ApplicationController
           redirect_to :action => 'login'
         end
       end
-      rescue Exception => ex
+    rescue Exception => ex
       report_exception ex
       flash[:notice] = 'Error creating account: confirmation email not sent'
     end
@@ -55,14 +55,14 @@ class UserController < ApplicationController
     begin
       @user.change_password(params['user']['password'], params['user']['password_confirmation'])
       @user.save!
-      rescue Exception => ex
+    rescue Exception => ex
       report_exception ex
       flash.now[:notice] = 'Your password could not be changed at this time. Please retry.'
       render and return
     end
     begin
       UserNotify.deliver_change_password(@user, params['user']['password'])
-      rescue Exception => ex
+    rescue Exception => ex
       report_exception ex
     end
     
@@ -95,7 +95,7 @@ class UserController < ApplicationController
           end
           redirect_back_or_default :action => 'welcome'
         end
-        rescue Exception => ex
+      rescue Exception => ex
         report_exception ex
         flash.now[:notice] = "Your password could not be emailed to #{CGI.escapeHTML(params['user']['email'])}"
       end
@@ -120,7 +120,7 @@ class UserController < ApplicationController
         else
           raise "unknown edit action"
         end
-        rescue Exception => ex
+      rescue Exception => ex
         logger.warn ex
         logger.warn ex.backtrace
       end
@@ -132,7 +132,7 @@ class UserController < ApplicationController
     begin
       @user.update_attribute( :deleted, true )
       logout
-      rescue Exception => ex
+    rescue Exception => ex
       flash.now[:notice] = "Error: #{ex}."
       redirect_back_or_default :action => 'welcome'
     end
@@ -153,7 +153,7 @@ class UserController < ApplicationController
     end
     @users = User.find(:all)
   end
-
+  
   def toggle_work_lock_monitoring
     @user = User.find(params[:id])
     @subscriber = params[:subscriber_id] ? User.find(params[:subscriber_id]) : current_user

data/app/controllers/work_locks_controller.rb

@@ -57,9 +57,9 @@ class WorkLocksController < ApplicationController
     @lock = WorkLock.find(:first, :conditions => ['user_id = ? AND start_on <= ? AND end_on >= ?', current_user.id, first_date, last_date])
     raise "Already locked" if @lock
     WorkLock.create! :user_id => current_user.id, :start_on => first_date, :end_on => last_date
-    work_account_subscribers = Work.works_for_week(@year, @week).flatten.compact.map {|w| w.work_account}.uniq.map {|wa| wa.work_lock_subscribers}.flatten.uniq
+    backlog_subscribers = Work.works_for_week(@year, @week).flatten.compact.map {|w| w.backlog}.uniq.map {|wa| wa.work_lock_subscribers}.flatten.uniq
     user_subscribers = current_user.work_lock_subscribers
-    notify_users = (work_account_subscribers + user_subscribers).uniq
+    notify_users = (backlog_subscribers + user_subscribers).uniq
     notify_users.each do |user|
       week_url = url_for :controller => 'works', :action => :weekly_work_sheet, :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

data/app/controllers/works_controller.rb

@@ -14,14 +14,14 @@ class WorksController < ApplicationController
   :redirect_to => { :action => :list }
   
   def list
-    work_account_name = (params[:work_account_id] && WorkAccount.find(params[:work_account_id]).name) || l(:all_accounts)
+    backlog_name = (params[:backlog_id] && Backlog.find(params[:backlog_id]).name) || l(:all_accounts)
     @report_filter = WorksReportFilter.new(params[:report_filter])
-    @report_filter.title = "#{l :hours} for #{work_account_name} #{@report_filter.start_on && @report_filter.start_on.strftime('%Y-%m-%d - ')}#{@report_filter.end_on && @report_filter.end_on.strftime('%Y-%m-%d')}"
+    @report_filter.title = "#{l :hours} for #{backlog_name} #{@report_filter.start_on && @report_filter.start_on.strftime('%Y-%m-%d - ')}#{@report_filter.end_on && @report_filter.end_on.strftime('%Y-%m-%d')}"
     @period = params[:id] && Period.find(params[:id])
-    @works = Work.paginate :conditions => ["started_on BETWEEN ? AND ? #{'AND work_account_id = ?' if @report_filter.work_account_id} #{@report_filter.invoice.nil? ? '' : 'AND invoice = ?'} #{@report_filter.user_id.nil? ? '' : 'AND user_id = ?'}", @report_filter.start_on, @report_filter.end_on, @report_filter.work_account_id, @report_filter.invoice, @report_filter.user_id].compact,
+    @works = Work.paginate :conditions => ["started_on BETWEEN ? AND ? #{'AND backlog_id = ?' if @report_filter.backlog_id} #{@report_filter.invoice.nil? ? '' : 'AND invoice = ?'} #{@report_filter.user_id.nil? ? '' : 'AND user_id = ?'}", @report_filter.start_on, @report_filter.end_on, @report_filter.backlog_id, @report_filter.invoice, @report_filter.user_id].compact,
     :page => params[:page], :per_page => @report_filter.page_size,
     :order => 'started_on, start_time, completed_at'
-    @work_accounts = WorkAccount.find(:all, :order => :name)
+    @backlogs = Backlog.find(:all, :order => :name)
     @users = User.find(:all, :order => 'first_name, last_name')
     if params[:export] == 'excel'
       @works = @works.sort_by {|w| [w.user_id || 0, w.task_id || 999999, w.started_on]}
@@ -41,7 +41,7 @@ class WorksController < ApplicationController
       @work.user = user
     end
     @estimate ||= Estimate.new(params[:estimate])
-    @work_accounts = WorkAccount.find(:all, :order => :name)
+    @backlogs = Backlog.find(:all, :order => :name)
     @tasks = Task.find_open
     @users = User.find(:all)
   end
@@ -55,7 +55,7 @@ class WorksController < ApplicationController
         task = backlog.tasks_with_children.find{|t| t.description == task_description}
         params[:work][:task_id] = task.id if task
       end
-      convert_work_account_param
+      convert_backlog_param
       convert_customer_param
       unless convert_hours_param
         flash[:notice] = "Illegal time format"
@@ -94,14 +94,14 @@ class WorksController < ApplicationController
   end
   
   
-  def convert_work_account_param
-    account_name = params[:work].delete :work_account_name
+  def convert_backlog_param
+    account_name = params[:work].delete :backlog_name
     if account_name && account_name.size > 0
-      account = WorkAccount.find_by_name account_name
-      params[:work][:work_account_id] = account.id
+      account = Backlog.find_by_name account_name
+      params[:work][:backlog_id] = account.id
     end
   end
-  private :convert_work_account_param
+  private :convert_backlog_param
   
   def convert_customer_param
     customer_name = params[:work].delete :customer_name
@@ -119,7 +119,7 @@ class WorksController < ApplicationController
     @work ||= Work.find(params[:id])
     @work.attributes = params[:work]
     @estimate = Estimate.new(params[:estimate])
-    @work_accounts = WorkAccount.find(:all)
+    @backlogs = Backlog.find(:all)
     @tasks = Task.find_open
     @tasks.unshift @work.task if @work.task
     @users = User.find(:all)
@@ -148,7 +148,7 @@ class WorksController < ApplicationController
     else
       @next_field = params[:field] || 'description'
     end
-    @work_accounts = WorkAccount.find(:all, :order => :name)
+    @backlogs = Backlog.find(:all, :order => :name)
     @customers = Customer.find(:all, :order => :name)
     if flash[:work]
       @new_work = flash[:work]
@@ -219,7 +219,7 @@ class WorksController < ApplicationController
     @customers = Customer.find(:all, :order => :name)
     @started_works = Task.find_started
     @new_work = flash[:work] || Work.new(@works.last && @works.last.completed_at ? {:started_at => @works.last.completed_at} : nil)
-    @work_accounts = WorkAccount.find(:all, :order => :name)
+    @backlogs = Backlog.find(:all, :order => :name)
     @absence = Absence.find(:first, :conditions => {:on => @date, :user_id => @user.id})
     @public_holiday = PublicHoliday.find(:first, :conditions => {:on => @date})
     render :layout => 'wide'
@@ -239,7 +239,7 @@ class WorksController < ApplicationController
     @year = (params[:year] && params[:year].to_i) || Date.today.year
     @week = (params[:week] && params[:week].to_i) || Date.today.cweek
     @user = params[:user_id] ? User.find(params[:user_id]) : current_user
-    @work_accounts = Work.works_for_week_by_work_account(@year, @week, @user)
+    @backlogs = Work.works_for_week_by_backlog(@year, @week, @user)
     @first_date = Date.commercial(@year, @week, 1)
     @last_date = @first_date + 6
     @lock = WorkLock.find_by_week(@year, @week)
@@ -251,19 +251,19 @@ class WorksController < ApplicationController
   def timeliste
     @year = (params[:year] && params[:year].to_i) || Date.today.year
     @week = (params[:week] && params[:week].to_i) || Date.today.cweek
-    @work_totals_per_work_account = Work.work_totals_for_week(@year, @week)
+    @work_totals_per_backlog = Work.work_totals_for_week(@year, @week)
     headers["Content-Type"] = "application/vnd.ms-excel"
     headers["Content-Disposition"] = 'attachment; filename="export.xml"'
     render :layout => false
   end
   
-  def auto_complete_for_work_work_account_name
-    @accounts = WorkAccount.find(:all, 
+  def auto_complete_for_work_backlog_name
+    @accounts = Backlog.find(:all, 
                                  :conditions => [ 'LOWER(name) LIKE ?',
-    '%' + params[:work][:work_account_name].downcase + '%' ], 
+    '%' + params[:work][:backlog_name].downcase + '%' ], 
     :order => 'name ASC',
     :limit => 16)
-    render :partial => '/work_accounts/name_list'
+    render :partial => '/backlogs/name_list'
   end
   
   def auto_complete_for_work_customer_name
@@ -307,14 +307,14 @@ class WorksController < ApplicationController
   def auto_complete_for_work_description
     max = 16
     works = Work.find(:all, :select => "description, count(*) as freq", 
-    :conditions => [ 'LOWER(description) LIKE ? AND work_account_id = ?', '%' + params[:description].downcase + '%', params[:work_account_id] ],
+    :conditions => [ 'LOWER(description) LIKE ? AND backlog_id = ?', '%' + params[:description].downcase + '%', params[:backlog_id] ],
     :group => "description",
     :order => 'freq DESC, description ASC',
     :limit => max)
     
     if works.size < max
       works += Work.find(:all, :select => "description, count(*) as freq", 
-      :conditions => [ 'LOWER(description) LIKE ? AND work_account_id <> ?', '%' + params[:description].downcase + '%', params[:work_account_id] ],
+      :conditions => [ 'LOWER(description) LIKE ? AND backlog_id <> ?', '%' + params[:description].downcase + '%', params[:backlog_id] ],
       :group => "description",
       :order => 'freq DESC, description ASC',
       :limit => max - works.size)
@@ -341,7 +341,7 @@ class WorksController < ApplicationController
   def update_new_row
     @field = params[:field]
     @next_field = params[:next_field]
-    convert_work_account_param
+    convert_backlog_param
     convert_customer_param
     raise "Unknown time format: #{params[:hours_time]}" unless convert_hours_param
     @work = Work.new(params[:work])

data/app/helpers/application_helper.rb

@@ -1,8 +1,6 @@
-require 'localization'
 require 'url_for_fix'
 
 module ApplicationHelper
-  include Localization
   include UserSystem
   include UrlForFix
   
@@ -40,10 +38,10 @@ module ApplicationHelper
     link_to image_tag(image_source, image_options), url_options, post ? {:method => :post} : nil
   end
   
-  def image_link_to_remote(image_source, title, url_options, image_options = nil, post = false)
+  def image_link_to_remote(image_source, title, link_options, image_options = nil, post = false)
     image_options ||= {:class => 'image-submit'}
     image_options.update :alt => title, :title => title
-    link_to_remote image_tag(image_source, image_options), {:url => url_options}, post ? {:method => :post} : nil
+    link_to_remote image_tag(image_source, image_options), link_options, post ? {:method => :post} : nil
   end
   
   def detour?
@@ -58,7 +56,12 @@ module ApplicationHelper
     link_to(title, options) if options
   end
   
-  def t(time_as_float)
+  def l(value, *args)
+    return t(value, *args) if value.is_a?(Symbol)
+  end
+  
+  def t(time_as_float, *args)
+    return super if time_as_float.is_a?(Symbol)
     return '' unless time_as_float
     time_as_float = BigDecimal(time_as_float.to_s) unless time_as_float.is_a? BigDecimal
     "#{time_as_float.to_i}:#{'%02d' % (time_as_float.frac * 60).round}" 
@@ -85,7 +88,7 @@ module ApplicationHelper
     else
       raise "Unknown resolution " + resolution
     end
-    image_tag image_file, :title => l(@task.resolution.downcase)
+    image_tag image_file, :title => l(resolution.downcase)
   end
   
   def display_notice(page)

data/app/helpers/backlogs_helper.rb

@@ -60,7 +60,7 @@ module BacklogsHelper
       page.insert_html :top, period_tag_id, render(:partial => "/tasks/period_header", :locals => {:period => @task.period})
     end
     
-    page.insert_html(:top, list_tag_id, render(:partial => "/tasks/task", :locals => { :task => @task, :i => 1, :active => true, :highlight_task => false, :update => :spotlight, :hidden => true }))
+    page.insert_html(:top, list_tag_id, render(:partial => "/tasks/task", :locals => { :task => @task, :i => 1, :active => true, :highlight_task => false, :update => :spotlight, :hidden => true, :show_backlog => false }))
     record page, sortable_element_js(list_tag_id, :url => { :action => :order }, :containment => @tasks.map{|t| t.period_id}.uniq.map{|p| "active_tasks_#{p}"}, :constraint => false)
 
     page[:no_tasks_message].hide

data/app/helpers/periods_helper.rb

@@ -21,7 +21,7 @@ module PeriodsHelper
   end
   
   def add_active_task(page)
-    page.insert_html(:top, "active_tasks_#{@task.period.id}", render(:partial => "/tasks/task", :locals => { :task => @task, :i => 1, :active => true, :highlight_task => false, :update => :spotlight, :hidden => true }))
+    page.insert_html(:top, "active_tasks_#{@task.period.id}", render(:partial => "/tasks/task", :locals => { :task => @task, :i => 1, :active => true, :highlight_task => false, :update => :spotlight, :hidden => true, :show_backlog => false }))
     
     page[:no_tasks_message].hide
     

data/app/models/backlog.rb

@@ -2,15 +2,18 @@ class Backlog < ActiveRecord::Base
   validates_presence_of :name
   validates_length_of :name, :allow_nil => false, :maximum => 64
   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 :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_inclusion_of :track_todo, :in => [true, false], :allow_nil => true, :message => I18n.translate('activerecord.errors.messages')[:blank]
+  validates_inclusion_of :enable_subtasks, :in => [true, false], :allow_nil => false, :message => I18n.translate('activerecord.errors.messages')[:blank]
+  validates_inclusion_of :enable_customer, :in => [true, false], :allow_nil => true, :message => I18n.translate('activerecord.errors.messages')[:blank]
+  validates_inclusion_of :enable_users, :in => [true, false], :allow_nil => true, :message => I18n.translate('activerecord.errors.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'
+  has_many :works, :dependent => :destroy
+  has_and_belongs_to_many :work_lock_subscribers, :class_name => 'User', :join_table => "work_lock_subscriptions", :foreign_key => "backlog_id", :association_foreign_key => 'subscriber_user_id'
+
+  validates_inclusion_of :track_times, :in => [true, false], :message => I18n.translate('activerecord.errors.messages')[:blank]
 
   def active_tasks
     tasks.find(:all, :conditions => "finished_at IS NULL", :order => "position")
@@ -32,15 +35,15 @@ class Backlog < ActiveRecord::Base
   end
   
   def enable_invoicing?
-    work_account && work_account.enable_invoicing?
+    true
   end
-  
+
   def track_done?
-    not work_account.nil?
+    true
   end
   
-  def track_times?
-    work_account && work_account.track_times?
+  def total_hours
+    works.inject(BigDecimal('0')) {|total, work| total + work.hours}
   end
   
 end