backlog 0.24.0 → 0.25.0

data/app/controllers/works_controller.rb

@@ -44,23 +44,13 @@ class WorksController < ApplicationController
         task = backlog.tasks_with_children.find{|t| t.description == task_description}
         params[:work][:task_id] = task.id if task
       end
-      account_name = params[:work].delete(:work_account_name)
-      if account_name && account_name.size > 0
-        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
+      convert_work_account_param
+      convert_customer_param
       convert_hours_param
       @work = Work.new(params[:work])
       @work.started_on ||= Date.today
       @work.completed_at = Time.now unless @work.start_time || @work.completed_at
+      @work.calculate_hours! unless @work.hours && @work.hours.to_f > 0
       @work.user_id = current_user.id
     end
     if @work && @work.save
@@ -76,6 +66,28 @@ class WorksController < ApplicationController
     back_or_redirect_to :controller => 'periods', :action => 'show', :id => @work.task && @work.task.period, :task_id => @work.task && @work.task.id
   end
   
+  
+  def convert_work_account_param
+    account_name = params[:work].delete :work_account_name
+    if account_name && account_name.size > 0
+      account = WorkAccount.find_by_name account_name
+      params[:work][:work_account_id] = account.id
+    end
+  end
+  private :convert_work_account_param
+  
+  def convert_customer_param
+    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
+  private :convert_customer_param
+  
   def edit
     @work ||= Work.find(params[:id])
     @work.attributes = params[:work]
@@ -103,11 +115,11 @@ class WorksController < ApplicationController
   def update_row
     if update_work
       #flash.discard
-      @next_field = params[:next_field] || 'work_account_name'
+      @next_field = params[:next_field] || 'description'
       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}
     else
-      @next_field = params[:field] || 'work_account_name'
+      @next_field = params[:field] || 'description'
     end
     @work_accounts = WorkAccount.find(:all, :order => :name)
     @customers = Customer.find(:all, :order => :name)
@@ -121,7 +133,11 @@ class WorksController < ApplicationController
   
   def update_work
     @work = Work.find(params[:id])
-    convert_hours_param
+    unless convert_hours_param
+      flash[:notice] = "Illegal time format"
+      @work.errors.add :hours_time, "Illegal time format."
+      return false
+    end
     if @work.update_attributes(params[:work])
       if params[:work] && (params[:work][:start_time] || params[:work][:completed_at_time])
         @work.calculate_hours!
@@ -219,19 +235,24 @@ class WorksController < ApplicationController
     render :partial => '/backlogs/name_list'
   end
   
