backlog 0.31.1 → 0.32.0

data/History.txt

@@ -1,3 +1,27 @@
+== 0.32.0 2008-05-06
+
+== Features
+
+* Added filtering on work account to work search view.
+* Added "Sick child" as absence reason in the daily work sheet.
+* Added navigating to work records for a user from the subscription list in the user view.
+
+=== Fixes
+
+* Fixed wrong parsing of one-digit minutes for work duration.
+* Reformatted the Excel export of work records for a work account.
+  Also added sorting by user, task, start and stop times.
+  Should work with MS Excel now.
+* Set default search dates for work to current month.
+* Keep user_id when following links from the weekly work sheet to the daily work sheet.
+  This enables subscribers of time sheets to get details about the time sheets they are watching.
+* Added a "Back" link from weekly work sheet.
+* Indent subtasks in the sprint view.
+* Fixed bug in work lock subscription invitation.
+* Fixed so that partially filled in work records are retained after failed creation.
+  Also error messages for failed work record creations are displayed.
+* Fixed design of the "New Work Account" view, and set focus on the "Name" field when it is first loaded.
+
 == 0.31.1 2008-04-24
 
 === Fixes

data/Rakefile

@@ -14,6 +14,8 @@ require 'tasks/rails'
 require 'hoe'
 require 'version_from_history'
 
+ENV['SKIP_AR_JDBC_RAKE_REDEFINES'] = '1'
+
 Hoe.new("backlog", APP::VERSION) do |p|
   p.rubyforge_name = "backlog"
   p.summary = "Application to aid collecting, processing, organizing, reviewing and doing tasks."

data/app/controllers/user_controller.rb

@@ -217,6 +217,7 @@ class UserController < ApplicationController
     @groups = Group.find(:all, :order => 'name')
     @periods = @user.periods
     @associates = User.find(:all) - @user.work_lock_subscribers - [current_user]
+    @potential_subscribees = User.find(:all) - @user.work_lock_subscriptions - [current_user]
     absences = Absence.find(:all, :conditions => ['user_id = ? AND "on" BETWEEN ? AND ?', current_user.id, Date.new(Date.today.year, 1, 1), Date.new(Date.today.year, 12, 31)])
     @holidays = absences.select {|a| a.reason == 'HOLIDAY'}
     @holidays.map! {|a| a.on}

data/app/controllers/work_accounts_controller.rb

@@ -55,19 +55,4 @@ class WorkAccountsController < ApplicationController
     redirect_to :action => 'list'
   end
 
-  def works
-    work_account = WorkAccount.find(params[:id])
-    @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')}"
-    @works = Work.paginate :conditions => ["completed_at BETWEEN ? AND ? AND 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 + 1, work_account.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'
-    @users = User.find(:all)
-    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

@@ -8,7 +8,6 @@ class WorksController < ApplicationController
   
   def index
     list
-    render :action => 'list'
   end
   
   # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
@@ -16,8 +15,21 @@ class WorksController < ApplicationController
   :redirect_to => { :action => :list }
   
   def list
+    work_account_name = (params[:work_account_id] && WorkAccount.find(params[:work_account_id]).name) || 'all accoutns'
+    @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')}"
     @period = params[:id] && Period.find(params[:id])
-    @works = Work.paginate :order => 'completed_at', :page => params[:page]
+    @works = Work.paginate :conditions => ["completed_at 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 + 1, @report_filter.work_account_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)
+    @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]}
+      render :template => '/works/list_excel', :layout => false
+    else
+      render :template => '/works/list'
+    end
   end
   
   def show
@@ -63,6 +75,7 @@ class WorksController < ApplicationController
     else
       if params[:detour]
         flash[:notice] = 'Error creating new work record.'
+        flash[:work] = @work
         back
       else
         new
@@ -180,13 +193,14 @@ class WorksController < ApplicationController
     @date = (params[:id] && Date.parse(params[:id])) || Date.today
     @year = @date.year
     @week = @date.cweek
+    @user = (params[:user_id] && User.find(params[:user_id])) || current_user
     @periods = []
