backlog 0.0.4 → 0.0.5

data/History.txt

@@ -1,3 +1,13 @@
+== 0.0.5 2007-07-29
+
+* First party (user/group) centric release.
+* Released gem, but still requires external database.
+
+== 0.0.4 2007-07-06
+
+* Last backlog centric release.  Next release will be user/group centric
+* Released gem, but still requires external database.
+
 == 0.0.0 14/6/2007
 
 * First release on RubyForge

data/Rakefile

@@ -11,8 +11,9 @@ require 'tasks/rails'
 
 require 'hoe'
 
-Hoe.new("backlog", '0.0.4') do |p|
+Hoe.new("backlog", '0.0.5') do |p|
   p.rubyforge_name = "backlog"
+  p.remote_rdoc_dir = '' # Release to root
   p.spec_extras = {
     :files => Dir['**/*'].reject{|file_name| file_name =~ /^log|pkg/}
   }

data/app/controllers/application.rb

@@ -4,6 +4,11 @@ require 'user_system'
 class ApplicationController < ActionController::Base
   include Localization
   include UserSystem
+  include ActionView::Helpers::TagHelper
+  include ActionView::Helpers::JavaScriptHelper
+  include ActionView::Helpers::PrototypeHelper
+  include ActionView::Helpers::ScriptaculousHelper
+  
   layout :determine_layout
   helper :user
   before_filter :store_detour_from_params
@@ -87,7 +92,7 @@ class ApplicationController < ActionController::Base
   
   def pop_detour
     detour = session[:detours].pop
-    puts "popped detour: #{detour}"; STDOUT.flush
+    puts "popped detour: #{detour} #{session[:detours].size} more"; STDOUT.flush
     if session[:detours].empty?
       session[:detours] = nil
     end
@@ -112,23 +117,65 @@ class ApplicationController < ActionController::Base
   end
   
   def populate_layout
+    @period = Period.find(:first, params[:id]) if params[:id]
+    @owner = @period.party if @period
     populate_shortcuts
-    @backlogs = Backlog.find(:all, :order => 'name')
-    @sidebars = @backlogs.sort {|a, b| b.required_speed <=> a.required_speed}.map do |backlog|
+    
+    # TODO (uwe): This does not scale!
+    periods = Period.find(:all).select {|period| period.active_or_future?(true)}
+    
+    @sidebars = periods.sort_by {|p| p.required_speed}.reverse.map do |period|
       content = '<ul>'
-      backlog.periods.select {|period| period.in_list? }[0...5].map do |period|
-        "<li><a href=\"#{url_for(:controller => 'periods', :action => :show, :id => period)}\">#{period.backlog.name}##{period.position}</a></li>"
+      period.tasks.select {|task| task.in_list? }[0...5].map do |task|
+        "<li>#{task.description}</li>"
         end.each do |period_link|
           content << "#{period_link}"
         end