-  def auto_complete_for_work_task_description
-    if backlog_name = params[:backlog_name]
-      if @backlog = Backlog.find_by_name(backlog_name)
-        @tasks = @backlog.tasks_with_children.select {|t| t.description.downcase =~ /#{params[:work][:task_description].downcase}/}
-      end
+  def auto_complete_for_work_task_id
+    @tasks = []
+    if (search_id = params[:work][:task_id].to_i) > 0
+      @tasks += Task.find(:all,
+                          :conditions => [ "id = ? OR id BETWEEN ? AND ?",
+                        search_id, search_id * 10, ((search_id+1) * 10 -1) ], 
+      :order => 'id',
+      :limit => 10)
     end
-    @tasks ||= Task.find(:all,
-                         :conditions => [ "finished_at IS NULL AND LOWER(description) LIKE ?",
-                        '%' + params[:work][:task_description].downcase + '%' ], 
+    
+    
+    @tasks += Task.find(:all,
+                                     :conditions => [ "finished_at IS NULL AND LOWER(description) LIKE ?",
+                        '%' + params[:work][:task_id].downcase + '%' ], 
     :order => 'description ASC',
-    :limit => 16)
+    :limit => 10)
     
-    render :partial => 'description_list'
+    render :partial => 'task_id_list'
   end
   
   def calculate_hours
@@ -240,24 +261,44 @@ class WorksController < ApplicationController
     render :update do |page| page['work_hours_time'].value = new_value end
   end
   
+  def update_new_row
+    @field = params[:field]
+    @next_field = params[:next_field]
+    convert_work_account_param
+    convert_customer_param
+    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
+      @work.calculate_hours!
+      @updated_fields << :hours_time
+    end
+  end
+  
   private
   
   def convert_hours_param
     if params[:work] && params[:work][:hours_time]
       params[:work][:hours_time].strip!
-      if params[:work][:hours_time] =~ /^(\d*):(\d{2})$/
+      if params[:work][:hours_time].empty?
+        params[:work].delete(:hours_time)
+        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 = BigDecimal(new_value_str)
         params[:work][:hours] = new_value
-      elsif params[:work][:hours_time] =~ /^(\d*(?:.\d)?)$/
-        params[:work][:hours] = BigDecimal($1)
+      elsif params[:work][:hours_time] =~ /^(\d*)[.,]?(\d*)$/
+        params[:work][:hours] = BigDecimal("#{$1.to_i}.#{$2.to_i}")
       else
-        raise "Unknown time format: '#{params[:work][:hours_time]}'"
+        #raise "Unknown time format: '#{params[:work][:hours_time]}'"
+        return false
       end
       params[:work].delete :hours_time
     end
+    return true
   end
   
 end

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).to_i}" 
+    "#{time_as_float.to_i}:#{'%02d' % (time_as_float.frac * 60).ceil}" 
   end
   
   def h(object)
@@ -90,6 +90,7 @@ module ApplicationHelper
     if flash[:notice]
       page.replace_html :notice, flash[:notice]
       page.visual_effect(:appear, :notice)
+      page.visual_effect(:highlight, :notice)
       flash.discard
     else
       page.visual_effect(:fade, :notice)

data/app/models/work.rb

@@ -138,7 +138,7 @@ class Work < ActiveRecord::Base
       self.completed_at = nil
       return
     end
-    raise "invalid time format: #{new_value}" unless new_value =~ /(\d{0,2}):?(\d{2})/
+    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
     self.completed_at = Time.local(t.year, t.month, t.day, new_hour, new_minutes)

data/app/views/tasks/_form.rhtml

@@ -80,7 +80,7 @@
     	<%= if @task.users.empty?
 				l(:not_grabbed)
 			elsif @task.users.include? current_user
-				l(:grabbed)
+				l(:grabbed_by_you)
 			end
 		%>
 		<%=link_to_remote l(:invite), :action => :invite, :id => @task.id %>

data/app/views/user/edit.rhtml

@@ -66,12 +66,12 @@
 				<% end %>
 			<% end %>
 			<% unless @associates.empty? %>
-			<tr><td>
+			<tr>
 				<% remote_form_for :user, :url => {:action => :invite_work_lock_subscriber} do |f| %>
-					<%=select :id, nil, @associates.map{|u| [u.name, u.id]}, {}, :name => 'id'%>
-				<td align="left"><%=submit_tag l(:invite)%></td>
+					<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></tr>
+			</tr>
 			<% end %>
 		</table>
 	<% else %>
@@ -91,7 +91,7 @@
 		</tr>
 		<% for date in @holidays %>
 			<tr>
-				<td align="center"><%=date%></td>
+				<td align="center"><%=link_to date, :controller => 'works', :action => :daily_work_sheet, :id => date %></td>
 			</tr>
 		<% end %>
 	</table>
@@ -108,7 +108,7 @@
 		</tr>
 		<% for date in @sick_days %>
 			<tr>
-				<td align="center"><%=date%></td>
+				<td align="center"><%=link_to date, :controller => 'works', :action => :daily_work_sheet, :id => date %></td>
 			</tr>
 		<% end %>
 	</table>

data/app/views/works/_row.rhtml

