backlog 0.25.0 → 0.26.0

data/History.txt

@@ -1,3 +1,23 @@
+== 0.26.0 2008-03-28
+
+=== Features
+
+* Upgraded JRuby in the WAR distribution to JRuby 1.1RC3
+* Added "Invite" function to Task view to invite another user to grab a task.
+* Added "Total" for holidays and sick days in the Edit User view.
+
+=== Fixes
+
+* Fixed layout in the Daily Work Sheet
+* Fixed time calculation in the daily work sheet for new rows.
+* Changed input field type for Work Account for new rows in the Daily Work Sheet from text to drop-down.
+* Fixed rounding error for displayed durations.
+* Handled illegal time format when creating new work record in the Daily Work Sheet.
+* Fixed deleting registered hours in Daily Work Sheet.
+* Removed the "Save" button from the Daily Work Sheet since it didn't have a clear function.  use "RETURN" or "ENTER" instead.
+* Fixed crossover of absences between users in Daily Work Sheet.
+* Fixed so that the link from the Daily Work Sheet to the Weekly Work Sheet goes to the correct week.
+
 == 0.25.0 2008-03-27
 
 === Features

data/Rakefile

@@ -46,7 +46,7 @@ task :release_all do
   Rake::Task[:post_news].invoke
 end
 
-# Remember to set timeout in /usr/lib/ruby/gems/1.8/gems/rubyforge-0.4.4/lib/http-access2.rb
+# Remember to set @send_timeout in /usr/lib/ruby/gems/1.8/gems/rubyforge-0.4.4/lib/http-access2.rb
 # @send_timeout = 3600
 desc 'Release the application as a Java EE WAR file to RubyForge'
 task :release_war do

data/app/controllers/tasks_controller.rb

@@ -1,7 +1,7 @@
 class TasksController < ApplicationController
   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, :grab, :list_started, :move_to_next_period, :notes],
+  verify :method => :post, :except => [ :invite, :new, :show, :edit, :grab, :list_started, :move_to_next_period, :notes],
   :redirect_to => { :controller => 'backlogs' }
   
   def list_started
@@ -201,7 +201,18 @@ class TasksController < ApplicationController
     @task.grab
     detour = pop_detour
     params.update(detour) if detour
-    render :template => '/tasks/_update.rjs'
+    render :template => '/tasks/_update.rjs' if request.xhr?
+  end
+  
+  def invite
+    @task = Task.find(params[:id])
+    @invitee = User.find(params[:user_id])
+    task_url = url_for(:action => 'edit', :id => @task.id)
+    grab_url = url_for(:action => 'grab', :id => @task.id)
+    TaskNotify.deliver_invite(current_user, @invitee, @task, task_url, grab_url)
+    detour = pop_detour
+    params.update(detour) if detour
+    render :template => '/tasks/_invite.rjs' if request.xhr?
   end
   
   def release

data/app/controllers/works_controller.rb

@@ -46,7 +46,11 @@ class WorksController < ApplicationController
       end
       convert_work_account_param
       convert_customer_param
-      convert_hours_param
+      unless convert_hours_param
+        flash[:notice] = "Illegal time format"
+        #@work.errors.add :hours_time, "Illegal time format."
+        params[:work].delete(:hours_time)
+      end
       @work = Work.new(params[:work])
       @work.started_on ||= Date.today
       @work.completed_at = Time.now unless @work.start_time || @work.completed_at
@@ -168,13 +172,15 @@ class WorksController < ApplicationController
   
   def daily_work_sheet
     @date = (params[:id] && Date.parse(params[:id])) || Date.today
+    @year = @date.year
+    @week = @date.cweek
     @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)
-    @absence = Absence.find(:first, :conditions => {:on => @date})
+    @absence = Absence.find(:first, :conditions => {:on => @date, :user_id => current_user.id})
     render :layout => 'wide'
   end
   