-        content << '</ul>'
-        { :title => "#{backlog.name} (#{'%0.1f' % backlog.required_speed})",
-          :options => {:controller => 'backlogs', :action => :show, :id => backlog},
+        content << "</ul>\n"
+        content << drop_receiving_element("sidebar_#{period.id}",
+        :update => "spotlight", 
+        :url => { :controller => 'tasks', :action => "move_to_period", :period_id => period.id},
+        :accept => "tasks", :loading => "", :complete => "",
+        :hoverclass => 'highlight')
+        
+        { :id => period.id,
+          :title => "#{period.party.name}##{period.position} (#{'%0.1f' % period.required_speed})",
+          :options => {:controller => 'periods', :action => :show, :id => period},
           :content => content
         }
       end
+      started_tasks = Task.find_started(user)
+      if not started_tasks.empty?
+        links = started_tasks.map do |task|
+        "<li><a href=\"#{url_for :controller => 'periods', :action => :show, :id => task.period, :task_id => task.id}\">#{task.description}</a></li>"
+        end
+        @sidebars.unshift({ :title   => l(:started_tasks),
+          :options => {:controller => 'tasks', :action => :list_started},
+          :content => "<ul>#{links}"
+        })
+      end
     end
     
+    #  def populate_layout
+    #    populate_shortcuts
+    #    @groups = Group.find(:all, :order => 'name')
+    #    @backlogs = Backlog.find(:all, :order => 'name')
+    #    @sidebars = @backlogs.map do |backlog|
+    #      content = '<ul>'
+    #      periods = backlog.tasks.map {|task| task.period}.uniq
+    #      periods.select {|period| period.in_list? }[0...5].map do |period|
+    #        "<li><a href=\"#{url_for(:controller => 'periods', :action => :show, :id => period)}\">#{period.name}</a></li>"
+    #        end.each do |period_link|
+    #          content << "#{period_link}"
+    #        end
+    #        content << '</ul>'
+    #        { :title => "#{backlog.name}",
+    #          :options => {:controller => 'backlogs', :action => :show, :id => backlog},
+    #          :content => content
+    #        }
+    #      end
+    #    end
+    
     private
     
     def user_id

data/app/controllers/groups_controller.rb

@@ -0,0 +1,62 @@
+class GroupsController < 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, :except => [ :edit, :index, :list, :new ],
+         :redirect_to => { :action => :list }
+
+  def list
+    @group_pages, @groups = paginate :groups, :per_page => 10
+  end
+
+  def new
+    @group = Group.new
+  end
+
+  def create
+    @group = Group.new(params[:group])
+    if @group.save
+      flash[:notice] = 'Group was successfully created.'
+      redirect_to :action => 'list'
+    else
+      render :action => 'new'
+    end
+  end
+
+  def edit
+    @group = Group.find(params[:id])
+    @users = User.find(:all)
+    @members = @group.users.to_s
+  end
+
+  def update
+    @group = Group.find(params[:id])
+    if @group.update_attributes(params[:group])
+      flash[:notice] = 'Group was successfully updated.'
+      back_or_redirect_to :action => :edit, :id => @group
+    else
+      render :action => 'edit'
+    end
+  end
+
+  def destroy
+    Group.find(params[:id]).destroy
+    redirect_to :action => 'list'
+  end
+
+  def set_member
+    @group = Group.find(params[:id])
+    @user = User.find(params[:user_id])
+    if params[:value] == 'true'
+      @group.users << @user unless @group.users.include? @user 
+    else
+      @group.users.delete @user
+    end
+    @users = User.find(:all)
+    redirect_to :action => :edit, :id => @group
+  end
+
+end

data/app/controllers/periods_controller.rb

@@ -1,9 +1,4 @@
 class PeriodsController < ApplicationController
-  include ActionView::Helpers::TagHelper
-  include ActionView::Helpers::JavaScriptHelper
-  include ActionView::Helpers::PrototypeHelper
-  include ActionView::Helpers::ScriptaculousHelper
-
   skip_before_filter :populate_layout, :only => [:index, :show_nolayout, :destroy, :burn_down_chart_thumbnail, :burn_down_chart]
   skip_before_filter :authenticate_user, :only => [:burn_down_chart, :burn_down_chart_thumbnail, :burn_down_chart_large]
   
@@ -17,8 +12,8 @@ class PeriodsController < ApplicationController
   verify :method => :post, :only => [ :destroy, :create, :update ], :redirect_to => { :action => :index }
   
   def show
-    if params[:task]
-      @selected_task = Task.find(params[:task])
+    if params[:task_id]
+      @selected_task = Task.find(params[:task_id])
     end
     if @selected_task
       @period = @selected_task.period
@@ -42,9 +37,9 @@ class PeriodsController < ApplicationController
   
   def new
     @period = Period.new
-    if params[:backlog_id]
-      @period.backlog_id = params[:backlog_id]
-      previous = @period.backlog.periods.last
+    if params[:party_id]
+      @period.party_id = params[:party_id]
+      previous = @period.party.periods.last
       if previous
         @period.start_on = previous.end_on + 1
         @period.end_on = previous.end_on + (1 + (previous.end_on - previous.start_on))
@@ -52,7 +47,7 @@ class PeriodsController < ApplicationController
         @period.start_on = Date.today
       end
     else
-      @backlogs = Backlog.find(:all, :order => 'name')
+      @parties = Party.find(:all)
     end
   end
   
@@ -116,14 +111,14 @@ class PeriodsController < ApplicationController
     g.legend_font_size = 14
     g.hide_dots = true
     g.colors = %w{blue orange}
-    if period.backlog.track_done
+    if period.track_work?
       g.colors += %w{green}
     end
     if previous_period = period.higher_item
       g.colors += %w{grey grey}
     end
     if period.active?
-      g.colors += %w{red orange}
+      g.colors += %w{lightblue #d7a790}
     end
     
     recorded_dates = period.recorded_dates
@@ -131,7 +126,7 @@ class PeriodsController < ApplicationController
     actual_todo_data = get_todo_data(recorded_dates, period, true)
     g.data("#{l :todo} (#{l :obs})", observed_todo_data)
     g.data("#{l :calc}", actual_todo_data)
-    g.data(l(:done), get_work_data(recorded_dates, period)) if period.backlog.track_done
+    g.data(l(:done), get_work_data(recorded_dates, period)) if period.track_work?
     if previous_period = period.higher_item
       g.data("#{l :previous} #{l :obs}", get_todo_data(previous_period.dates, previous_period))
       g.data("#{l :calc}", get_todo_data(previous_period.dates, previous_period, true))
@@ -148,11 +143,11 @@ class PeriodsController < ApplicationController
     labels = {0 => all_dates.first.to_s, all_dates.length-1 => all_dates.last.to_s}
     labels.merge({all_dates.index(Date.today) => Date.today.to_s}) if all_dates.index(Date.today) && (all_dates.index(Date.today) / all_dates.length) > 0.10
     g.labels = labels
-
+    
     # g.draw_vertical_legend
-
+    
     g.maximum_value = g.maximum_value.to_i
-
+    
     send_data(g.to_blob,
               :disposition => 'inline', 
     :type => 'image/png', 
@@ -187,41 +182,4 @@ class PeriodsController < ApplicationController
     end
   end
   
-  def populate_layout
-    @period = Period.find(:first, params[:id]) if params[:id]
-    @backlog = @period.backlog if @period
-    populate_shortcuts
-    periods = Period.find(:all).select {|period| period.active?(true)}
-    @sidebars = periods.sort_by {|p| p.required_speed}.reverse.map do |period|
-      content = '<ul>'
-      period.tasks.select {|task| task.in_list? }[0...5].map do |task|
-        "<li>#{task.description}</li>"
-        end.each do |period_link|
-          content << "#{period_link}"
-        end
-        content << "</ul>\n"
-        content << drop_receiving_element("sidebar_#{period.id}",
-            :update => "spotlight", 
-            :url => { :controller => 'tasks', :action => "move_to_period", :period_id => period.id},
-            :accept => "tasks", :loading => "", :complete => "",
-            :hoverclass => 'highlight')
-        
-        { :id => period.id,
-          :title => "#{period.backlog.name}##{period.position} (#{'%0.1f' % period.required_speed})",
-          :options => {:controller => 'periods', :action => :show, :id => period},
-          :content => content
-        }
-      end
-      started_tasks = Task.find_started(user)
-      if not started_tasks.empty?
-        links = started_tasks.map do |task|
-        "<li><a href=\"#{url_for :controller => 'periods', :action => :show, :id => task.period, :task_id => task.id}\">#{task.description}</a></li>"
-        end
-        @sidebars.unshift({ :title   => l(:started_tasks),
-          :options => {:controller => 'tasks', :action => :list_started},
-          :content => "<ul>#{links}"
-        })
-      end
-    end
-    
-  end
+end

data/app/controllers/tasks_controller.rb

@@ -7,16 +7,19 @@ class TasksController < ApplicationController
   
   def list_started
     @tasks = Task.find_started(user)
+    back_or_redirect_to :controller => nil, :action => nil if @tasks.empty?
   end
   
   def new
-    @task = Task.new
-    @task.period_id = params[:period_id]
+    @task = Task.new params[:task]
+    @task.backlog_id ||= @task.period && @task.period.most_frequent_backlog
+    @backlogs = Backlog.find(:all, :order => 'name')
+    @periods = Period.find_active_or_future
   end
   
   def create
-    if params[:task] && params[:task][:period_id] && params[:task][:period_id][0..0] == 'B'
-      detour_to :controller => 'periods', :action => :new, :backlog_id => params[:task][:period_id][1..-1].to_i
+    if params[:task] && params[:task][:period_id] && params[:task][:period_id][0..0] == 'G'
+      detour_to :controller => 'periods', :action => :new, :group_id => params[:task][:period_id][1..-1].to_i
       return
     end
     @task = Task.new(params[:task])
@@ -32,6 +35,7 @@ class TasksController < ApplicationController
   
   def edit
     @task = Task.find(params[:id])
+    @periods = Period.find_active_or_future
   end
   
   def update
@@ -122,7 +126,7 @@ class TasksController < ApplicationController
           back_or_redirect_to :controller => 'periods', :action => :show_nolayout, :id => next_task.period, :task_id => next_task.id
         end
       else
-        detour_to :controller => 'periods', :action => :new, :backlog_id => task.period.backlog.id, :layout => with_layout && determine_layout
+        detour_to :controller => 'periods', :action => :new, :party_id => task.period.party_id, :layout => with_layout && determine_layout
       end
     else
       redirect_to :controller => 'periods', :action => :show, :id => task.period, :task_id => task.id, :layout => with_layout && determine_layout

data/app/controllers/works_controller.rb

@@ -27,11 +27,12 @@ class WorksController < ApplicationController
     @work = Work.new(params[:work])
     @work.user = user
     @estimate = Estimate.new(params[:estimate])
-    @tasks = Task.find(:all)
+    @tasks = Task.find_open
     @users = User.find(:all)
   end
   
   def create
+    convert_hours_param
     @work = Work.new(params[:work])
     @work.completed_at = Time.now unless @work.completed_at
     if @work.save!
@@ -57,8 +58,9 @@ class WorksController < ApplicationController
     @work = Work.find(params[:id])
     
     @work.task.estimates.new(params[:estimate]).save! if params[:estimate]
-
+    
     convert_start_time_param
+    convert_hours_param
     if @work.update_attributes(params[:work])
       flash[:notice] = 'Work was successfully updated.'
       back_or_redirect_to :controller => 'periods', :action => 'show', :id => @work.task.period, :task_id => @work.task.id
@@ -78,10 +80,11 @@ class WorksController < ApplicationController
     @date = (params[:date] && Date.parse(params[:date])) || Date.today
     @periods = []
     @works = Work.find(:all,
-                        :conditions => "started_at < '#{@date+1}' AND completed_at >= '#{@date}'",
-                        :order => 'completed_at'
-                      )
-#    render :layout => 'wide'
+                       :conditions => "started_at < '#{@date+1}' AND completed_at >= '#{@date}'",
+    :order => 'completed_at'
+    )
+    @started_works = Task.find_started
+    render :layout => 'wide'
   end
   
   def weekly_work_sheet
@@ -98,6 +101,24 @@ class WorksController < ApplicationController
     render :layout => false
   end
   
+  def auto_complete_for_work_backlog_name
+    @backlogs = Backlog.find(:all, 
+                       :conditions => [ 'LOWER(name) LIKE ?',
+    '%' + params[:work][:backlog_name].downcase + '%' ], 
+    :order => 'name ASC',
+    :limit => 16)
+    render :partial => '/backlogs/name_list'
+  end
+  
+  def auto_complete_for_work_task_description
+    @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'
+  end
+  
   private
   
   def convert_start_time_param
@@ -114,4 +135,20 @@ class WorksController < ApplicationController
     end
   end
   
+  def convert_hours_param
+    if params[:work] && params[:work][:hours_time]
+      params[:work][:hours_time].strip!
+      if params[:work][:hours_time] =~ /^(\d*):(\d{2})$/
+        new_hours = $1
+        new_minutes = $2.to_i
+        params[:work][:hours] = BigDecimal("#{new_hours}.#{new_minutes / 0.6}")
+      elsif params[:work][:hours_time] =~ /^(\d*(?:.\d)?)$/
+        params[:work][:hours] = BigDecimal($1)
+      else
+        raise "Unknown time format: '#{params[:work][:hours_time]}'"
+      end
+      params[:work].delete :hours_time
+    end
+  end
+  
 end

data/app/helpers/application_helper.rb

@@ -4,9 +4,9 @@ require 'localization'
 module ApplicationHelper
   include Localization
   
-  def image_button_to(source, title, options)
+  def image_button_to(image_source, title, options)
     html = ''
-    html += image_submit_tag source, :class => 'image-submit', :alt => title, :title => title,
+    html += 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
@@ -15,6 +15,12 @@ module ApplicationHelper
     link_to title, options.update({:return_controller => @controller.controller_name, :return_action => @controller.action_name, :return_id => params[:id]})
   end
   
+  def image_detour_to(image_source, title, image_options, options )
+    image_options ||= {:class => 'image-submit'}
+    image_options.update :alt => title, :title => title
+    detour_to image_tag(image_source, image_options), options
+  end
+  
   def back_or_link_to(title, options)
     if session[:detours]
       options = session[:detours].last.update({:return_from_detour => true})
@@ -23,4 +29,16 @@ puts "linked detour: #{options}"
     link_to title, options
   end
 
+  def t(time_as_float)
+    "#{time_as_float.to_i}:#{'%02d' % (time_as_float.frac * 60).to_i}" 
+  end
+  
+  def h(object)
+    if object.is_a? Time
+      object.strftime '%Y-%m-%d %H:%M:%S'
+    else
+      super object
+    end
+  end
+
 end