backlog 0.22.1 → 0.23.0

data/History.txt

@@ -1,3 +1,31 @@
+== 0.23.0 2008-02-25
+
+=== Features
+
+* Improved input for daily_work_sheet
+* Allowed override for development and test database with new config file
+* Listed details for works without backlog in "Show Work Acoount" view.
+* Added "List Works" view for Work Account.
+* Added filtering of tasks grabbed by other users in the sprint view.
+
+=== Fixes
+
+* Improved work flow ("Back" links) several places.
+* Fixed bug in layout when you had started tasks without a sprint.
+* Some speedup of grabbing tasks.
+* Fixed database corruption when trying to register users with duplicate login or email.
+* Fixed display of welcome message after following link from "Forgot password" email.
+* Fixed bug in daily work sheet when start time was not set for a work record.
+* Starting work on a task grabs it.
+* Changed to show "complete" check marks in sprint view for tasks that track time, but are not started.
+* Display blank field for hours in daily work sheet if it has not been filled in yet.
+* Always display row for new work record entry in daily work sheet.
+  Earlier, a row for new input was only shown if the previous row was ended.
+* Removed message about missing database settings in main config file on startup since it is optional and deprecated.
+* Fixed error in class table inheritance library.  Validations for the subclass were not called.
+* Added some Firewatir tests.  EXPERIMENTAL!
+* Added explenation on how to set database connection parameters. 
+
 == 0.22.1 2008-02-15
 
 === Features

data/README.txt

@@ -57,19 +57,40 @@ If you have concrete needs, and are willing to beta test the integration, please
 
 === Configuration
 
-You can set configuration parameters for backlog using the /etc/backlog.conf file on unix and "c:\documents and settings\all\backlog.conf" on windows.
+==== Setting port
+
+You can set configuration parameters for backlog using the /etc/backlog.conf file on unix
+and "c:\documents and settings\all\backlog.conf" on windows.
 The format is YAML.
 
 Example:
 
 port: 3000
 
-database:
+
+==== Setting database connection parameters
+  
+You can set database connnection parameters using the /etc/backlog/config/database.yml file on unix
+and "c:\documents and settings\all\backlog\config\database.yml" on windows.
+The format is YAML.
+
+Example:
+
+development:
+  adapter: postgresql
+  database: backlog_development
+  username: root
+  password: verySecret42
+  host: localhost
+  
+production:
   adapter: postgresql
   database: backlog_production
   username: root
   password: verySecret42
   host: localhost
