backlog 0.10.7 → 0.10.8

data/History.txt

@@ -1,3 +1,12 @@
+== 0.10.8 2007-09-27
+
+=== Fixes
+
+* Always make startup link in /etc/init.d even if it exists already
+* Reduced output in the "backlog setup_unix" command to avoid clutter.
+* Daily Time Sheet now allows adding work records.  Edit still not working.
+* Filtered work records in daily work sheet to only show records for the current user.
+
 == 0.10.7 2007-09-26
 
 === Fixes

data/app/controllers/works_controller.rb

@@ -36,11 +36,14 @@ class WorksController < ApplicationController
       backlog = Backlog.find_by_name(params[:work].delete(:backlog_name))
       description = params[:work][:task_description]
       task = Task.find_by_backlog_id_and_description(backlog.id, description)
-      params[:work][:task_id] = Task.find_by_backlog_id_and_description(backlog.id, params[:work].delete(:task_description))
+      params[:work][:task_id] = task.id
+      params[:work].delete(:task_description)
     end
     convert_hours_param
+    convert_start_time_param
     @work = Work.new(params[:work])
     @work.completed_at = Time.now unless @work.completed_at
+    @work.user_id = current_user.id
     if @work.save!
       flash[:notice] = 'Work was successfully created.'
     else
@@ -88,10 +91,7 @@ class WorksController < ApplicationController
   def daily_work_sheet
     @date = (params[:id] && Date.parse(params[:id])) || Date.today
     @periods = []
-    @works = Work.find(:all,
-                       :conditions => "started_at < '#{@date+1}' AND completed_at >= '#{@date}'",
-    :order => 'completed_at'
-    )
+    @works = Work.find_work_for_day @date
     @started_works = Task.find_started
     render :layout => 'wide'
   end
@@ -120,8 +120,14 @@ class WorksController < ApplicationController
   end
   
   def auto_complete_for_work_task_description