@@ -269,7 +275,7 @@ class WorksController < ApplicationController
     raise "Unknown time format: #{params[:hours_time]}" unless convert_hours_param
     @work = Work.new(params[:work])
     @updated_fields = [@field]
-    if @work.hours == 0 && @work.start_time && @work.completed_at
+    if @work.hours == 0  && @work.started_on && @work.start_time && @work.completed_at
       @work.calculate_hours!
       @updated_fields << :hours_time
     end
@@ -282,12 +288,13 @@ class WorksController < ApplicationController
       params[:work][:hours_time].strip!
       if params[:work][:hours_time].empty?
         params[:work].delete(:hours_time)
+        params[:work][:hours] = 0
         return true
       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).ceil}"
+        new_value_str = "#{new_hours}.#{(new_minutes / 0.6).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

@@ -59,7 +59,7 @@ module ApplicationHelper
   end
   
   def t(time_as_float)
-    "#{time_as_float.to_i}:#{'%02d' % (time_as_float.frac * 60).ceil}" 
+    "#{time_as_float.to_i}:#{'%02d' % (time_as_float.frac * 60).round}" 
   end
   
   def h(object)

data/app/models/task_notify.rb

@@ -0,0 +1,27 @@
+class TaskNotify < ActionMailer::Base
+  def invite(inviter, invitee, task, task_url, grab_url)
+    setup_email(invitee)
+
+    # Email header info
+    @subject += "#{inviter.name} has invited you to grab task: #{task.id}."
+
+    # Email body substitutions
+    @body["app_name"] = UserSystem::CONFIG[:app_name].to_s
+    @body["app_url"] = UserSystem::CONFIG[:app_url].to_s
+    @body["task"] = task
+    @body["task_url"] = task_url
+    @body["grab_url"] = grab_url
+    @body["inviter"] = inviter
+    @body["invitee"] = invitee
+  end
+
+  private
+  
+  def setup_email(user)
+    @recipients = "#{user.email}"
+    @from       = UserSystem::CONFIG[:email_from].to_s
+    @subject    = "[#{UserSystem::CONFIG[:app_name]}] "
+    @sent_on    = Time.now
+    @headers['Content-Type'] = "text/plain; charset=#{UserSystem::CONFIG[:mail_charset]}; format=flowed"
+  end
+end

data/app/models/user.rb

@@ -105,6 +105,10 @@ class User < Party
     return user == self
   end
 
+  def users
+    [self]
+  end
+  
   protected
 
   attr_accessor :password, :password_confirmation

data/app/models/work.rb

@@ -140,13 +140,17 @@ class Work < ActiveRecord::Base
     end
     raise "invalid time format: #{new_value}" unless new_value =~ /^(\d{0,2}):?(\d{2})?$/
     new_hour, new_minutes = $1, $2
-    t = completed_at || Time.now
+    t = started_on || completed_at || Time.now
     self.completed_at = Time.local(t.year, t.month, t.day, new_hour, new_minutes)
   end
   
   def calculate_hours!
     return unless started_at && completed_at
-    self.hours = (completed_at - started_at) / 3600
+    self.hours = calculate_hours
+  end
+  
+  def calculate_hours
+    BigDecimal(((completed_at - started_at) / 3600).to_s).round(2)
   end
   
 end

data/app/views/task_notify/invite_en.rhtml

@@ -0,0 +1,13 @@
+<%=@invitee.name %>
+
+<%=@inviter.name%> has invited you to grab task
+
+<%=@task.id%> "<%=@task.description%>"
+
+Click on the following link to view the task:
+
+<%=@task_url%>
+
+or click on the link below to grab the task directly:
+
+<%=@grab_url%>

data/app/views/task_notify/invite_no.rhtml

@@ -0,0 +1,13 @@
+<%=@invitee.name %>
+
+<%=@inviter.name%> har invitert deg til å ta oppgave
+
+<%=@task.id%> "<%=@task.description%>"
+
+Klick på følgende link for å se på oppgaven:
+
+<%=@task_url%>
+
+eller klick på linken under for å ta oppgaven direkte:
+
+<%=@grab_url%>