-    @works = Work.find_work_for_day @date
+    @works = Work.find_work_for_day(@date, @user)
     @customers = Customer.find(:all, :order => :name)
     @started_works = Task.find_started
-    @work = Work.new(:started_at => Time.now, :completed_at => Time.now)
+    @new_work = flash[:work] || Work.new(:started_at => Time.now)
     @work_accounts = WorkAccount.find(:all, :order => :name)
-    @absence = Absence.find(:first, :conditions => {:on => @date, :user_id => current_user.id})
+    @absence = Absence.find(:first, :conditions => {:on => @date, :user_id => @user.id})
     @public_holiday = PublicHoliday.find(:first, :conditions => {:on => @date})
     render :layout => 'wide'
   end
@@ -209,7 +223,7 @@ class WorksController < ApplicationController
     @first_date = Date.commercial(@year, @week, 1)
     @last_date = @first_date + 6
     @lock = WorkLock.find_by_week(@year, @week)
-    @absences = Absence.find_by_week(@year, @week)
+    @absences = Absence.find_by_week(@year, @week, @user)
     @public_holidays = PublicHoliday.find_by_week(@year, @week)
     render :layout => 'wide'
   end
@@ -302,8 +316,8 @@ class WorksController < ApplicationController
       end
       if params[:work][:hours_time] =~ /^(\d*):(\d{2})?$/
         new_hours = $1
-        new_minutes = $2.to_i
-        new_value_str = "#{new_hours}.#{(new_minutes / 0.6).round}"
+        new_minutes = BigDecimal($2)
+        new_value_str = '%02d.%03d' % [new_hours, (new_minutes / BigDecimal('0.06')).round]
         new_value = BigDecimal(new_value_str)
         params[:work][:hours] = new_value
       elsif params[:work][:hours_time] =~ /^(\d*)[.,]?(\d*)$/

data/app/helpers/application_helper.rb

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

data/app/models/absence.rb

@@ -17,10 +17,10 @@ class Absence < ActiveRecord::Base
   end
   
   # Return an array of either an absence or nil for each day of the given week.
-  def self.find_by_week(year, week)
+  def self.find_by_week(year, week, user = current_user)
     first_date = Date.commercial(year, week, 1)
     last_date = first_date + 6
-    results = self.find(:all, :conditions => ['"on" BETWEEN ? AND ? AND user_id = ?', first_date, last_date, current_user && current_user.id], :order => '"on"')
+    results = self.find(:all, :conditions => ['"on" BETWEEN ? AND ? AND user_id = ?', first_date, last_date, user && user.id], :order => '"on"')
     (0..6).each do |day|
       results.insert(day, nil) if results[day] && results[day].on > first_date + day
     end

data/app/models/report_filter.rb

@@ -5,8 +5,9 @@ class ReportFilter
   attr_reader :page_size
   
   def initialize(attributes)
-    @start_on = Date.civil(2007, 01, 01)
-    @end_on = Date.today
+    date = Date.today - 5
+    @start_on = Date.civil(date.year, date.month, 01)
+    @end_on   = Date.civil(date.year, date.month, -1)
     @page_size = 1000
 
     if attributes

data/app/models/user.rb

@@ -9,6 +9,7 @@ class User < Party
   # even if they follow the defaults since ClassTableInheritanceInRails breaks it.
   has_and_belongs_to_many :groups, :join_table => "groups_users", :foreign_key => "user_id", :association_foreign_key => 'group_id'
   has_and_belongs_to_many :work_lock_subscribers, :class_name => 'User', :join_table => "user_work_lock_subscriptions", :foreign_key => "user_id", :association_foreign_key => 'subscriber_user_id'
+  has_and_belongs_to_many :work_lock_subscriptions, :class_name => 'User', :join_table => "user_work_lock_subscriptions", :association_foreign_key => "user_id", :foreign_key => 'subscriber_user_id'
   has_many :works, :foreign_key => :user_id, :order => :completed_at
   has_many :work_locks, :foreign_key => :user_id, :order => :end_on
 

data/app/models/work.rb

@@ -103,8 +103,8 @@ class Work < ActiveRecord::Base
     totals_per_work_account
   end
   
