backlog 0.23.1 → 0.24.0

data/History.txt

@@ -1,3 +1,16 @@
+== 0.24.0 2008-02-28
+
+=== Features
+
+* Allowed for marking dates as holiday or sick days in the daily work sheet.
+* Show a summary of holidays and sick days in the user view.
+* Added navigation with UP/DOWN keys in the daily work sheet.
+
+=== Fixes
+
+* Made all work related views group and sort by start date and time.
+* Do not try to register new work record in the daily work sheet unless work account name has been filled in.
+
 == 0.23.1 2008-02-26
 
 === Features
@@ -18,15 +31,15 @@
 * Changed sort order in daily work sheet from completion time to start time.
 * Changed to allow time format without separator:  0800 and 800 equal 08:00.
 * Minor cosmetic tweaks in the daily work sheet.
-* Fixed style sheet to remove the flickers in the sprint view.
+* Fixed style sheet to remove the flicker in the sprint view.
 
 == 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.
+* Allowed override for development and test database with new configuration file
+* Listed details for works without backlog in "Show Work Account" view.
 * Added "List Works" view for Work Account.
 * Added filtering of tasks grabbed by other users in the sprint view.
 
@@ -43,7 +56,7 @@
 * 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.
+* Removed message about missing database settings in main configuration 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. 

data/app/controllers/absences_controller.rb

@@ -0,0 +1,64 @@
+class AbsencesController < ApplicationController
+  def index
+    list
+    render :action => 'list'
+  end
+  
+  # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
+  verify :method => :post, :only => [ :destroy, :create, :update ],
+  :redirect_to => { :action => :list }
+  
+  def list
+    @absence_pages, @absences = paginate :absences, :per_page => 10
+  end
+  
+  def show
+    @absence = Absence.find(params[:id])
+  end
+  
+  def new
+    @absence = Absence.new
+  end
+  
+  def create
+    @absence = Absence.find(:first, :conditions => {:on => params[:absence][:on], :user_id => current_user.id})
+    if @absence
+      if params[:absence][:reason] == ''
+        @absence.destroy
+        flash[:notice] = 'Absence was successfully destroyed.'
+      else
+        @absence.update_attributes(params[:absence])
+        flash[:notice] = 'Absence was successfully updated.'
+      end
+      back_or_redirect_to :action => 'list'
+    else
+      @absence = Absence.new(params[:absence])
+      @absence.user_id = current_user.id
+      if @absence.save
+        flash[:notice] = 'Absence was successfully created.'
+        back_or_redirect_to :action => 'list'
+      else
+        render :action => 'new'
+      end
+    end
+  end
+  
+  def edit
+    @absence = Absence.find(params[:id])
+  end
+  
+  def update
+    @absence = Absence.find(params[:id])
+    if @absence.update_attributes(params[:absence])
+      flash[:notice] = 'Absence was successfully updated.'
+      redirect_to :action => 'show', :id => @absence
+    else
+      render :action => 'edit'
+    end
+  end
+  
+  def destroy
+    Absence.find(params[:id]).destroy
+    redirect_to :action => 'list'
+  end
+end

data/app/controllers/periods_controller.rb

@@ -107,7 +107,7 @@ class PeriodsController < ApplicationController
   
   def list_work
     if @period = Period.find_by_id(params[:id])
-      @works = @period.tasks.map {|t| t.works}.flatten.sort_by {|w| [w.completed_at || Time.now.midnight, w.started_at]}
+      @works = @period.tasks.map {|t| t.works}.flatten.sort_by {|w| [w.completed_at || Time.now.midnight, w.started_on, w.start_time]}
       def @works.page_count; size / 25; end
       render :template => '/works/list'
     else

data/app/controllers/tasks_controller.rb

@@ -228,9 +228,10 @@ class TasksController < ApplicationController
         :action => :edit,
         :id => started_work,
             'work[task_id]' => @task.id,
-            'work[started_at]' => started_work.started_at.iso8601,
-            'work[completed_at]' => [next_quarter, started_work.started_at].max.iso8601,
-            'work[hours]' => "%0.2f" % ((next_quarter - started_work.started_at).to_f / 3600),
+            'work[started_on]' => started_work.started_on.to_s,
+            'work[start_time]' => started_work.start_time.to_s,
+            'work[completed_at]' => [next_quarter, started_work.started_on.at(started_work.start_time)].max.iso8601,
+            'work[hours]' => "%0.2f" % ((next_quarter - started_work.started_on.at(started_work.start_time)).to_f / 3600),
             'estimate[todo]' => @task.todo
       })
     else