data/app/views/tasks/_form.rhtml

@@ -83,7 +83,13 @@
 				l(:grabbed_by_you)
 			end
 		%>
-		<%=link_to_remote l(:invite), :action => :invite, :id => @task.id %>
+		<br/>
+		<% if @task.period %>
+			<%=l :invite%>:
+			<% @task.period.party.users.each do |user| %>
+				<%=link_to "#{user.name}", :action => :invite, :id => @task.id, :user_id => user.id unless @task.users.include? user%>
+			<% end %>
+		<% end %>
 	</p>
   <% end %>
 <% end %>

data/app/views/tasks/_invite.rjs

@@ -0,0 +1 @@
+display_notice(page)

data/app/views/tasks/grab.rhtml

@@ -0,0 +1,9 @@
+<% @page_title = "#{l :grab_task}" -%>
+
+<div id="spotlight">
+  <div class="btitle">
+    <h4><%=l :grab_task %> #<%=@task.id%></h4>
+  </div>
+  
+  Thank you for grabbing the task.
+</div>

data/app/views/tasks/invite.rhtml

@@ -0,0 +1,9 @@
+<% @page_title = "#{l :invite}" -%>
+
+<div id="spotlight">
+  <div class="btitle">
+    <h4><%=l :invite %> #<%=@task.id%></h4>
+  </div>
+  
+  <%=@invitee.name%> has been invited to grab task <%=@task.id%>.
+</div>

data/app/views/user/edit.rhtml

@@ -94,6 +94,9 @@
 				<td align="center"><%=link_to date, :controller => 'works', :action => :daily_work_sheet, :id => date %></td>
 			</tr>
 		<% end %>
+		<tr>
+			<td align="right">Total: <%=@holidays.size%></td>
+		</tr>
 	</table>
 </div>
 
@@ -111,6 +114,9 @@
 				<td align="center"><%=link_to date, :controller => 'works', :action => :daily_work_sheet, :id => date %></td>
 			</tr>
 		<% end %>
+		<tr>
+			<td align="right">Total: <%=@sick_days.size%></td>
+		</tr>
 	</table>
 </div>
 

data/app/views/works/daily_work_sheet.rhtml

@@ -4,7 +4,7 @@
 
 <div style="float: left"><%=image_link_to('arrow_left.png', l(:previous_week), {:id => @date - 7}, :class => nil)%></div>
 <div style="float: left"><%=image_link_to('arrow_left.png', l(:previous_day), {:id => @date-1}, :class => nil)%></div>
-<%=link_to l(:weekly_work_sheet), :action => :weekly_work_sheet_by_work_account%>
+<%=link_to l(:weekly_work_sheet), :action => :weekly_work_sheet_by_work_account, :year => @year, :week => @week%>
 <div style="float: right"><%=image_link_to('arrow_right.png', l(:next_week), {:id => @date + 7}, :class => nil)%></div>
 <div style="float: right"><%=image_link_to('arrow_right.png', l(:next_day), {:id => @date+1}, :class => nil)%></div>
 
@@ -43,7 +43,6 @@
   <%=render :partial => 'row', :locals => {:next_row_id => @works[i+1] && @works[i+1].id, 
 										   :previous_row_id => @works[i-1] && @works[i-1].id} %>
 <% end %>
-</table>
 
 <% last_work = @work %>
 
@@ -54,10 +53,10 @@
 <%=submit_tag('checkmark', :value => l(:save), :style => 'display: none')%>
 <%=hidden_field :work, :started_on, :value => @date %>
 
-<table>
   <tr>
     <td id="account_cell" valign="bottom">