-  def self.find_work_for_day date
-    Work.find(:all, :conditions => "started_on = '#{date}' AND user_id = #{current_user.id}",
+  def self.find_work_for_day(date, user = current_user)
+    Work.find(:all, :conditions => "started_on = '#{date}' AND user_id = #{user.id}",
     :order => 'start_time, completed_at')
   end
   

data/app/models/works_report_filter.rb

@@ -1,14 +1,19 @@
 class WorksReportFilter < ReportFilter
+  attr_reader :work_account_id
   attr_reader :invoice
   attr_reader :user_id
   
   def initialize(attributes)
+    @work_account_id = nil
     @invoice = nil
     @user_id = nil
 
     if attributes
       attributes = attributes.clone
       
+      work_account_id_param = attributes.delete(:work_account_id)
+      @work_account_id = work_account_id_param.to_i if work_account_id_param && work_account_id_param.size > 0
+      
       invoice_param = attributes.delete(:invoice)
       @invoice = invoice_param == 'true' if invoice_param && invoice_param.size > 0
       

data/app/views/periods/_show_active.rhtml

@@ -35,9 +35,13 @@ function handleEvent(field, event, id) {
 <div id="active_tasks"<%=' style="display: none;"' unless @tasks and not @tasks.empty?%>>
     <%=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">
+		<% max_depth = @tasks.map{|t|t.depth}.max %>
 		<% 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 } %>
+  			<%=render :partial => '/tasks/task', :locals => { :task => task, :i => i, 
+					:active => true, :highlight_task => (task == @selected_task), 
+					:update => :spotlight, :show_backlog => true, :hidden => false,
+					:max_depth => max_depth} %>
   			<% i += 1 %>
   		<% end -%>
     </ul>

data/app/views/tasks/_task.rhtml

@@ -3,14 +3,13 @@
     <div style="float: left" style="border: 0px">
     <% if @task.enable_subtasks? && active && (@task.period.nil? || @task.period.active_or_future?) %>
       <% form_tag({:controller => 'tasks', :action => :specify, :id => @task}) do %>
-        <%= image_button_to('add.png', l(:specify), :controller => 'tasks', :action => :specify, :id => @task.id)%>
+        <%=image_button_to('add.png', l(:specify), {:controller => 'tasks', :action => :specify, :id => @task.id}, 
+        		:style => "margin-left: #{@task.depth * 2}em") %>
       <% end %>
     <% end %>
     </div>
     <div style="float: left" style="border: 3px solid red">
-      <%=("&nbsp;" * @task.depth * 4) if @task.depth > 0 %>
       <%=resolution_image(@task.resolution) if @task.finished_at %>
-      <%="-" if @task.children.size > 0 %>
     </div>
 	<div id="task_<%=@task.id%>_id" class="task_id">
    		<%=detour_to "##{@task.id}", :controller => 'tasks', :action => :edit, :id => @task.id, :style => 'border: 0px; margin: 0px; padding: 0px' if @task.position || @task.depth == 0 %>

data/app/views/user/edit.rhtml

@@ -53,6 +53,7 @@
 <div id="lfeature">
   <div class="btitle">
     <h4><%=l :work_lock_subscriptions %></h4>
+    <h3>Users watching <%=@user.name%></h4>
   </div>
 
 	<% if @user == current_user %>
@@ -67,10 +68,11 @@
 			<% end %>
 			<% unless @associates.empty? %>
 			<tr>
-				<% remote_form_for :user, :url => {:action => :invite_work_lock_subscriber} do |f| %>
-					<td align="right"><%=select :id, nil, @associates.map{|u| [u.name, u.id]}, {}, :name => 'id'%></td>
-					<td align="left"><%=submit_tag l(:invite)%></td>
-				<% end %>
+					<td align="right">
+						<% remote_form_for :user, :html => {:id => 'invitation_form'}, :url => {:action => :invite_work_lock_subscriber} do |f| %>
+							<%=select :id, nil, @associates.map{|u| [u.name, u.id]}, {}, :name => 'id'%></td>
+						<% end %>
+					<td align="left"><%=button_to_function l(:invite), "new Ajax.Request('/user/invite_work_lock_subscriber', {asynchronous:true, evalScripts:true, parameters:Form.serialize($('invitation_form'))});" %></td>
 			</tr>
 			<% end %>
 		</table>
@@ -80,6 +82,36 @@
 	<% end %>
 </div>
 
+<div id="rfeature">
+  <div class="btitle">
+    <h4><%=l :work_lock_subscriptions %></h4>
+    <h3><%=@user.name%> is monitoring</h4>
+  </div>
+
+	<% if @user == current_user %>
+		<table align="right">
+			<% unless @user.work_lock_subscriptions.empty? %>
+				<% for subscribee in @user.work_lock_subscriptions %>
+					<tr>
+						<td align="right"><%=detour_to subscribee.name, :action => :edit, :id => subscribee.id %></td>
+						<td align="left"><%=image_link_to 'work_account.png', "#{l :work}", {:controller => 'works', :action => :weekly_work_sheet, :user_id => subscribee.id} %></td>
+						<td align="left"><%=image_link_to_remote 'email.png', "#{l :stop} #{l :monitoring}", {:action => :toggle_work_lock_monitoring, :subscriber_id => current_user.id, :id => subscribee.id}, :id => "work_lock_monitor_icon_#{subscribee.id}"%></td>
+					</tr>
+				<% end %>
+			<% end %>
+			<% unless @potential_subscribees.empty? %>
+			<tr>
+					<td align="right">
+						<% remote_form_for :user, :html => {:id => 'monitoring_form'}, :url => {:action => :invite_work_lock_subscriber} do |f| %>
+							<%=select :id, nil, @potential_subscribees.map{|u| [u.name, u.id]}, {}, :name => 'id'%></td>
+						<% end %>
+					<td align="left"><%=button_to_function l(:monitor), "new Ajax.Request('/user/toggle_work_lock_monitoring', {asynchronous:true, evalScripts:true, parameters:Form.serialize($('monitoring_form'))});" %></td>
+			</tr>
+			<% end %>
+		</table>
+	<% end %>
+</div>
+
 <div id="lfeature">
   <div class="btitle">
     <h4><%=l :holidays_used %></h4>

data/app/views/work_accounts/_form.rhtml

@@ -1,6 +1,5 @@
 <%= error_messages_for 'work_account' %>
 
-<!--[form:work_account]-->
 <p><label for="work_account_name">Name</label><br/>
 <%= text_field 'work_account', 'name'  %></p>
 
@@ -11,5 +10,7 @@
 
 <p><label for="work_account_invoice_code">Invoice code</label><br/>
 <%= text_field 'work_account', 'invoice_code'  %></p>
-<!--[eoform:work_account]-->
 
+<%=javascript_tag update_page { |page|
+	page[:work_account_name].focus
+} %>

data/app/views/work_accounts/edit.rhtml

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

data/app/views/work_accounts/list.rhtml

@@ -15,7 +15,7 @@
   
 <% for work_account in @work_accounts %>
   <tr>
-    <td><%=link_to h(work_account.name), :action => 'show', :id => work_account %></td>
+    <td><%=link_to h(work_account.name), :controller => 'works', :action => :list, :report_filter => {:work_account_id => work_account.id} %></td>
     <td align="right"><%=work_account.track_times? %></td>
     <td><%=h(work_account.invoice_code) %></td>
     <td><%= link_to 'Edit', :action => 'edit', :id => work_account %></td>

data/app/views/work_accounts/new.rhtml

@@ -1,8 +1,10 @@
-<h1>New work_account</h1>
+<% @page_title = "#{l :new_work_account}" %>
 
+<div id="spotlight">
 <% form_tag :action => 'create' do %>
   <%= render :partial => 'form' %>
   <%= submit_tag "Create" %>
 <% end %>
 
 <%= link_to 'Back', :action => 'list' %>
+</div>

data/app/views/works/_new_row.rhtml

@@ -106,7 +106,7 @@
 		  	return false;
 		  }
         }", 