@@ -1,12 +1,7 @@
   <tr id="work_<%=@work.id%>" style="border: 1px solid black">
     <td>
-	  <% remote_form_for :work, :url => {:action => :update_row, :id => @work.id, :next_field => :customer_name}, :html => {:id => "work_#{@work.id}_form"} do |f|%>
-        <%=f.select :work_account_id, @work_accounts.map {|wa| [wa.name, wa.id]}, {}, :onchange => "form.submit()"%>
-      <% end %>
-    </td>
-    <td>
-	  <% remote_form_for :work, :url => {:action => :update_row, :id => @work.id, :next_field => :description} do |f|%>
-        <%=f.select :customer_id, [['', '']] + @customers.map {|cu| [cu.name, cu.id]}, {}, :onchange => "new Ajax.Request('/works/update_row/#{@work.id}?next_field=description', {asynchronous:true, evalScripts:true, parameters:Form.serialize(form)})"%>
+	  <% remote_form_for :work, :url => {:action => :update_row, :id => @work.id, :next_field => :description}, :html => {:id => "work_#{@work.id}_form"} do |f|%>
+        <%=f.select :work_account_id, @work_accounts.map {|wa| [wa.name, wa.id]}, {}, :id => "work_#{@work.id}_work_account_id", :onchange => "new Ajax.Request('/works/update_row/#{@work.id}?next_field=customer_id', {asynchronous:true, evalScripts:true, parameters:Form.serialize(form)})"%>
       <% end %>
     </td>
     <td>
@@ -37,15 +32,27 @@
             :onchange => "new Ajax.Request('/works/update_row/#{@work.id}?next_field=invoice', {asynchronous:true, evalScripts:true, parameters:Form.serialize(form)})"%>
       <% end %>
     </td>
+	<td align="right">
+      <% remote_form_for :work, :url => {:action => :update_row, :id => @work.id, :next_field => :invoice} do |f|%>
+      	<%=text_field_with_auto_complete "work_#{@work.id}", :task_id, 
+				{:name => "work[task_id]", :value => @work.task_id, :class => :task_id, :onchange => "new Ajax.Request('/works/update_row/#{@work.id}?next_field=invoice', {asynchronous:true, evalScripts:true, parameters:Form.serialize(form)})"}, 
+				{:url => url_for(:action => :auto_complete_for_work_task_id), :with => "'work[task_id]=' + $('work_#{@work.id}_task_id').value"} %>
+	  	<% if @work.task_id %>
+	      	<%=image_detour_to('task.png', "#{l :task}: #{@work.task.description}", {:controller => 'tasks', :action => :edit, :id => @work.task.id})%>
+		<% end %>
+      <% end %>
+	</td>
     <td style="text-align: left">
       <% remote_form_for :work, :url => {:action => :update_row, :id => @work.id} do |f|%>
       	<%=f.check_box :invoice, :id => "work_#{@work.id}_invoice", :onchange => "new Ajax.Request('/works/update_row/#{@work.id}?next_field=invoice', {asynchronous:true, evalScripts:true, parameters:Form.serialize(form)})"%>
       <% end %>
     </td>	
+    <td>
+	  <% remote_form_for :work, :url => {:action => :update_row, :id => @work.id, :next_field => :description} do |f|%>
+        <%=f.select :customer_id, [['', '']] + @customers.map {|cu| [cu.name, cu.id]}, {}, :id => "work_#{@work.id}_customer_id", :onchange => "new Ajax.Request('/works/update_row/#{@work.id}?next_field=description', {asynchronous:true, evalScripts:true, parameters:Form.serialize(form)})"%>
+      <% end %>
+    </td>
     <td>
       <%=image_detour_to('delete.png', l(:delete), {:controller => 'works', :action => :destroy, :id => @work, :confirm => true}, nil, true)%>
-	  <% if @work.task %>
-      	<%=image_detour_to('task.png', "#{l :task}: #{@work.task.description}", {:controller => 'tasks', :action => :edit, :id => @work.task.id})%>
-	  <% end %>
     </td>
   </tr>