@@ -239,7 +240,8 @@ class TasksController < ApplicationController
         :controller => 'works',
         :action => :new, 
             'work[task_id]' => @task.id,
-            'work[started_at]' => Time.previous_quarter.iso8601,
+            'work[started_on]' => Time.previous_quarter.to_date.to_s,
+            'work[start_time]' => Time.previous_quarter.time_of_day.to_s,
             'work[completed_at]' => next_quarter.iso8601,
             'work[hours]' => "0.25",
             'estimate[todo]' => @task.todo

data/app/controllers/user_controller.rb

@@ -217,6 +217,13 @@ class UserController < ApplicationController
     @groups = Group.find(:all, :order => 'name')
     @periods = @user.periods
     @associates = User.find(:all) - @user.work_lock_subscribers - [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}
+    @sick_days = absences.select {|a| a.reason == 'SICK'}
+    @sick_days.map! {|a| a.on}
+    @sick_days_with_doctors_leave = absences.select {|a| a.reason == 'SICK_WITH_DOCTOR'}
+    @sick_days_with_doctors_leave.map! {|a| a.on}
     case request.method
     when :get
       render

data/app/controllers/works_controller.rb

@@ -1,11 +1,11 @@
 class WorksController < ApplicationController
   in_place_edit_for :work, :hours
   in_place_edit_for :work, :invoice
-  in_place_edit_for :work, :started_at_time
+  in_place_edit_for :work, :start_time
   in_place_edit_for :work, :completed_at_time
   skip_before_filter :populate_layout, :except => [:create, :destroy, :edit, :index, :list, :new, :show, :update]
   auto_complete_for :work, :description
-
+  
   def index
     list
     render :action => 'list'
@@ -57,12 +57,13 @@ class WorksController < ApplicationController
         end
         params[:work][:customer_id] = customer.id
       end
+      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.user_id = current_user.id
     end
-    convert_hours_param
-    @work = Work.new(params[:work])
-    @work.completed_at = Time.now unless @work.started_at || @work.completed_at
-    @work.user_id = current_user.id
-    if @work.save
+    if @work && @work.save
       flash[:notice] = 'Work was successfully created.'
     else
       new
@@ -76,7 +77,7 @@ class WorksController < ApplicationController
   end
   
   def edit
-    @work = Work.find(params[:id])
+    @work ||= Work.find(params[:id])
     @work.attributes = params[:work]
     @estimate = Estimate.new(params[:estimate])
     @work_accounts = WorkAccount.find(:all)
@@ -100,26 +101,29 @@ class WorksController < ApplicationController
   end
   
   def update_row
-    update_work
-    flash.discard
-    @next_field = params[:next_field] || 'work_account_name'
+    if update_work
+      #flash.discard
+      @next_field = params[:next_field] || 'work_account_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}
+    else
+      @next_field = params[:field] || 'work_account_name'
+    end
     @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
     update_work
     flash.discard
-    @field = params[:field] || 'started_at_time'
+    @field = params[:field] || 'start_time'
   end
   
   def update_work
     @work = Work.find(params[:id])
     convert_hours_param
     if @work.update_attributes(params[:work])
-      if params[:work] && (params[:work][:started_at_time] || params[:work][:completed_at_time])
+      if params[:work] && (params[:work][:start_time] || params[:work][:completed_at_time])
         @work.calculate_hours!
         @work.save!
       end
@@ -154,6 +158,7 @@ class WorksController < ApplicationController
     @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})
     render :layout => 'wide'
   end
   