-				:value => @work && @work.completed_at_time.strftime('%H:%M')
+				:value => @work && @work.completed_at && @work.completed_at_time.strftime('%H:%M')
 		%>
 	</td>
     <td align="right" valign="bottom">

data/app/views/works/daily_work_sheet.rhtml

@@ -1,4 +1,4 @@
-<% @page_title = "#{l :daily_work_sheet} on #{@date}" + (" for #{user.login}" if user?) %>
+<% @page_title = "#{l :daily_work_sheet} on #{@date}" + (" for #{@user.name}" if user?) %>
 
 <div id="spotlight">
 
@@ -21,6 +21,7 @@
 					<%=f.radio_button :reason, '', :disabled => work_disabled, :checked => @absence.nil? && (!@works.empty? || @public_holiday.nil?), :onchange => 'form.submit()' %><label for="absence_reason_">Work day</label>
 					<%=f.radio_button :reason, 'HOLIDAY', :disabled => absence_disabled, :onchange => 'form.submit()' %><label for="absence_reason_holiday"><%=l :holiday%></label>
 					<%=f.radio_button :reason, 'SICK', :disabled => absence_disabled, :onchange => 'form.submit()' %><label for="absence_reason_sick">Sick day</label>
+					<%=f.radio_button :reason, 'SICK_CHILD', :disabled => absence_disabled, :onchange => 'form.submit()' %><label for="absence_reason_sick_child">Sick child</label>
 					<%=f.radio_button :reason, 'SICK_WITH_DOCTOR', :disabled => absence_disabled, :onchange => 'form.submit()' %><label for="absence_reason_sick_with_doctor">Sick day with doctor's note</label>
 				<% end %>
 			</div>