data/app/views/works/_row_field.rhtml

@@ -3,11 +3,11 @@
 				:class => ('task_time' if field=~/_time$/),
         :onchange => "new Ajax.Request('/works/update_row/#{@work.id}?field=#{field}&next_field=#{next_field}', {asynchronous:true, evalScripts:true, parameters:Form.serialize(form)});",
         :onkeypress => "
-        if(event.keyCode == 40) { 
+        if(event.keyCode == 40) { // Down-arrow
           e = $('work#{"_#{next_row_id}" if next_row_id}_#{field}'); 
           e.focus(); 
           e.select();
-        } else if(event.keyCode == 38) { 
+        } else if(event.keyCode == 38) { // Up-arrow
           e = $('work#{"_#{previous_row_id}" if previous_row_id}_#{field}'); 
           e.focus();
           e.select();

data/app/views/works/_task_id_list.rhtml

@@ -0,0 +1,5 @@
+<ul class="tasks" style="width: 30em; background: white">
+<% for task in @tasks do -%>
+  <li><div style="width: 40em"><%=task.id%><span class="informal"> <%="#{h task.root_task.backlog.name}: " unless @backlog%><%=h task.description %></span></div></li>
+<% end -%>
+</ul>

data/app/views/works/daily_work_sheet.rhtml

@@ -13,7 +13,7 @@
 <div id="absence">
 	<% form_for :absence, :html => {:id => :absence_form}, :url => with_detour({:controller => 'absences', :action => :create}) do |f| %>
 		<%=f.hidden_field :on, :value => @date %>
-		<%=f.radio_button :reason, '', :disabled => !@works.empty?, :onchange => 'form.submit()' %><label for="absence_reason_">Work day</label>
+		<%=f.radio_button :reason, '', :disabled => !@works.empty? && (@absence.nil? || @absence.reason.nil? || @absence.reason.empty?), :onchange => 'form.submit()' %><label for="absence_reason_">Work day</label>
 		<%=f.radio_button :reason, 'HOLIDAY', :disabled => !@works.empty?, :onchange => 'form.submit()' %><label for="absence_reason_holiday">Holiday</label>
 		<%=f.radio_button :reason, 'SICK', :disabled => !@works.empty?, :onchange => 'form.submit()' %><label for="absence_reason_sick">Sick day</label>
 	<% end %>
@@ -21,43 +21,44 @@
 
 <br clear="all" />
 
-<table sstyle="width: 100%" border="0">
+<table>
 
 <% if @absence.nil? || @works.size > 0 %>
   <tr>
     <th><%=l :account %></th>
-	<th><%=l :customer %></th>
     <th><%=l :description %></th>
-    <th><%=l :started_at %></th>
+    <th id="start_time_header"><%=l :started_at %></th>
     <th><%=l :completed_at %></th>
     <th><%=l :done %></th>
-	<th><%=l :invoice %></th>	
-    <th/>
+    <th><%=l :task %></th>
+	<th id="invoice_header"><%=l :invoice %></th>	
+	<th><%=l :customer %></th>
+    <th id="icons_header" />
   </tr>
 <% end %>
 
-<% day_total = 0 %>
+<% day_total = BigDecimal('0.0') %>
 <% @works.each_with_index do |@work, i| %>
   <% day_total += @work.hours if @work %>
   <%=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 %>
 
 <% unless @absence %>
 <% @work = nil %>
 
-<% form_tag with_detour(:controller => 'works', :action => 'create') do %>
+<% form_tag with_detour(:controller => 'works', :action => 'create'), :id => "work_form" do %>
 <%=submit_tag('checkmark', :value => l(:save), :style => 'display: none')%>
-<%=hidden_field :work, :completed_at, :value => @date %>
+<%=hidden_field :work, :started_on, :value => @date %>
 
+<table>
   <tr>
-    <td valign="bottom">
+    <td id="account_cell" valign="bottom">
       <%=text_field_with_auto_complete :work, :work_account_name, {:value => '', :size => 16, :class => :task_description}, {:delay => "0.01"} %>
     </td>
-    <td valign="bottom">
-      <%=text_field_with_auto_complete :work, :customer_name, {:value => '', :size => 16, :class => :task_description} %>
-    </td>
     <td valign="bottom">
       <%=text_field_with_auto_complete :work, :description, :class => :task_description,
         :onkeypress => "
@@ -75,7 +76,7 @@
         }"
 	  %>
     </td>
-    <td align="right" valign="bottom">
+    <td id="work_start_time_cell" align="right" valign="bottom">
       <%=text_field :work, :start_time, :value => last_work && last_work.completed_at && last_work.completed_at.strftime('%H:%M'), :class => 'task_time',
         :onkeypress => "
         if(event.keyCode == 38) { 
@@ -93,7 +94,10 @@
 		 %>
     </td>
     <td align="left" valign="bottom">
+		<% 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)"),
         :onkeypress => "
         if(event.keyCode == 38) { 
           e = $('work#{"_#{last_work.id}" if last_work}_completed_at_time'); 
@@ -107,8 +111,7 @@
 		  	return false;
 		  }
         }", 