@@ -198,7 +203,7 @@ class WorksController < ApplicationController
   
   def auto_complete_for_work_customer_name
     @customers = Customer.find(:all, 
-                              :conditions => [ 'LOWER(name) LIKE ?',
+                               :conditions => [ 'LOWER(name) LIKE ?',
     '%' + params[:work][:customer_name].downcase + '%' ], 
     :order => 'name ASC',
     :limit => 16)

data/app/helpers/absences_helper.rb

@@ -0,0 +1,2 @@
+module AbsencesHelper
+end

data/app/models/absence.rb

@@ -0,0 +1,14 @@
+class Absence < ActiveRecord::Base
+  validates_presence_of :user_id
+  validates_presence_of :on
+  validates_presence_of :reason
+
+  validates_uniqueness_of :on
+  
+  def validate
+    if Work.exists? ['user_id = ? AND (started_on = ? OR (started_on <= ? AND completed_at IS NOT NULL AND completed_at >= ?))', user_id, on, on, on]
+      errors.add :on, "You have already registered work on this date."
+    end
+  end
+  
+end

data/app/models/task.rb

@@ -350,13 +350,14 @@ class Task < ActiveRecord::Base
     # 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
+    new_work.started_on = Time.previous_quarter.to_date
+    new_work.start_time = Time.previous_quarter.time_of_day
     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
+    if last_work && last_work.completed_at > new_work.started_on.at(new_work.start_time)
       new_work.started_at = last_work.completed_at
     end
     

data/app/models/work.rb

@@ -9,12 +9,19 @@ class Work < ActiveRecord::Base
   
   validates_associated :task
   validates_presence_of :work_account
-  validates_presence_of :started_at, :if => :track_times?
+  validates_presence_of :started_on
+  validates_presence_of :start_time, :if => :track_times?
   
   def validate
     errors.add(:work, "Work account is missing") unless work_account
+    if completed_at
+      absence_exists = Absence.exists? ['user_id = ? AND "on" BETWEEN ? AND ?', user_id, started_on, completed_at.to_date]
+    else
+      absence_exists = Absence.exists? :user_id => user_id, :on => started_on
+    end
+    errors.add :started_on, "You have already marked this date with an absence." if absence_exists
   end
-
+  
   alias_method :old_work_account, :work_account
   def work_account
     self.old_work_account || (task && task.work_account)
@@ -33,11 +40,11 @@ class Work < ActiveRecord::Base
   # ]
   def self.works_for_week(year, week_no, user = current_user)
     first = Date.commercial(year, week_no, 1)
-    last = first + 7
-    works = find(:all, :conditions => "completed_at IS NOT NULL AND started_at BETWEEN '#{first.to_time.iso8601}' AND '#{last.to_time.iso8601}'", :order => 'started_at')
+    last = first + 6
+    works = find(:all, :conditions => "completed_at IS NOT NULL AND started_on BETWEEN '#{first}' AND '#{last}'", :order => 'started_on, start_time')
     length = 0
     works_per_day = (0..6).map do |day|
-      works_for_day = works.select {|work| work.started_at.to_date == (first + day) && (work.user_id.nil? || (user && work.user_id == user.id)) }
+      works_for_day = works.select {|work| work.started_on == (first + day) && (work.user_id.nil? || (user && work.user_id == user.id)) }
       length = [length, works_for_day.length].max
       works_for_day
     end
@@ -54,10 +61,10 @@ class Work < ActiveRecord::Base
   def self.works_for_week_by_work_account(year, week_no, user = current_user)
     first_date = Date.commercial(year, week_no, 1)
     last_date = first_date + 6
-    works = find(:all, :conditions => "user_id #{user ? " = #{user.id}" : "IS NULL"} AND completed_at IS NOT NULL AND completed_at BETWEEN '#{first_date.to_time.iso8601}' AND '#{(last_date+1).to_time.iso8601}'", :order => 'completed_at, started_at')
+    works = find(:all, :conditions => "user_id #{user ? " = #{user.id}" : "IS NULL"} AND started_on BETWEEN '#{first_date}' AND '#{last_date}'", :order => 'completed_at, started_on, start_time')
     result = {}
     works.each do |work|
-      day_of_week = work.completed_at.to_date.cwday - 1
+      day_of_week = work.started_on.cwday - 1
       result[work.work_account] ||= []
       result[work.work_account][day_of_week] ||= BigDecimal('0')
       result[work.work_account][day_of_week] += work.hours
@@ -74,13 +81,13 @@ class Work < ActiveRecord::Base
   # }
   def self.work_totals_for_week(year, week_no, user = current_user)
     first = Date.commercial(year, week_no, 1)
-    last = first + 7
-    works = find(:all, :conditions => "completed_at IS NOT NULL AND completed_at BETWEEN '#{first.to_time.iso8601}' AND '#{last.to_time.iso8601}'", :order => 'completed_at, started_at')
+    last = first + 6
+    works = find(:all, :conditions => "completed_at IS NOT NULL AND started_on BETWEEN '#{first}' AND '#{last}'", :order => 'started_on, start_time, completed_at')
     totals_per_work_account = {}
     works.map{|w| w.work_account}.uniq.each do |work_account|
       totals_per_work_account[work_account.id] = [[], []]
        (0..6).each do |day|
-        works_for_day = works.select {|work| (work.work_account == work_account) && (work.completed_at.to_date == (first + day)) && ((user.nil? && work.user_id.nil?) || (user && work.user_id == user.id)) }
+        works_for_day = works.select {|work| (work.work_account == work_account) && (work.started_on == (first + day)) && ((user.nil? && 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? }
         
@@ -97,28 +104,33 @@ class Work < ActiveRecord::Base
   end
   
   def self.find_work_for_day date
-    Work.find(:all, :conditions => "(completed_at IS NULL OR completed_at BETWEEN '#{date}' AND '#{date+1}') AND user_id = #{current_user.id}",
-    :order => 'started_at, completed_at')
+    Work.find(:all, :conditions => "started_on = '#{date}' AND user_id = #{current_user.id}",
+    :order => 'start_time, completed_at')
   end
   
   def started?
     completed_at.nil?
   end
   
-  def started_at_time
-    started_at && started_at.strftime('%H:%M')
+  def started_at
+    started_on && start_time && started_on.at(start_time)
   end
   
-  def started_at_time=(new_value)
-    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)
+  def started_at=(new_value)
+    case new_value
+      when String:
+      t = Time.parse(new_value)
+      when Time:
+      t = new_value
+    else
+      raise "Illegal argument: #{new_value.inspect}"
+    end
+    self.started_on = Date.new(t.year, t.month, t.day)
+    self.start_time = TimeOfDay.new(t.hour, t.min)
   end
   
   def completed_at_time
-    completed_at && completed_at.strftime('%H:%M')
+    completed_at && completed_at.time_of_day
   end
   
   def completed_at_time=(new_value)

data/app/views/absences/_form.rhtml

@@ -0,0 +1,10 @@
+<%= error_messages_for 'absence' %>
+
+<!--[form:absence]-->
+<p><label for="absence_on">On</label><br/>
+<%= date_select 'absence', 'on'  %></p>
+
+<p><label for="absence_reason">Reason</label><br/>
+<%= text_field 'absence', 'reason'  %></p>
+<!--[eoform:absence]-->
+

data/app/views/absences/edit.rhtml

@@ -0,0 +1,9 @@
+<h1>Editing absence</h1>
+
+<% form_tag :action => 'update', :id => @absence do %>
+  <%= render :partial => 'form' %>
+  <%= submit_tag 'Edit' %>
+<% end %>
+
+<%= link_to 'Show', :action => 'show', :id => @absence %> |
+<%= link_to 'Back', :action => 'list' %>

data/app/views/absences/list.rhtml

@@ -0,0 +1,27 @@
+<h1>Listing absences</h1>
+
+<table>
+  <tr>
+  <% for column in Absence.content_columns %>
+    <th><%= column.human_name %></th>
+  <% end %>
+  </tr>
+  
+<% for absence in @absences %>
+  <tr>
+  <% for column in Absence.content_columns %>
+    <td><%=h absence.send(column.name) %></td>
+  <% end %>
+    <td><%= link_to 'Show', :action => 'show', :id => absence %></td>
+    <td><%= link_to 'Edit', :action => 'edit', :id => absence %></td>
+    <td><%= link_to 'Destroy', { :action => 'destroy', :id => absence }, :confirm => 'Are you sure?', :method => :post %></td>
+  </tr>
+<% end %>
+</table>
+
+<%= link_to 'Previous page', { :page => @absence_pages.current.previous } if @absence_pages.current.previous %>
+<%= link_to 'Next page', { :page => @absence_pages.current.next } if @absence_pages.current.next %> 
+
+<br />
+
+<%= link_to 'New absence', :action => 'new' %>