-    @tasks = Task.find(:all, 
-                       :conditions => [ 'finished_at IS NULL AND LOWER(description) LIKE ?',
+    if backlog_name = params[:backlog_name]
+      if backlog = Backlog.find_by_name(backlog_name)
+        backlog_clause = " AND backlog_id = #{backlog.id}"
+      end
+    end
+    
+    @tasks = Task.find(:all,
+                       :conditions => [ "finished_at IS NULL AND LOWER(description) LIKE ?#{backlog_clause}",
     '%' + params[:work][:task_description].downcase + '%' ], 
     :order => 'description ASC',
     :limit => 16)
@@ -134,7 +140,7 @@ class WorksController < ApplicationController
     if params[:work] && params[:work][:started_at_time]
       new_hour = params[:work][:started_at_time][0..1]
       new_minutes = params[:work][:started_at_time][3..4]
-      if @work.started?
+      if @work && @work.started?
         t = @work.started_at
       else
         t = Time.now

data/app/models/work.rb

@@ -1,7 +1,7 @@
 class Work < ActiveRecord::Base
   extend UserSystem
   include UserSystem
-
+  
   belongs_to :task
   belongs_to :user
   
@@ -9,7 +9,7 @@ class Work < ActiveRecord::Base
   validates_associated :task
   validates_presence_of :started_at
   validates_presence_of :user_id, :if => :validate_user?
-
+  
   def validate_user?
     task.enable_users?
   end
@@ -51,11 +51,11 @@ class Work < ActiveRecord::Base
     totals_per_backlog = {}
     Backlog.find(:all).each do |backlog|
       totals_per_backlog[backlog.id] = [[], []]
-      (0..6).each do |day|
+       (0..6).each do |day|
         works_for_day = works.select {|work| (work.task.backlog == backlog) && (work.started_at.to_date == (first + day)) && (work.user_id.nil? || (user && work.user_id == user.id)) }
         invoice_works_for_day = works_for_day.select {|work| work.invoice? }
         internal_works_for_day = works_for_day.select {|work| !work.invoice? }
-
+        
         invoice_day_total = invoice_works_for_day.reduce(BigDecimal('0')){|total, work| total += work.hours}
         internal_day_total = internal_works_for_day.reduce(BigDecimal('0')){|total, work| total += work.hours}
         totals_per_backlog[backlog.id][0] << invoice_day_total
@@ -68,6 +68,11 @@ class Work < ActiveRecord::Base
     totals_per_backlog
   end
   
+  def self.find_work_for_day date
+    Work.find(:all, :conditions => "started_at < '#{date+1}' AND completed_at >= '#{date}' AND user_id = #{current_user.id}",
+    :order => 'completed_at')
+  end
+  
   def started?
     completed_at.nil?
   end

data/app/views/works/daily_work_sheet.rhtml

@@ -22,7 +22,7 @@
     <% end %>
     <th><%=l :done %></th>
   </tr>
-  
+
 <% day_total = 0 %>
 <% for @work in @works %>
   <% day_total += @work.hours if @work %>
@@ -43,19 +43,19 @@
     <% if track_times %>
     <td align="right">
       <form>
-      <%=text_field :work, :started_at, :value => (@work.started_at.strftime('%H:%M')), :class => 'task_time' %>
+      <%=text_field :work, :started_at_time, :value => (@work.started_at.strftime('%H:%M')), :class => 'task_time' %>
       </form>
     </td>
     <td align="right">
       <form>
-      <%=text_field :work, :completed_at, :value => (@work.completed_at.strftime('%H:%M')), :class => 'task_time' %>
+      <%=text_field :work, :completed_at_time, :value => (@work.completed_at.strftime('%H:%M')), :class => 'task_time' %>
       <%=image_button_to('arrow_right.png', l(:calculate), :controller => 'periods', :action => :show, :id => @work.task.period) %>
       </form>
     </td>
     <% end %>
     <td align="right">
       <form>
-      <%=text_field :work, :hours, :value => '%.2f' % @work.hours, :class => 'task_hours' %>
+      <%=text_field :work, :hours_time, :value => t(@work.hours), :class => 'task_hours' %>
       </form>
     </td>
   </tr>
@@ -63,29 +63,29 @@
 </table>
 
 
-
-<% form_tag :action => 'create' do %>
+<% form_tag :controller => 'works', :action => 'create' do %>
+<%=submit_tag('checkmark', :value => l(:save), :sstyle => 'display: none')%>
 <%=hidden_field :work, :completed_at, :value => Time.now %>
 <table sstyle="width: 100%" border="0">
   <tr>
     <td width="22"/>
     <td>
-      <%=text_field_with_auto_complete :work, :backlog_name, {:value => '', :size => 16} %>
+      <%=text_field_with_auto_complete :work, :backlog_name, {:value => '', :size => 16}, {} %>
     </td>
     <td>
-      <%=text_field_with_auto_complete :work, :task_description, {:value => '', :size => 16, :class => :task_description} %>
+      <%=text_field_with_auto_complete :work, :task_description, {:value => '', :size => 16, :class => :task_description, :onfocus => "work_task_description_auto_completer.url = '#{url_for(:action => :auto_complete_for_work_task_description)}?backlog_name=' + $('work_backlog_name').value"}, :url => url_for({:action => :auto_complete_for_work_task_description, :backlog_name => "' + $('work_backlog_name').value + '", :escape => false}) %>
     </td>
     <% if track_times %>
     <td align="right">
-      <%=text_field :work, :started_at, :value => @work.started_at.strftime('%H:%M'), :class => 'task_time' %>
+      <%=text_field :work, :started_at_time, :value => @work.started_at.strftime('%H:%M'), :class => 'task_time' %>
     </td>
     <td align="right">
-      <%=text_field :work, :completed_at, :class => 'task_time', :value => @work.completed_at.strftime('%H:%M') %>
-      <%=image_button_to('arrow_right.png', l(:calculate), :controller => 'periods', :action => :show) %>
+      <%=text_field :work, :completed_at_time, :class => 'task_time', :value => @work.completed_at.strftime('%H:%M') %>
+      <%=image_button_to('arrow_right.png', l(:calculate), :controller => 'backlogs', :action => :show) %>
     </td>
     <% end %>
     <td align="right">
-        <%=text_field :work, :hours, :class => 'task_hours' %>
+      <%=text_field :work, :hours_time, :value => t(@work.hours), :class => 'task_hours' %>
     </td>
   </tr>
   <tr>
@@ -114,9 +114,7 @@
 
 <script type="text/JavaScript">
 //<!--
-form = document.forms[document.forms.length - 1];
-element = form.elements[form.elements.length - 5]
-element.focus();
-element.select();
+$('work_backlog_name').focus();
+$('work_backlog_name').select();
 //-->
 </script>

data/bin/backlog

@@ -54,14 +54,14 @@ when 'status'
 when 'setup_unix'
   current_user = `whoami`
   users = `su - postgres -c "echo '\\du' | psql template1"`
-  puts users
   unless users =~ /root/
+    puts users
     createuser_command = `which createuser`.chomp
     puts `su - postgres -c "#{createuser_command} -dAR #{current_user}"`
   end
   dbs = `su - postgres -c "echo '\\l' | psql template1"`
-  puts dbs
   unless dbs =~ /#{APPLICATION}_production/
+    puts dbs
     createdb_command = `which createdb`.chomp
     puts `su - postgres -c "#{createdb_command} #{APPLICATION}_production"`
   end
@@ -72,6 +72,7 @@ when 'setup_unix'
   # TODO:  provide startup information based on launchd in OS X versions >= 10.4
   if File.directory? '/etc/init.d'
     startup_app = "/etc/init.d/#{APPLICATION}"
+    File.delete startup_app if File.exists? startup_app
     `ln -s #{Config::CONFIG['bindir']}/#{APPLICATION} #{startup_app}` unless File.exists? startup_app
   end
   FileUtils.cp "#{INSTALL_DIR}/etc/#{APPLICATION}.conf", config_file unless File.exists? config_file

data/test/unit/work_test.rb

@@ -1,7 +1,10 @@
 require File.dirname(__FILE__) + '/../test_helper'
+require 'user_system'
 
 class WorkTest < Test::Unit::TestCase
-  fixtures :works
+  include UserSystem
+  
+  fixtures :users, :groups_users, :works
   
   def test_work_totals_for_week
     work_totals = Work.work_totals_for_week(24, 1000001)
@@ -18,4 +21,19 @@ class WorkTest < Test::Unit::TestCase
     assert_equal  0, work_totals[1][1][5]
     assert_equal  0, work_totals[1][1][6]
   end
+  
+  def test_find_work_for_day
+    Thread.current[:user] = users(:tesla)
+    assert_equal 1, Work.find_work_for_day(Date.parse('2007-06-12')).size
+  end
+  
+  private
+
+  # TODO (uwe): This method should be removed
+  # It is here only because ClassTableInheritanceInRails broke reading fixtures by name
+  def users(login)
+    super(login)
+  end  
+  
+  
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.10.7
-date: 2007-09-26 00:00:00 +02:00
+  version: 0.10.8
+date: 2007-09-27 00:00:00 +02:00
 summary: Application to aid collecting, processing, organizing, reviewing and doing tasks.
 require_paths: 
 - lib