@@ -64,7 +65,7 @@
 <% last_work = @work %>
 
 <% unless @absence %>
-<% @work = nil %>
+  <% @work = @new_work %>
   <%=render :partial => 'new_row', :locals => {:last_work => last_work} %>
 <% end %>
 
@@ -97,7 +98,7 @@
 <script type="text/JavaScript">
 //<!--
 var start_field;
-<% if last_work.completed_at %>
+<% if last_work.nil? || last_work.completed_at %>
 	start_field = $('work_work_account_id');
 <% else %>
 	start_field = $('work_<%=last_work.id%>_completed_at_time');

data/app/views/works/list.rhtml

@@ -7,6 +7,14 @@
 <% if @report_filter %>
 	<% form_for :report_filter, :html => {:method => :get} do |f| %>
 		<table>
+			<tr>
+				<td coslpan="3">
+					<label for="report_filter_work_account_id"><%=l :work_account%></label>
+				</td>
+				<td>
+					<%=f.select :work_account_id, [[l(:all), nil]] + @work_accounts.map{|wa|[wa.name, wa.id]}, {}, {:onchange => 'form.submit()'} %>
+				</td>
+			</tr>
 			<tr>
 				<td>
 	<label for="report_filter_start_on"><%=l :start_on%></label>
@@ -91,9 +99,9 @@
 
 <table>
   <tr>
-    <th><%=l :task %></th>
     <th><%=l :user %></th>
     <th><%=l :done %></th>
+    <th><%=l :description %></th>
     <th><%=l :invoice %></th>
   <% if @period && @period.track_times? %>
     <th><%=l :started_at %></th>
@@ -103,23 +111,26 @@
   
 <% for work in @works %>
   <tr>
-    <td><%=work.task.description if work.task %></td>
-    <td><%=work.user && work.user.login %></td>
-    <td><%=work.hours %></td>
+    <td valign="top"><%=work.user && work.user.login %></td>
+    <td valign="top"><%=work.hours %></td>
+	<%if work.task 
+		link = "Task: #{work.task.description} <br/>"
+	else
+		link = ""
+     end
+	link += h(work.description)
+	%>
+    <td><%= link_to link, :controller => 'works', :action => 'daily_work_sheet', :id => work.started_on.strftime("%Y-%m-%d") %></td>
     <td><%=work.invoice ? l(:yes) : '' %></td>
   <% if @period && @period.track_times? %>
     <td><%=work.started_at && work.started_at.strftime('%Y-%m-%d %H:%M:%S') %></td>
   <% end %>