-      <%=text_field_with_auto_complete :work, :work_account_name, {:value => '', :size => 16, :class => :task_description}, {:delay => "0.01"} %>
+      <%#=text_field_with_auto_complete :work, :work_account_name, {:value => '', :size => 16, :class => :task_description}, {:delay => "0.01"} %>
+      <%=select :work, :work_account_id, @work_accounts.map {|wa| [wa.name, wa.id]}, :value => '' %>
     </td>
     <td valign="bottom">
       <%=text_field_with_auto_complete :work, :description, :class => :task_description,
@@ -77,7 +76,17 @@
 	  %>
     </td>
     <td id="work_start_time_cell" align="right" valign="bottom">
+	  <% field = 'start_time'; next_field = 'completed_at_time' %>
       <%=text_field :work, :start_time, :value => last_work && last_work.completed_at && last_work.completed_at.strftime('%H:%M'), :class => 'task_time',
+        :onchange => remote_function(:url => {:action => :update_new_row, :field => field,
+						:next_field => next_field},
+						:with => "
+								'work[started_on]=' + work_started_on.value
+								+ '&work[start_time]=' + work_start_time.value
+								+ '&work[completed_at_time]=' + work_completed_at_time.value
+								+ '&work[hours_time]=' + work_hours_time.value
+						"
+				),
         :onkeypress => "
         if(event.keyCode == 38) { 
           e = $('work#{"_#{last_work.id}" if last_work}_start_time'); 
@@ -97,7 +106,14 @@
 		<% field = 'completed_at_time'; next_field = 'hours_time' %>
       	<%=text_field :work, :completed_at_time, :class => 'task_time',
         :onchange => remote_function(:url => {:action => :update_new_row, :field => field,
-				:next_field => next_field}, :with => "Form.serialize(form)"),
+						:next_field => next_field},
+						:with => "
+								'work[started_on]=' + work_started_on.value
+								+ '&work[start_time]=' + work_start_time.value
+								+ '&work[completed_at_time]=' + work_completed_at_time.value
+								+ '&work[hours_time]=' + work_hours_time.value
+						"
+				),
         :onkeypress => "
         if(event.keyCode == 38) { 
           e = $('work#{"_#{last_work.id}" if last_work}_completed_at_time'); 
@@ -133,7 +149,6 @@
     </td>
     <td valign="bottom">
       <%=text_field_with_auto_complete :work, :task_id, {:value => '', :size => 16, :class => :task_id} %>
-      <%=image_tag 'task.png'%>
     </td>
     <td id="work_invoice_cell" align="left" valign="bottom">
       <%=check_box :work, :invoice %>
@@ -156,7 +171,6 @@
 	<th/>
   </tr>
 </table>
-  <%= submit_tag l(:save) %>
   <%= back_or_link_to l(:back), '' %>
 <% end %>
 
@@ -173,15 +187,16 @@
 <script type="text/JavaScript">
 //<!--
 <% if last_work %>
-    $('work_work_account_name').style.width = $('work_<%=last_work.id%>_work_account_id').clientWidth - 6 + 'px';
-    $('work_description').style.width = $('work_<%=last_work.id%>_description').clientWidth - 2 + 'px';
-    $('work_start_time_cell').style.width = $('start_time_header').clientWidth - 2 + 'px';
-    $('work_invoice_cell').style.width = $('invoice_header').clientWidth - 2 + 'px';
-    $('work_customer_name').style.width = $('work_<%=last_work.id%>_customer_id').clientWidth + 10 + 'px';
-    $('work_icons_cell').style.width = $('icons_header').clientWidth - 2 + 'px';
+//    $('work_work_account_name').style.width = $('work_<%=last_work.id%>_work_account_id').clientWidth - 6 + 'px';
+//    $('work_description').style.width = $('work_<%=last_work.id%>_description').clientWidth - 2 + 'px';
+//    $('work_start_time_cell').style.width = $('start_time_header').clientWidth - 2 + 'px';
+//    $('work_invoice_cell').style.width = $('invoice_header').clientWidth - 2 + 'px';
+//    $('work_customer_name').style.width = $('work_<%=last_work.id%>_customer_id').clientWidth + 10 + 'px';
+//    $('work_icons_cell').style.width = $('icons_header').clientWidth - 2 + 'px';
 <% end %>
+var start_field;
 <% if last_work.completed_at %>
-  start_field = $('work_work_account_name');
+  start_field = $('work_work_account_id');
 <% else %>
   start_field = $('work_<%=last_work.id%>_completed_at_time');
 <% end %>

data/app/views/works/update_new_row.rjs

@@ -3,9 +3,9 @@ if @work && @work.errors.empty?
   @updated_fields.each do |field_name|
     if field_name.to_s =~ /(.*)_time$/
       attribute_name = $1
-      value = @work[attribute_name]
+      value = @work[attribute_name] || @work[field_name]
       if value.is_a? BigDecimal
-        value = '%d:%02d' % [value.to_i, (value.frac * 60).to_i]
+        value = t(value)
       else
         value = value.strftime('%H:%M')
       end

data/config/war.rb

@@ -1,7 +1,7 @@
 # Goldspike configuration
 
 # Set the version of JRuby and GoldSpike to use:
-maven_library 'org.jruby', 'jruby-complete', '1.1RC2'
+maven_library 'org.jruby', 'jruby-complete', '1.1RC3'
 maven_library 'backport-util-concurrent', 'backport-util-concurrent', '3.0'
 #maven_library 'org.jruby.extras', 'goldspike', '1.3-SNAPSHOT'
 

data/test/functional/works_controller_test.rb

@@ -77,6 +77,19 @@ class WorksControllerTest < Test::Unit::TestCase
     assert_equal num_works + 1, Work.count
   end
   
+  def test_create_with_old_start_date
+    num_works = Work.count
+    
+    post :create, :work => {:task_id => 1, :started_on => '2007-07-31', :work_account_id => '1', 
+        :start_time => '12:00', :completed_at => '2007-07-31 12:20'}
+    
+    assert_response :redirect
+    assert_redirected_to :controller => 'periods', :action => 'show', :id => periods(:past).id, :task_id => 1
+    
+    assert_equal num_works + 1, Work.count
+    assert_equal BigDecimal('0.33'), assigns(:work).hours
+  end
+  
   def test_edit
     get :edit, :id => 1
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.25.0
+  version: 0.26.0
 platform: ruby
 authors: 
 - Uwe Kubosch
@@ -97,6 +97,7 @@ files:
 - app/views/tasks
 - app/views/tasks/new.rhtml
 - app/views/tasks/list.rhtml
+- app/views/tasks/_invite.rjs
 - app/views/tasks/start_work.rjs
 - app/views/tasks/_fields_header.rhtml
 - app/views/tasks/_update.rjs
@@ -108,7 +109,9 @@ files:
 - app/views/tasks/_backlog_header.rhtml
 - app/views/tasks/_form.rhtml
 - app/views/tasks/update_estimate.rjs
+- app/views/tasks/invite.rhtml
 - app/views/tasks/list_started.rhtml
+- app/views/tasks/grab.rhtml
 - app/views/work_locks
 - app/views/work_locks/new.rhtml
 - app/views/work_locks/list.rhtml
@@ -138,6 +141,9 @@ files:
 - app/views/groups/edit.rhtml
 - app/views/groups/_form.rhtml
 - app/views/display_notice.rjs
+- app/views/task_notify
+- app/views/task_notify/invite_en.rhtml
+- app/views/task_notify/invite_no.rhtml
 - app/views/backlogs
 - app/views/backlogs/new.rhtml
 - app/views/backlogs/list.rhtml
@@ -265,6 +271,7 @@ files:
 - app/models/group.rb
 - app/models/work_lock_subscription.rb
 - app/models/backlog.rb
+- app/models/task_notify.rb
 - app/models/party.rb
 - app/models/task_file.rb
 - app/models/work_lock.rb