-				:value => @work && @work.completed_at.strftime('%H:%M'), 
-				:onchange => "update_hours(this.form);"
+				:value => @work && @work.completed_at_time.strftime('%H:%M')
 		%>
 	</td>
     <td align="right" valign="bottom">
@@ -128,10 +131,17 @@
         }"
 		 %>
     </td>
-    <td align="left" valign="bottom">
+    <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 %>
     </td>
-	<td valign="bottom">
+    <td valign="bottom">
+      <%=text_field_with_auto_complete :work, :customer_name, {:value => '', :size => 16, :class => :task_description} %>
+    </td>
+	<td id="work_icons_cell" valign="bottom">
     </td>
   </tr>
 <% end %>
@@ -141,8 +151,8 @@
     <th><%=l :totals %></th>
     <th/>
     <th/>
+    <th id="hours_total" class="hours"><%=t(day_total) %></th>
 	<th/>
-    <th id="hours_total" class="hours"><%='%d:%02d' % [day_total.to_i, 60 * (day_total % 1)] %></th>
 	<th/>
   </tr>
 </table>
@@ -162,39 +172,18 @@
 
 <script type="text/JavaScript">
 //<!--
-function update_hours(form, id) {
-	var id_str;
-	if(!id) {
-		id_str = '';
-	} else {
-		id_str = '_' + id;
-	}
-
-	var started_at = $('work' + id_str + '_start_time');
-	var completed_at = $('work' + id_str + '_completed_at_time');
-	var hours_field = $('work' + id_str + '_hours_time');
-	
-	if (started_at.value.length >= 4 && completed_at.value.length >= 4){
-		var start_hours = started_at.value.substr(0,2);
-		var start_minutes = started_at.value.substr(3,5);
-		var end_hours = completed_at.value.substr(0,2);
-		var end_minutes = completed_at.value.substr(3,5);
-		
-		var hours = end_hours - start_hours;
-		var minutes = end_minutes - start_minutes;
-		if ( minutes < 0){
-			hours--;
-			minutes += 60;
-		}
-
-		hours_field.value = '' + hours + ':' + (minutes < 10 ? '0' : '') +  minutes;
-	}
-}
-
+<% 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';
+<% end %>
 <% if last_work.completed_at %>
-  start_field = $('work_work_account_name')
+  start_field = $('work_work_account_name');
 <% else %>
-  start_field = $('work_<%=last_work.id%>_completed_at_time')
+  start_field = $('work_<%=last_work.id%>_completed_at_time');
 <% end %>
 start_field.focus();
 start_field.select();