-    <td><%=work.completed_at && work.completed_at.strftime('%Y-%m-%d %H:%M:%S') %></td>
-    <td><%= link_to 'Show', :controller => 'works', :action => 'show', :id => work %></td>
-    <td><%= link_to 'Edit', :controller => 'works', :action => 'edit', :id => work %></td>
-    <td><%= link_to 'Destroy', { :controller => 'works', :action => 'destroy', :id => work }, :confirm => 'Are you sure?', :method => :post %></td>
-  </tr>
+    <td valign="top"><%=work.completed_at && work.completed_at.strftime('%Y-%m-%d %H:%M:%S') %></td>
+    <tr>
 <% end %>
 	<tr>
 		<th><%=l :total%>:</th>
-		<td/>
-		<th><%=@works.inject(BigDecimal('0')){|total, work| total += work.hours}%> <%=l(:hours).downcase%></td>
+		<th colspan="2"><%=@works.inject(BigDecimal('0')){|total, work| total += work.hours}%> <%=l(:hours).downcase%></td>
 	</tr>
 </table>
 
@@ -136,4 +147,4 @@
 
 <% if @period %>
 <%=render :partial => '/periods/burn_down_chart' %>
-<% end %>
+<% end %>

data/app/views/works/list_excel.rhtml

@@ -29,11 +29,6 @@
  <Styles>
   <Style ss:ID="Default" ss:Name="Normal">
    <Alignment ss:Vertical="Top"/>
-   <Borders/>
-   <Font/>
-   <Interior/>
-   <NumberFormat/>
-   <Protection/>
   </Style>
   <Style ss:ID="title">
    <Font x:Family="Swiss" ss:Size="24" ss:Bold="1"/>
@@ -41,37 +36,49 @@
   <Style ss:ID="header">
    <Font x:Family="Swiss" ss:Size="14" ss:Bold="1"/>
   </Style>
+  <Style ss:ID="DateTime">
+  	<NumberFormat ss:Format="Number" />
+  </Style>
  </Styles>
  <Worksheet ss:Name="<%=l(:done)%>">
-  <Table ss:ExpandedColumnCount="256" ss:ExpandedRowCount="35" x:FullColumns="1"
+  <Table ss:ExpandedColumnCount="256" x:FullColumns="1"
    x:FullRows="1">
-   <Column ss:AutoFitWidth="1" ss:Width="10cm"/>
-   <Column ss:AutoFitWidth="2" ss:Width="4cm"/>
-   <Column ss:AutoFitWidth="4" ss:Width="5cm"/>
-   <Column ss:AutoFitWidth="5" ss:Width="5cm"/>
-   <Column ss:AutoFitWidth="3" ss:Width="1.5cm"/>
+   <Column ss:AutoFitWidth="1" ss:Width="100"/>
+   <Column ss:AutoFitWidth="1" ss:Width="90"/>
+   <Column ss:AutoFitWidth="1" ss:Width="120"/>
+   <Column ss:AutoFitWidth="1" ss:Width="200"/>
+   <Column ss:AutoFitWidth="1" ss:Width="60"/>
+   <Column ss:AutoFitWidth="1" ss:Width="45"/>
+   <Column ss:AutoFitWidth="1" ss:Width="90"/>
+   <Column ss:AutoFitWidth="1" ss:Width="90"/>
    <Row>
-    <Cell ss:StyleID="title" ss:MergeAcross="4"><Data ss:Type="String"><%=@report_filter.title%></Data></Cell>
+    <Cell ss:StyleID="title" ss:MergeAcross="6"><Data ss:Type="String"><%=@report_filter.title%></Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0" ss:Height="6.5625">
-    <Cell ss:MergeAcross="4"><Data ss:Type="String"></Data></Cell>
+    <Cell ss:MergeAcross="6"><Data ss:Type="String"></Data></Cell>
    </Row>
 
    <Row ss:AutoFitHeight="0" ss:Height="19.875">