+
+See the Rails documentation (http://rubyonrails.org) for more documentation on the databse connection seetings.
   
 === Charts
 

data/app/controllers/application.rb

@@ -12,6 +12,7 @@ class ApplicationController < ActionController::Base
   helper :user
   before_filter :store_detour_from_params
   before_filter :authenticate_user
+  before_filter :store_cookies_from_params
   before_filter :populate_layout
   
   def initialize
@@ -124,7 +125,20 @@ class ApplicationController < ActionController::Base
     end
     detour
   end
-  private :pop_detour
+
+  
+  
+  def store_cookies_from_params
+    if params[:cookies]
+      params[:cookies].each_pair do |key, value|
+        logger.info "Storing cookie #{key.inspect}=#{value.inspect}"
+        #cookies[key] = {:value => value, :expires => 1.year.from_now}
+        session[key] = value
+        logger.info "Stored cookie #{key.inspect}=#{session[key].inspect}"
+      end
+    end
+  end
+  
   
   def populate_shortcuts
     @shortcuts = [
@@ -182,7 +196,6 @@ class ApplicationController < ActionController::Base
       end
     end
     
-    private
     
     def user_id
       session[:user_id]

data/app/controllers/periods_controller.rb

@@ -36,6 +36,9 @@ class PeriodsController < ApplicationController
     if @selected_task.nil?
       @selected_task = @period.open_tasks.first
     end
+    # TODO (uwe): Switch to use cookie since the same behavior should work on next session.
+    # TODO (uwe): Problem: Cannot read cookie in the same request it was written...
+    @show_only_grabbed_tasks = session['show_only_grabbed_tasks'] == 'true'
     load_tasks(@period)
   end
   

data/app/controllers/tasks_controller.rb

@@ -1,7 +1,7 @@
 class TasksController < ApplicationController
-  skip_before_filter :populate_layout, :except => [:edit, :list_started, :move_down, :move_to_bottom, :move_to_top, :move_up, :new, :specify]
+  skip_before_filter :populate_layout, :except => [:edit, :grab, :list_started, :move_down, :move_to_bottom, :move_to_top, :move_up, :new, :specify]
   
-  verify :method => :post, :except => [ :new, :show, :edit, :list_started, :move_to_next_period, :notes],
+  verify :method => :post, :except => [ :new, :show, :edit, :grab, :list_started, :move_to_next_period, :notes],
   :redirect_to => { :controller => 'backlogs' }
   
   def list_started

data/app/controllers/user_controller.rb

@@ -24,9 +24,9 @@ class UserController < ApplicationController
   def signup
     return if generate_blank_form
     params['user'].delete('form')
-    @user = User.new(params['user'])
     begin
       User.transaction do
+        @user = User.new(params['user'])
         @user.password_needs_confirmation = true
         if @user.save
           key = @user.generate_security_token
@@ -88,7 +88,7 @@ class UserController < ApplicationController
           url = url_for(:action => 'change_password')
           url += "?user[id]=#{user.id}&key=#{key}"
           UserNotify.deliver_forgot_password(user, url)
-          flash['notice'] = "Instructions on resetting your password have been emailed to #{CGI.escapeHTML(params['user']['email'])}."
+          flash[:notice] = "Instructions on resetting your password have been emailed to #{CGI.escapeHTML(params['user']['email'])}."
           unless authenticated_user?
             redirect_to :action => 'login'
             return

data/app/controllers/work_accounts_controller.rb

@@ -19,6 +19,7 @@ class WorkAccountsController < ApplicationController
     @task_totals = works.to_summarized_hash {|work| [work.task, work.hours]}
     @task_totals_per_backlog = @task_totals.to_a.to_grouped_hash {|task, hours| [task && task.backlog, [task, hours]]}
     @total_hours = works.inject(BigDecimal('0')) {|total, work| total += work.hours}
+    @works_without_backlog = works.select {|w| w.task_id.nil?}
   end
 
   def new
@@ -53,4 +54,17 @@ class WorkAccountsController < ApplicationController
     WorkAccount.find(params[:id]).destroy
     redirect_to :action => 'list'
   end
+
+  def works
+    work_account = WorkAccount.find(params[:id])
+    @report_filter = ReportFilter.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')}"
+    @works = Work.paginate :conditions => ["completed_at BETWEEN ? AND ? AND work_account_id = ?", @report_filter.start_on, @report_filter.end_on, work_account.id], :page => params[:page], :per_page => @report_filter.page_size
+    if params[:export] == 'excel'
+      render :template => '/works/list_excel', :layout => false
+    else
+      render :template => '/works/list'
+    end
+  end
+  
 end

data/app/controllers/works_controller.rb

@@ -5,7 +5,7 @@ class WorksController < ApplicationController
   in_place_edit_for :work, :completed_at_time
   skip_before_filter :populate_layout, :except => [:create, :destroy, :edit, :index, :list, :new, :show, :update, :daily_work_sheet, :weekly_work_sheet_by_work_account]
   auto_complete_for :work, :description
-  
+
   def index
     list
     render :action => 'list'
@@ -49,6 +49,14 @@ class WorksController < ApplicationController
         account = WorkAccount.find_by_name(account_name)
         params[:work][:work_account_id] = account.id
       end
+      customer_name = params[:work].delete(:customer_name)
+      if customer_name && customer_name.size > 0
+        customer = Customer.find_by_name(customer_name)
+        if (customer.nil? )
+          customer = Customer.create!(:name => customer_name)
+        end
+        params[:work][:customer_id] = customer.id
+      end
     end
     convert_hours_param
     convert_start_time_param
@@ -95,8 +103,11 @@ class WorksController < ApplicationController
   def update_row
     update_work
     flash.discard
-    @field = params[:field] || 'started_at_time'
+    @next_field = params[:next_field] || 'work_account_name'
     @work_accounts = WorkAccount.find(:all, :order => :name)
+    @customers = Customer.find(:all, :order => :name)
+    works = Work.find_work_for_day((@work.started_at || @work.completed_at).to_date)
+    @day_total = works.inject(BigDecimal('0')){|total,work|total+=work.hours}
   end
   
   def update_time
@@ -107,7 +118,6 @@ class WorksController < ApplicationController
   
   def update_work
     @work = Work.find(params[:id])
-    convert_start_time_param
     convert_hours_param
     if @work.update_attributes(params[:work])
       flash[:notice] = 'Work was successfully updated.'
@@ -137,6 +147,7 @@ class WorksController < ApplicationController
     @date = (params[:id] && Date.parse(params[:id])) || Date.today
     @periods = []
     @works = Work.find_work_for_day @date
+    @customers = Customer.find(:all, :order => :name)
     @started_works = Task.find_started
     @work = Work.new(:started_at => Time.now, :completed_at => Time.now)
     @work_accounts = WorkAccount.find(:all, :order => :name)
@@ -182,6 +193,15 @@ class WorksController < ApplicationController
     render :partial => '/work_accounts/name_list'
   end
   
+  def auto_complete_for_work_customer_name
+    @customers = Customer.find(:all, 
+                              :conditions => [ 'LOWER(name) LIKE ?',
+    '%' + params[:work][:customer_name].downcase + '%' ], 
+    :order => 'name ASC',
+    :limit => 16)
+    render :partial => '/customers/name_list'
+  end
+  
   def auto_complete_for_work_backlog_name
     @backlogs = Backlog.find(:all, 
                              :conditions => [ 'LOWER(name) LIKE ?',

data/app/models/report_filter.rb

@@ -5,17 +5,21 @@ class ReportFilter
   attr_reader :page_size
   
   def initialize(attributes)
+    @start_on = Date.civil(2007, 01, 01)
+    @end_on = Date.today
+    @page_size = 1000
+
     if attributes
       attributes = attributes.clone
       
       start_on_param = attributes.delete(:start_on)
-      @start_on = start_on_param && start_on_param.size > 0 ? Date.parse(start_on_param) : Date.civil(2007, 01, 01)
+      @start_on = Date.parse(start_on_param) if start_on_param && start_on_param.size > 0
       
       end_on_param = attributes.delete(:end_on)
-      @end_on = end_on_param && end_on_param.size > 0 ? Date.parse(end_on_param) : Date.today
+      @end_on = Date.parse(end_on_param) if end_on_param && end_on_param.size > 0
       
       page_size_param = attributes.delete(:page_size)
-      @page_size = page_size_param.to_i > 0 ? page_size_param.to_i : 1000
+      @page_size = page_size_param.to_i if page_size_param.to_i > 0
       
       raise "Unknown parameters: #{attributes.inspect}" unless attributes.empty?
     end

data/app/models/task.rb

@@ -57,7 +57,7 @@ class Task < ActiveRecord::Base
     end
     conditions = "completed_at IS NULL AND (user_id IS NULL#{user_clause})"
     Work.find(:all, :conditions => conditions).map {|work| work.task}.compact.sort_by do |t|
-      [t.root_task.backlog.name, t.root_task.period.end_on, t.position || 0]
+      [t.root_task.backlog.name, t.root_task.period ? t.root_task.period.end_on : 0, t.position || 0]
     end
   end
   
@@ -344,21 +344,22 @@ class Task < ActiveRecord::Base
   def start_work
     return if work_started?
     open
+    grab if current_user
     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 current_user
-        last_work = current_user.works.select {|w| w.completed_at}.last
-      else
-        last_work = Work.find(:first, :conditions => 'completed_at IS NOT NULL', :order => 'completed_at DESC')
-      end
-      if last_work && last_work.completed_at > new_work.started_at
-        new_work.started_at = last_work.completed_at
-      end
-
+    if current_user
+      last_work = current_user.works.select {|w| w.completed_at}.last
+    else
+      last_work = Work.find(:first, :conditions => 'completed_at IS NOT NULL', :order => 'completed_at DESC')
+    end
+    if last_work && last_work.completed_at > new_work.started_at
+      new_work.started_at = last_work.completed_at
+    end
+    
     new_work.user = current_user
     new_work.work_account_id = work_account.id
     new_work.save!

data/app/models/work.rb

@@ -110,8 +110,9 @@ class Work < ActiveRecord::Base
   end
   
   def started_at_time=(new_value)
-    raise "invalid time format: #{new_value}" unless new_value =~ /(\d{2}):(\d{2})/
-    new_hour, new_minutes = $1, $2
+    new_value = '0:00' if new_value == ''
+    raise "invalid time format: #{new_value}" unless new_value =~ /(\d{0,2}):(\d{2})/
+    new_hour, new_minutes = $1.to_i, $2.to_i
     t = started_at || Time.now
     self.started_at = Time.local(t.year, t.month, t.day, new_hour, new_minutes)
   end

data/app/views/customers/_name_list.rhtml

@@ -0,0 +1,5 @@
+<ul class="backlogs">
+<% for customer in @customers do -%>
+  <li class="task"><div class="name"><%=h customer.name %></div></li>
+<% end -%>
+</ul>

data/app/views/periods/_show_active.rhtml

@@ -36,6 +36,7 @@ function handleEvent(field, event, id) {
     <%=render :partial => '/tasks/fields_header', :locals => { :backlog => nil, :active => true, :track_todo => @tasks.find {|t|t.period && t.period.active?}, :track_times => @tasks.find {|t|t.period && t.period.active?}, :track_done => @tasks.find {|t|t.period && t.period.active? }, :work_done => @tasks.find {|t| t.total_done > 0} } %>
 	<ul id="active_tasks_<%=@period.id%>" class="task_list">
 		<% for task in @tasks -%>
+			<% next if @show_only_grabbed_tasks && !(task.users.empty? || task.users.include?(current_user))%>
   			<%=render :partial => '/tasks/task', :locals => { :task => task, :i => i, :active => true, :highlight_task => task == @selected_task, :update => :spotlight, :show_backlog => true, :hidden => false } %>
   			<% i += 1 %>
   		<% end -%>

data/app/views/periods/_title.rhtml

@@ -7,5 +7,12 @@
 
         <%=if @period.higher_item then link_to(image_tag(url_for("arrow_left.png"), :alt => "#{l :previous} #{l :period}", :title => "#{l :previous} #{l :period}", :class => 'image-submit'), :controller => 'periods', :action => :show, :id => @period.higher_item) end%>
         <%=unless @period.passed? then detour_to(image_tag(url_for("add.png"), :alt => l(:add_task), :title => l(:add_task), :class => 'image-submit'), :controller => 'tasks', :action => 'new', :task => {:period_id => (@period ? @period.id : (@backlog && @backlog.periods.first ? @backlog.periods.first.id : nil))} ) end %>
-        <h4><%=h @period.name %> (<%=@period.start_on%> - <%=@period.end_on%>)</h4>
+        <h4><%=h @period.name %> (<%=@period.start_on%> - <%=@period.end_on%>)
+			<% filter_style = {:style => 'float: none; vertical-align: bottom'} %>
+			<% if @show_only_grabbed_tasks %>
+	            <%=image_link_to('grab.png', l(:release_task), {'cookies[show_only_grabbed_tasks]' => 'false'}, filter_style, false)%>
+			<% else %>
+	    	    <%=image_link_to('grab_gray.png', l(:grab_task), {'cookies[show_only_grabbed_tasks]' => 'true'}, filter_style, false)%>
+			<% end %>
+		</h4>
       </div>

data/app/views/periods/edit.rhtml

@@ -4,7 +4,7 @@
 <% form_tag :action => 'update', :id => @period do %>
   <%= render :partial => 'form' %>
   <%= submit_tag l(:save) %>
-  <%= link_to l(:back), :action => 'show', :id => @period %>
+  <%=back_or_link_to l(:back), :action => 'show', :id => @period %>
 <% end %>
 
 </div>

data/app/views/periods/order.rjs

@@ -1 +0,0 @@
-record page, 'alert("hi");'

data/app/views/tasks/_task.rhtml

@@ -75,9 +75,10 @@
             <% else -%>
               <%=@task.todo %>
             <% end -%>
-          <% end -%>
-          <% if (not @task.track_times?) && !@task.work_started? && (@task.period.nil? || @task.period.active?) %>
-            <%=image_link_to_remote('checkmark.png', l(:complete), {:action => :finish_task, :id => @task}, nil, true)%>
+		  <% else %>
+          	<% if !@task.work_started? && (@task.period.nil? || @task.period.active?) %>
+            	<%=image_link_to_remote('checkmark.png', l(:complete), {:action => :finish_task, :id => @task}, nil, true)%>
+          	<% end -%>
           <% end -%>
       <% end -%>
     </div>
@@ -87,9 +88,9 @@
             <% unless @task.work_started? -%>
 			  <% if @task.backlog.enable_users? %>
 			  	<% if @task.users.include?(current_user) %>
-	              <%=image_link_to_remote('grab.png', l(:grab_task), with_detour({:controller => 'tasks', :action => :release, :id => @task}), nil, true)%>
+	              <%=image_link_to_remote('grab.png', l(:release_task), with_detour({:controller => 'tasks', :action => :release, :id => @task}), nil, true)%>
 			  	<% else %>
-	              <%=image_link_to_remote('grab_gray.png', l(:grab_task), with_detour({:controller => 'tasks', :action => :grab, :id => @task}), nil, true)%>
+	              <%=image_link_to_remote('grab_gray.png', "#{l:grab_task} #{" (#{l :not_grabbed})" if @task.users.empty?}", with_detour({:controller => 'tasks', :action => :grab, :id => @task}), nil, true)%>
 			  	<% end %>
 			  <% end %>
               <%=image_link_to_remote('arrow_right.png', l(:move_to_next_period), {:action => :move_task_to_next_period, :id => @task}, nil, true) if @task.backlog.enable_periods? || @task.period_id%>

data/app/views/user/login.rhtml

@@ -2,7 +2,7 @@
 
 <div title="<%= title_helper %>" class="form">
   <div class="form-padding">
-    <% form_for :user do |f| %>
+    <% form_for :user, :html => {:id => 'loginForm'} do |f| %>
       <table>
         <tr class="two_columns">
           <td class="prompt"><label>Login:</label></td>

data/app/views/work_accounts/_title.rhtml

@@ -0,0 +1,4 @@
+    <div class="btitle">
+        <%=image_detour_to('hammer.png', l(:work), :action => :works, :id => @work_account) %>
+        <h4><%=@work_account.name %></h4>
+    </div>

data/app/views/work_accounts/edit.rhtml

@@ -1,9 +1,7 @@
 <% @page_title = "#{l(:editing)} #{l(:work_account)}" %>
 
 <div id="spotlight">
-    <div class="btitle">
-		<h4><%=@work_account.name%></h4>
-    </div>
+	<%=render :partial => 'title'%>
 
 <% form_tag :action => 'update', :id => @work_account do %>
   <%=render :partial => 'form' %>

data/app/views/work_accounts/list.rhtml

@@ -1,4 +1,10 @@
-<h1>Listing work_accounts</h1>
+<% @page_title = "#{l :work_accounts}"%>
+
+<div id="spotlight">
+    <div class="btitle">
+		<%=image_detour_to 'add.png', l(:new_work_account), :action => 'new' %>
+		<h4><%=@page_title%></h4>
+    </div>
 
 <table>
   <tr>
@@ -21,6 +27,6 @@
 
 <%=will_paginate @work_accounts %>
 
-<br />
+  <%=back_or_link_to l(:back), :controller => 'welcome', :action => 'index' %>
 
-<%= link_to 'New work_account', :action => 'new' %>
+</div>

data/app/views/work_accounts/show.rhtml

@@ -1,33 +1,50 @@
 <% @page_title = "#{l(:work_account)} #{l(:work_account)}" %>
-
 <div id="spotlight">
-    <div class="btitle">
-		<h4><%=@work_account.name%></h4>
-    </div>
-
-  <table>
-  	<% for backlog in @backlog_totals.keys %>
-  		<tr>
-  			<th><%=backlog ? backlog.name : l(:no_backlog)%></th>
-			<th><%=@backlog_totals[backlog]%></th>
-  		</tr>
-  		<% for task, hours in @task_totals_per_backlog[backlog] %>
-  		<tr>
-  			<td>
-  				<% if task %>
-				  <%=link_to task.description, :controller => 'tasks', :action => :edit, :id => task.id %>
-				<% end %>
-			</td>
-			<td align="right" valign="top"><%='%.2f' % hours%></td>
-  		</tr>
-		<% end %>
-	<% end %>
-  	<tr>
-  		<th>Total hours</th>
-		<th><%=@total_hours%></th>
-  	</tr>
-  </table>
-
-	<%= link_to 'Edit', :action => 'edit', :id => @work_account %> |
-	<%= link_to 'Back', :action => 'list' %>
+	<%=render :partial => 'title'%>
+    <table>
+        <% for backlog in @backlog_totals.keys %>
+        <tr>
+            <th>
+                <%=backlog ? backlog.name : l(:no_backlog) %>
+            </th>
+            <th>
+                <%=@backlog_totals[backlog] %>
+            </th>
+        </tr>
+        <% if backlog %>
+        <% for task, hours in @task_totals_per_backlog[backlog] %>
+        <tr>
+            <td>
+                <% if task %>
+                <%=link_to task.description, :controller => 'tasks', :action => :edit, :id => task.id %>
+                <% end %>
+            </td>
+            <td align="right" valign="top">
+                <%='%.2f' % hours %>
+            </td>
+        </tr>
+        <% end %>
+        <% else %>
+        <% for work in @works_without_backlog %>
+        <tr>
+            <td>
+                <%=work.description %>
+            </td>
+            <td align="right" valign="top">
+                <%='%.2f' % work.hours %>
+            </td>
+        </tr>
+        <% end %>
+        <% end %>
+        <% end %>
+        <tr>
+            <th>
+                Total hours
+            </th>
+            <th>
+                <%=@total_hours %>
+            </th>
+        </tr>
+    </table>
+    <%=detour_to l(:edit), :action => 'edit', :id => @work_account %>|<%=back_or_link_to l(:back), :action => 'list' %>
 </div>