-    <Cell ss:StyleID="header"><Data ss:Type="String">Aktivitet</Data></Cell>
-    <Cell ss:StyleID="header"><Data ss:Type="String">Person</Data></Cell>
-    <Cell ss:StyleID="header"><Data ss:Type="String">Start</Data></Cell>
-    <Cell ss:StyleID="header"><Data ss:Type="String">Stopp</Data></Cell>
-    <Cell ss:StyleID="header"><Data ss:Type="String">Timer</Data></Cell>
+    <Cell ss:StyleID="header"><Data ss:Type="String"><%=l :work_account%></Data></Cell>
+    <Cell ss:StyleID="header"><Data ss:Type="String"><%=l :user%></Data></Cell>
+    <Cell ss:StyleID="header"><Data ss:Type="String"><%=l :task%></Data></Cell>
+    <Cell ss:StyleID="header"><Data ss:Type="String"><%=l :description%></Data></Cell>
+    <Cell ss:StyleID="header"><Data ss:Type="String"><%=l :done%></Data></Cell>
+    <Cell ss:StyleID="header"><Data ss:Type="String"><%=l :invoice_short%></Data></Cell>
+    <Cell ss:StyleID="header"><Data ss:Type="String"><%=l :start%></Data></Cell>
+    <Cell ss:StyleID="header"><Data ss:Type="String"><%=l :stop%></Data></Cell>
    </Row>
    
 <% for work in @works %>
    <Row>
-    <Cell><Data ss:Type="String"><%=[work.task && work.task.description, work.description].compact.join('&#10;') %></Data></Cell>
+    <Cell><Data ss:Type="String"><%=work.work_account.name %></Data></Cell>
     <Cell><Data ss:Type="String"><%=work.user && work.user.name %></Data></Cell>
-    <Cell><Data ss:Type="Date"><%=work.started_on.strftime('%Y-%m-%d') %><%=work.start_time && work.start_time.strftime(' %H:%M:%S') %></Data></Cell>
-    <Cell><Data ss:Type="Date"><%=work.completed_at && work.completed_at.strftime('%Y-%m-%d %H:%M:%S') %></Data></Cell>
-    <Cell><Data ss:Type="Number"><%=work.hours %> %></Data></Cell>
+    <Cell><Data ss:Type="String"><%=work.task && work.task.description %></Data></Cell>
+    <Cell><Data ss:Type="String"><%=work.description %></Data></Cell>
+    <Cell><Data ss:Type="Number"><%=work.hours %></Data></Cell>
+    <Cell><Data ss:Type="String"><%=work.invoice? ? 'Ja' : 'Nei' %></Data></Cell>
+    <Cell ss:StyleID="DateTime"><Data ss:Type="Number"><%=BigDecimal((work.started_on - Date.new(1899, 12, 31)).to_s) + (work.start_time ? (BigDecimal(work.start_time.hour.to_s) + BigDecimal(work.start_time.minute.to_s)/60) / 24 : 0) %></Data></Cell>
+    <Cell ss:StyleID="DateTime"><Data ss:Type="Number"><%=work.completed_at && (BigDecimal((work.completed_at.to_datetime - DateTime.parse('1899-12-31T00:00:00+02:00')).to_f.to_s))%></Data></Cell>
    </Row>
   <% end %>
 

data/app/views/works/weekly_work_sheet.rhtml

@@ -9,7 +9,7 @@
   <tr>
     <th><%=l :work_account %></th>
   	<% [:monday, :tuesday, :wednesday, :thursday, :friday, :saturday, :sunday].each_with_index do |day, i| %>
-    <th align="center"><%=detour_to "#{l(day)} #{week_date(i+1)}", :action => :daily_work_sheet, :id => (@first_date + i).strftime('%Y-%m-%d') %></th>
+    <th align="center"><%=detour_to "#{l(day)} #{week_date(i+1)}", :action => :daily_work_sheet, :id => (@first_date + i).strftime('%Y-%m-%d'), :user_id => (@user != current_user ? @user : nil) %></th>
 	<% end %>
     <th align="center" nowrap="true"><%=l :week %> <%=@week%></th>
   </tr>
@@ -43,4 +43,7 @@
     <th class="hours"><%=t(week_total)%></th>
   </tr>
 </table>
+
+<%=back_or_link_to l(:back), '' %>
+
 </div>

data/config/database.yml

@@ -20,7 +20,7 @@ test:
   driver: org.postgresql.Driver
   url: jdbc:postgresql://localhost:5432/backlog_test
   database: backlog_test
-  username: root
+  username: cruisecontrol
   host: localhost
 #<% else %>
   adapter: postgresql

data/config/environment.rb

@@ -110,10 +110,10 @@ require 'version_from_history'
 require 'user_system'
 require 'url_for_fix'
 
-if RUBY_PLATFORM !~ /i386-mswin32/
+if RUBY_PLATFORM !~ /(i386-mswin32|java)/
 gem 'slave'
 require 'slave'
 work_lock_nagger_thread = Slave.object(:async=>true) {WorkLockNagger.new.nag}
 else
-  puts 'Not spawning worklognagger on windows'
+  puts "Not spawning worklog nagger on #$1 platform."
 end

data/test/fixtures/works.yml

@@ -37,3 +37,11 @@ without_task:
   completed_at: 2007-06-13T14:35:00
   hours: 8.0
   user_id: 1000001
+short:
+  id: 7
+  started_on: 2007-06-18
+  start_time: !time 10:00:00
+  completed_at: 2007-06-18T10:05:00
+  hours: 0.083
+  work_account_id: 1
+  user_id: 1000001

data/test/functional/work_accounts_controller_test.rb

@@ -91,24 +91,4 @@ class WorkAccountsControllerTest < Test::Unit::TestCase
     }
   end
 
-  def test_works
-    get :works, :id => 1, :report_filter => {:start_on => '2007-04-01', :end_on => '2007-06-13'}
-
-    assert_response :success
-    assert_template 'list'
-
-    assert_not_nil assigns(:works)
-    assert_equal 4, assigns(:works).size
-  end
-
-  def test_works_excel
-    get :works, :id => 1, :report_filter => {:start_on => '2007-04-01', :end_on => '2007-06-13'}, :export => 'excel'
-
-    assert_response :success
-    assert_template 'list_excel'
-
-    assert_not_nil assigns(:works)
-    assert_equal 4, assigns(:works).size
-  end
-
 end

data/test/functional/works_controller_test.rb

@@ -36,6 +36,26 @@ class WorksControllerTest < Test::Unit::TestCase
     assert_not_nil assigns(:works)
   end
   
+  def test_list_with_filter
+    get :list, :id => 1, :report_filter => {:start_on => '2007-04-01', :end_on => '2007-06-13'}
+
+    assert_response :success
+    assert_template 'list'
+
+    assert_not_nil assigns(:works)
+    assert_equal 4, assigns(:works).size
+  end
+
+  def test_list_excel
+    get :list, :id => 1, :report_filter => {:start_on => '2007-04-01', :end_on => '2007-06-13'}, :export => 'excel'
+
+    assert_response :success
+    assert_template 'list_excel'
+
+    assert_not_nil assigns(:works)
+    assert_equal 4, assigns(:works).size
+  end
+
   def test_show
     get :show, :id => 1
     
@@ -118,6 +138,15 @@ class WorksControllerTest < Test::Unit::TestCase
     assert_equal expected_time, assigns(:work).start_time
   end
   
+  def test_update_time_with_five_minutes
+    before = works(:first)
+    
+    post :update_time, :id => 1, :work => {"hours_time"=>"0:05"}
+
+    assert_response :success
+    assert_equal BigDecimal('0.083'), assigns(:work).hours
+  end
+  
   def test_update_row_with_empty_start_time
     before = works(:first)
     old_start_date = before.started_on

data/test/unit/work_test.rb

@@ -68,6 +68,10 @@ class WorkTest < Test::Unit::TestCase
     end
   end
 
+  def test_calculate_hours
+    assert_equal 0.083, works(:short).calculate_hours
+  end
+  
   private
 
   # TODO (uwe): This method should be removed

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.31.1
+  version: 0.32.0
 platform: ruby
 authors: 
 - Uwe Kubosch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-24 00:00:00 +02:00
+date: 2008-05-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency