backlog 0.26.0 → 0.28.0

data/History.txt

@@ -1,3 +1,27 @@
+== 0.28.0 2008-04-01
+
+=== Features
+
+* Added public holiday.
+* Added "Sick day with doctor's note".
+* Added search for work and work accounts.
+
+=== Fixes
+
+* Fixed infinite loop sending emails when starting the application after 10 o'clock on the last day of the month. 
+* Fixed scope error for absences.  Only one person could be absent on any date.
+* Added "notes" field to new wrok records.
+
+== 0.27.0 2008-03-31
+
+=== Features
+
+* Added a "Notes" field to work record.
+
+=== Fixes
+
+* Fixed infinite loop sending emails when starting the application after 10 o'clock on the last day of the month. 
+
 == 0.26.0 2008-03-28
 
 === Features

data/app/controllers/absences_controller.rb

@@ -32,6 +32,10 @@ class AbsencesController < ApplicationController
       end
       back_or_redirect_to :action => 'list'
     else
+      if params[:absence][:reason] == ''
+        back_or_redirect_to :action => 'list'
+        return
+      end
       @absence = Absence.new(params[:absence])
       @absence.user_id = current_user.id
       if @absence.save

data/app/controllers/application.rb

@@ -101,18 +101,20 @@ class ApplicationController < ActionController::Base
     end
   end
   
-  def back_or_redirect_to(options)
-    if session[:detours]
-      detour = pop_detour
-      post = detour.delete(:request_method) == :post
-      if post
-        redirect_to_post(detour)
-      else
-        redirect_to detour
-      end
+  def back
+    return false if session[:detours].nil?
+    detour = pop_detour
+    post = detour.delete(:request_method) == :post
+    if post
+      redirect_to_post(detour)
     else
-      redirect_to options
+      redirect_to detour
     end
+    return true
+  end
+  
+  def back_or_redirect_to(options)
+    back or redirect_to options
   end
   
   def pop_detour

data/app/controllers/public_holidays_controller.rb

@@ -0,0 +1,70 @@
+class PublicHolidaysController < 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
+    @public_holiday_pages, @public_holidays = paginate :public_holidays, :per_page => 10
+  end
+  
+  def show
+    @public_holiday = PublicHoliday.find(params[:id])
+  end
+  
+  def new
+    @public_holiday = PublicHoliday.new
+  end
+  
+  def create
+    @public_holiday = PublicHoliday.new(params[:public_holiday])
+    if @public_holiday.save
+      flash[:notice] = 'PublicHoliday was successfully created.'
+      redirect_to :action => 'list'
+    else
+      render :action => 'new'
+    end
+  end
+  
+  def edit
+    @public_holiday = PublicHoliday.find(params[:id])
+  end
+  
+  def update
+    @public_holiday = PublicHoliday.find(params[:id])
+    if @public_holiday.update_attributes(params[:public_holiday])
+      flash[:notice] = 'PublicHoliday was successfully updated.'
+      redirect_to :action => 'show', :id => @public_holiday
+    else
+      render :action => 'edit'
+    end
+  end
+  
+  def destroy
+    PublicHoliday.find(params[:id]).destroy
+    redirect_to :action => 'list'
+  end
+  
+  def mark
+    if params[:public_holiday]
+      on = params[:public_holiday][:on]
+      marked = params[:public_holiday][:marked] == '1'
+      @public_holiday = PublicHoliday.find(:first, :conditions => {:on => on})
+      if marked
+        if @public_holiday.nil?
+          PublicHoliday.create!(:on => on)
+        end
+      else
+        if @public_holiday
+          @public_holiday.destroy
+        end
+      end
+    end
+    back_or_redirect_to :controller => 'works', :action => :daily_work_sheet
+  end
+  
+end

data/app/controllers/search_controller.rb

@@ -5,9 +5,13 @@ class SearchController < ApplicationController
       @search = params[:q]
       @backlogs = Backlog.find(:all, :conditions => ["lower(name) LIKE ?", "%#{@search.downcase}%"])
       @tasks = Task.find(:all, :conditions => ["lower(description) LIKE ? OR lower(notes) LIKE ?", "%#{@search.downcase}%", "%#{@search.downcase}%"])
+      @work_accounts = WorkAccount.find(:all, :conditions => ["lower(name) LIKE ?", "%#{@search.downcase}%"])
+      @works = Work.find(:all, :conditions => ["lower(description) LIKE ? OR lower(notes) LIKE ?", "%#{@search.downcase}%", "%#{@search.downcase}%"])
     else
       @backlogs = []
       @tasks = []
+      @work_accounts = []
+      @works = []
     end
   end
 end

data/app/controllers/works_controller.rb

@@ -57,11 +57,16 @@ class WorksController < ApplicationController
       @work.calculate_hours! unless @work.hours && @work.hours.to_f > 0
       @work.user_id = current_user.id
     end
-    if @work && @work.save
+    if @work && (@work.description || @work.notes || @work.start_time || @work.completed_at) && @work.save
       flash[:notice] = 'Work was successfully created.'
+      @work.task.grab if @work.task
     else
-      new
-      render :action => 'new'
+      if params[:detour]
+        back
+      else
+        new
+        render :action => 'new'
+      end
       return
     end
     
@@ -120,7 +125,7 @@ class WorksController < ApplicationController
     if update_work
       #flash.discard
       @next_field = params[:next_field] || 'description'
-      works = Work.find_work_for_day((@work.started_at || @work.completed_at).to_date)
+      works = Work.find_work_for_day((@work.started_on || @work.completed_at).to_date)
       @day_total = works.inject(BigDecimal('0')){|total,work|total+=work.hours}
     else
       @next_field = params[:field] || 'description'
@@ -181,6 +186,7 @@ class WorksController < ApplicationController
     @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, :user_id => current_user.id})
+    @public_holiday = PublicHoliday.find(:first, :conditions => {:on => @date})
     render :layout => 'wide'
   end
   
@@ -202,6 +208,10 @@ class WorksController < ApplicationController
     @first_date = Date.commercial(@year, @week, 1)
     @last_date = @first_date + 6
     @lock = WorkLock.find(:first, :conditions => ['user_id = ? AND start_on <= ? AND end_on >= ?', current_user.id, @first_date, @last_date])
+    @absences = Absence.find(:all, :conditions => ['"on" BETWEEN ? AND ?', @first_date, @last_date], :order => '"on"')
+    (0..6).each do |day|
+      @absences.insert(day, nil) if @absences[day] && @absences[day].on > @first_date + day
+    end
     render :layout => 'wide'
   end
   

data/app/helpers/public_holidays_helper.rb

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

data/app/models/absence.rb

@@ -3,12 +3,15 @@ class Absence < ActiveRecord::Base
   validates_presence_of :on
   validates_presence_of :reason
 
-  validates_uniqueness_of :on
+  validates_uniqueness_of :on, :scope => :user_id
   
   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
+    if PublicHoliday.exists? :on => on
+      errors.add :on, "You cannot mark absence on a public holiday."
+    end
   end
   
 end

data/app/models/public_holiday.rb

@@ -0,0 +1,2 @@
+class PublicHoliday < ActiveRecord::Base
+end

data/app/models/work.rb

@@ -134,7 +134,8 @@ class Work < ActiveRecord::Base
   end
   
   def completed_at_time=(new_value)
-    if new_value == ''
+    new_value.strip!
+    if new_value.empty?
       self.completed_at = nil
       return
     end

data/app/models/work_lock_nagger.rb

@@ -20,8 +20,10 @@ class WorkLockNagger
         url = url_for(:host => host, :port => port, :controller => 'works', :action => :weekly_work_sheet_by_work_account)
       end
     rescue Exception => e
+      puts "Work Lock Nagger Exception"
       puts e.message
       puts e.backtrace
+      exit 1
     end
     
     loop do
@@ -39,14 +41,18 @@ class WorkLockNagger
           WorkLockNotify.deliver_nag(u, week, url + "/#{year}/#{week}")
         end
         now = Time.now
-        next_nag_time = Time.local(now.year, now.month, now.hour < 10 ? now.day : now.day + 1, 10, 0, 0)
+        next_nag_time = Time.local(now.year, now.month, now.day, 10, 0, 0)
+        next_nag_time += 1.day if next_nag_time <= now
         sleep_duration = next_nag_time - now
         puts "Sleeping #{sleep_duration.to_i / 3600} hours #{(sleep_duration.to_i % 3600) / 60} minutes and #{sleep_duration.to_i % 60} seconds."
+        puts "From #{now} to #{next_nag_time}."
         sleep sleep_duration
       rescue Exception => e
         p e
+        puts e.backtrace
+        sleep 5.minutes
       end
-      puts "Nag ends"
+      puts "Nag ends"; STDOUT.flush
     end
   end
   

data/app/views/public_holidays/_form.rhtml

@@ -0,0 +1,7 @@
+<%= error_messages_for 'public_holiday' %>
+
+<!--[form:public_holiday]-->
+<p><label for="public_holiday_on">On</label><br/>
+<%= date_select 'public_holiday', 'on'  %></p>
+<!--[eoform:public_holiday]-->
+

data/app/views/public_holidays/edit.rhtml

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

data/app/views/public_holidays/list.rhtml

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

data/app/views/public_holidays/new.rhtml

@@ -0,0 +1,8 @@
+<h1>New public_holiday</h1>
+
+<% form_tag :action => 'create' do %>
+  <%= render :partial => 'form' %>
+  <%= submit_tag "Create" %>
+<% end %>
+
+<%= link_to 'Back', :action => 'list' %>

data/app/views/public_holidays/show.rhtml

@@ -0,0 +1,8 @@
+<% for column in PublicHoliday.content_columns %>
+<p>
+  <b><%= column.human_name %>:</b> <%=h @public_holiday.send(column.name) %>
+</p>
+<% end %>
+
+<%= link_to 'Edit', :action => 'edit', :id => @public_holiday %> |
+<%= link_to 'Back', :action => 'list' %>

data/app/views/search/results.rhtml

@@ -1,5 +1,27 @@
 <% @page_title = l(:search_results_for, @search) %>
 
+<div id="lfeature">
+  <div class="btitle">
+    <h4><%=l(:backlogs) %></h4>
+  </div>
+<ul>
+<% @backlogs.each do |backlog| %>
+<li><%=link_to backlog.name, :controller => 'backlogs', :action => :show, :id => backlog%></li>
+<% end %>
+</ul>
+</div>
+
+<div id="rfeature">
+  <div class="btitle">
+    <h4><%=l(:work_accounts) %></h4>
+  </div>
+<ul>
+<% @work_accounts.each do |work_account| %>
+<li><%=link_to task.description, :controller => 'work_accounts', :action => :edit, :id => work_account%></li>
+<% end %>
+</ul>
+</div>
+
 <div id="lfeature">
   <div class="btitle">
     <h4><%=l(:tasks) %></h4>
@@ -13,11 +35,17 @@
 
 <div id="rfeature">
   <div class="btitle">
-    <h4><%=l(:backlogs) %></h4>
+    <h4><%=l(:work) %></h4>
   </div>
 <ul>
-<% @backlogs.each do |backlog| %>
-<li><%=link_to backlog.name, :controller => 'backlogs', :action => :show, :id => backlog%></li>
+<% @works.each do |work| %>
+<li><%=link_to "#{work.description && !work.description.empty? ? work.description : l(:empty_work_record)}", :controller => 'works', :action => :edit, :id => work%></li>
 <% end %>
 </ul>
-</div>
+</div>
+
+<script type="text/javascript">
+f = $('q');
+f.focus();
+f.select();
+</script>

data/app/views/works/_new_row.rhtml

@@ -0,0 +1,141 @@
+<% form_tag with_detour(:controller => 'works', :action => 'create'), :id => "work_form" do %>
+<%=submit_tag('checkmark', :value => l(:save), :style => 'display: none')%>
+<%=hidden_field :work, :started_on, :value => @date %>
+
+  <tr>
+    <td id="account_cell" valign="bottom">
+      <%=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,
+        :onkeypress => "
+   			if(event.ctrlKey && event.keyCode == 40) { // CTRL-Down-arrow
+				$('work_notes_div').style.visibility = 'visible';
+   				e = $('work_notes'); 
+   				e.focus();
+   				// e.select();
+	        } else if(event.keyCode == 38) { 
+	          e = $('work#{"_#{last_work.id}" if last_work}_description'); 
+	          e.focus();
+	          e.select();
+	        } else if(event.keyCode == 13) {
+	          e = $('work_work_account_id'); 
+			  if(e.value == '') {
+	          	e.focus();
+	          	e.select();
+			  	return false;
+			  }
+	        }"
+	  %>
+	  <br clear="all"/>
+			<% field = 'notes' %> 
+    	    <% next_field = 'description' %>
+			<div id="work_notes_div" style="visibility: hidden; position: absolute; opacity: .8">
+	    	<%=text_area :work, :notes, :id => "work_#{field}",
+        		#:onchange => "new Ajax.Request('/works/update_new_row?field=#{field}&next_field=#{next_field}', {asynchronous:true, evalScripts:true, parameters:Form.serialize(form)});",
+        		:onkeypress => "
+        			if(event.ctrlKey && event.keyCode == 38) { // CTRL-UP-arrow
+          				e = $('work_description'); 
+          				e.focus();
+          				//e.select();
+        			} else if(event.keyCode == 38) { // Up-arrow
+          				notes_field = $('work_#{field}');
+						if (notes_field.selectionStart == 0 || notes_field.value.indexOf('\\n') == -1 || notes_field.value.indexOf('\\n') > notes_field.selectionStart) {
+	          				description_field = $('work_description');
+          					description_field.focus();
+          					//description_field.select();
+							return false;
+						}
+        			}",
+				:onBlur => "
+					$('work_notes_div').style.visibility = 'hidden';
+				",
+				:cols => 80
+			%>
+			</div>
+    </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'); 
+          e.focus();
+          e.select();
+        } else if(event.keyCode == 13) {
+          e = $('work_work_account_id'); 
+		  if(e.value == '') {
+          	e.focus();
+          	e.select();
+		  	return false;
+		  }
+        }"
+		 %>
+    </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 => "
+								'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'); 
+          e.focus();
+          e.select();
+        } else if(event.keyCode == 13) {
+          e = $('work_work_account_id'); 
+		  if(e.value == '') {
+          	e.focus();
+          	e.select();
+		  	return false;
+		  }
+        }", 
+				:value => @work && @work.completed_at_time.strftime('%H:%M')
+		%>
+	</td>
+    <td align="right" valign="bottom">
+      <%=text_field :work, :hours_time, :value => '', :class => 'task_hours',
+        :onkeypress => "
+        if(event.keyCode == 38) { 
+          e = $('work#{"_#{last_work.id}" if last_work}_hours_time'); 
+          e.focus();
+          e.select();
+        } else if(event.keyCode == 13) {
+          e = $('work_work_account_id'); 
+		  if(e.value == '') {
+          	e.focus();
+          	e.select();
+		  	return false;
+		  }
+        }"
+		 %>
+    </td>
+    <td valign="bottom">
+      <%=text_field_with_auto_complete :work, :task_id, {:value => '', :size => 16, :class => :task_id} %>
+    </td>
+    <td id="work_invoice_cell" align="left" valign="bottom">
+      <%=check_box :work, :invoice %>
+    </td>
+    <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 %>

data/app/views/works/_row.rhtml

@@ -5,8 +5,58 @@
       <% end %>
     </td>
     <td>
-		<%=render :partial => 'row_field', :locals => {:field => 'description', 
-        :next_field => 'start_time', :next_row_id => next_row_id, :previous_row_id => previous_row_id} %>
+		<% field = 'description' %> 
+        <% next_field = 'start_time' %>
+		<% previous_row_id = previous_row_id %>
+      	<% remote_form_for :work, :url => {:action => :update_row, :id => @work.id, :field=>field, :next_field => next_field} do |f|%>
+	    	<%=text_field :work, field, :id => "work_#{@work.id}_#{field}",
+				: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.ctrlKey && event.keyCode == 40) { // CTRL-Down-arrow
+						$('work#{"_#{@work.id}"}_notes_div').style.visibility = 'visible';
+          				e = $('work_#{@work.id}_notes'); 
+          				e.focus();
+          				// e.select();
+        			} else 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) { // Up-arrow
+          				e = $('work#{"_#{previous_row_id}" if previous_row_id}_#{field}'); 
+          				e.focus();
+          				e.select();
+        			}",
+        		:value => (field=~/_time$/ ? @work.send(field) && @work.send(field).strftime('%H:%M') : @work.send(field) )
+			%>
+			<% field = 'notes' %> 
+    	    <% next_field = 'description' %>
+			<div id="work_<%=@work.id%>_notes_div" style="visibility: hidden; position: absolute; opacity: .8">
+	    	<%=text_area :work, :notes, :id => "work_#{@work.id}_#{field}",
+        		: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.ctrlKey && event.keyCode == 38) { // CTRL-UP-arrow
+          				e = $('work_#{@work.id}_description'); 
+          				e.focus();
+          				//e.select();
+        			} else if(event.keyCode == 38) { // Up-arrow
+          				notes_field = $('work_#{@work.id}_#{field}');
+						if (notes_field.selectionStart == 0 || notes_field.value.indexOf('\\n') == -1 || notes_field.value.indexOf('\\n') > notes_field.selectionStart) {
+	          				description_field = $('work_#{@work.id}_description');
+          					description_field.focus();
+          					//description_field.select();
+							return false;
+						}
+        			}",
+				:onBlur => "
+					$('work#{"_#{@work.id}"}_notes_div').style.visibility = 'hidden';
+				",
+        		:value => @work.send(field),
+				:cols => 80
+			%>
+			</div>
+      	<% end %>
+
     </span>
     <td align="right">
 		<%=render :partial => 'row_field', :locals => {:field => 'start_time', 

data/app/views/works/daily_work_sheet.rhtml

@@ -10,14 +10,31 @@
 
 <br clear="all" />
 
-<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? && (@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 %>
-</div>
+<table>
+	<tr>
+		<td>
+			<div id="absence">
+				<% work_disabled = !@works.empty? && (@absence.nil? || @absence.reason.nil? || @absence.reason.empty?) %>
+				<% absence_disabled = !@works.empty? || @public_holiday %>
+				<% 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 => 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_WITH_DOCTOR', :disabled => absence_disabled, :onchange => 'form.submit()' %><label for="absence_reason_sick">Sick day with doctor's note</label>
+				<% end %>
+			</div>
+		</td>
+		<td>
+			<div id="public_holiday">
+				<% form_for :public_holiday, :html => {:id => :public_holiday_form}, :url => with_detour({:controller => 'public_holidays', :action => :mark}) do |f| %>
+					<%=f.hidden_field :on, :value => @date %>
+					<%=f.check_box :marked, :checked => !@public_holiday.nil?, :onchange => 'form.submit()' %><label for="public_holiday_marked"><%=l :public_holiday%></label>
+				<% end %>
+			</div>
+		</td>
+	</tr>
+</table>
 
 <br clear="all" />
 
@@ -48,119 +65,10 @@
 
 <% unless @absence %>
 <% @work = nil %>
-
-<% form_tag with_detour(:controller => 'works', :action => 'create'), :id => "work_form" do %>
-<%=submit_tag('checkmark', :value => l(:save), :style => 'display: none')%>
-<%=hidden_field :work, :started_on, :value => @date %>
-
-  <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"} %>
-      <%=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,
-        :onkeypress => "
-        if(event.keyCode == 38) { 
-          e = $('work#{"_#{last_work.id}" if last_work}_description'); 
-          e.focus();
-          e.select();
-        } else if(event.keyCode == 13) {
-          e = $('work_work_account_name'); 
-		  if(e.value == '') {
-          	e.focus();
-          	e.select();
-		  	return false;
-		  }
-        }"
-	  %>
-    </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'); 
-          e.focus();
-          e.select();
-        } else if(event.keyCode == 13) {
-          e = $('work_work_account_name'); 
-		  if(e.value == '') {
-          	e.focus();
-          	e.select();
-		  	return false;
-		  }
-        }"
-		 %>
-    </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 => "
-								'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'); 
-          e.focus();
-          e.select();
-        } else if(event.keyCode == 13) {
-          e = $('work_work_account_name'); 
-		  if(e.value == '') {
-          	e.focus();
-          	e.select();
-		  	return false;
-		  }
-        }", 
-				:value => @work && @work.completed_at_time.strftime('%H:%M')
-		%>
-	</td>
-    <td align="right" valign="bottom">
-      <%=text_field :work, :hours_time, :value => '', :class => 'task_hours',
-        :onkeypress => "
-        if(event.keyCode == 38) { 
-          e = $('work#{"_#{last_work.id}" if last_work}_hours_time'); 
-          e.focus();
-          e.select();
-        } else if(event.keyCode == 13) {
-          e = $('work_work_account_name'); 
-		  if(e.value == '') {
-          	e.focus();
-          	e.select();
-		  	return false;
-		  }
-        }"
-		 %>
-    </td>
-    <td valign="bottom">
-      <%=text_field_with_auto_complete :work, :task_id, {:value => '', :size => 16, :class => :task_id} %>
-    </td>
-    <td id="work_invoice_cell" align="left" valign="bottom">
-      <%=check_box :work, :invoice %>
-    </td>
-    <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>
+  <%=render :partial => 'new_row', :locals => {:last_work => last_work} %>
 <% end %>
 
+<% unless @works.empty? %>
   <tr>
     <td/>
     <th><%=l :totals %></th>
@@ -184,23 +92,17 @@
 <%=render :partial => '/periods/burn_down_chart' %>
 <% end %>
 
+<% unless @absence %>
 <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';
-<% end %>
 var start_field;
 <% if last_work.completed_at %>
-  start_field = $('work_work_account_id');
+	start_field = $('work_work_account_id');
 <% 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();
 //-->
 </script>
+<% end %>

data/app/views/works/update_new_row.rjs

@@ -4,15 +4,17 @@ if @work && @work.errors.empty?
     if field_name.to_s =~ /(.*)_time$/
       attribute_name = $1
       value = @work[attribute_name] || @work[field_name]
-      if value.is_a? BigDecimal
+      if value.nil?
+        value = ''
+      elsif value.is_a? BigDecimal
         value = t(value)
       else
         value = value.strftime('%H:%M')
       end
-      page["work_" + field_name.to_s].value = value
     else
-      page["work_" + field_name.to_s].value = @work.send(field_name).to_s
+      value = @work.send(field_name).to_s
     end
+    page["work_" + field_name.to_s].value = value
   end
   #page.replace "work_#{@work.id}", :partial => 'row', :object => @work
   #page["work_#{@work.id}_#{@next_field}"].select

data/app/views/works/weekly_work_sheet_by_work_account.rhtml

@@ -36,9 +36,10 @@
   <tr>
   	<th><%=l :totals%></th>
 <% (0..6).each do |day| %>
+	<% day_totals[day] += 8 if @absences[day] %>
     <th class="hours"><%='%d:%02d' % [day_totals[day], 60 * day_totals[day] % 60] if day_totals[day] > 0%></th>
 <% end %>
-<% week_total = week_totals.values.inject(0) {|total, work_account_total| total + work_account_total} %>
+<% week_total = day_totals.inject(0) {|total, day_total| total + day_total} %>
     <th class="hours"><%= '%d:%02d' % [week_total, 60 * week_total % 60] %></th>
   </tr>
 </table>

data/db/migrate/029_add_work_comments.rb

@@ -0,0 +1,9 @@
+class AddWorkComments < ActiveRecord::Migration
+  def self.up
+    add_column :works, :notes, :text
+  end
+
+  def self.down
+    remove_column :works, :notes
+  end
+end

data/db/migrate/030_create_public_holidays.rb

@@ -0,0 +1,11 @@
+class CreatePublicHolidays < ActiveRecord::Migration
+  def self.up
+    create_table :public_holidays do |t|
+      t.column :on, :date, :null => false
+    end
+  end
+
+  def self.down
+    drop_table :public_holidays
+  end
+end

data/db/schema.rb

@@ -2,7 +2,7 @@
 # migrations feature of ActiveRecord to incrementally modify your database, and
 # then regenerate this schema definition.
 
-ActiveRecord::Schema.define(:version => 28) do
+ActiveRecord::Schema.define(:version => 30) do
 
   create_table "absences", :force => true do |t|
     t.column "user_id", :integer, :null => false
@@ -60,6 +60,10 @@ ActiveRecord::Schema.define(:version => 28) do
     t.column "party_id", :integer
   end
 
+  create_table "public_holidays", :force => true do |t|
+    t.column "on", :date, :null => false
+  end
+
   create_table "task_files", :force => true do |t|
     t.column "task_id",      :integer,               :null => false
     t.column "name",         :string,  :limit => 64, :null => false
@@ -140,6 +144,7 @@ ActiveRecord::Schema.define(:version => 28) do
     t.column "description",     :string
     t.column "started_on",      :date,                                                    :null => false
     t.column "start_time",      :time
+    t.column "notes",           :text
   end
 
   add_index "works", ["task_id", "completed_at"], :name => "index_works_on_task_id_and_completed_at"

data/lang/en.yaml

@@ -26,6 +26,7 @@ done: Done
 down: Down
 edit: Edit
 editing: Editing
+empty_work_record: Empty work record
 enable_customer: Enable customer
 enable_invoicing: Enable invoicing
 enable_periods: Enable Sprints
@@ -41,6 +42,7 @@ grab_task: Grab task
 grabbed_by_you: Grabbed by you
 group: Group
 groups: Groups
+holiday: Holiday
 holidays_used: Holidays used
 home: Home
 hours: Hours
@@ -85,6 +87,7 @@ postponed: Postponed
 previous: Previous
 previous_abr: Prev.
 projection: Projection
+public_holiday: Public Holiday
 release_task: Release task
 reopen: Reopen task
 resolution: Resolution

data/lang/no.yaml

@@ -26,6 +26,7 @@ done: Utført
 down: Ned
 edit: Rediger
 editing: Redigerer
+empty_work_record: Tom arbeidslinje
 enable_customer: Tillat kunder
 enable_invoicing: Tillat fakturering
 enable_periods: Tillat sprinter
@@ -41,6 +42,7 @@ grab_task: Grip oppgave
 grabbed_by_you: Tatt av deg
 group: Gruppe
 groups: Grupper
+holiday: Ferie
 holidays_used: Brukte feriedager
 home: Hjem
 hours: Timer
@@ -85,6 +87,7 @@ postponed: Utsatt
 previous: Forrige
 previous_abr: Forrige
 projection: Projeksjon
+public_holiday: Offentlig fridag
 release_task: Slipp oppgave
 reopen: Gjenåpne
 resolution: Avslutningsmåte

data/test/fixtures/public_holidays.yml

@@ -0,0 +1,7 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+one:
+  id: 1
+  "on": 2008-04-01
+two:
+  id: 2
+  "on": 2008-11-25

data/test/functional/public_holidays_controller_test.rb

@@ -0,0 +1,93 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'public_holidays_controller'
+
+# Re-raise errors caught by the controller.
+class PublicHolidaysController; def rescue_action(e) raise e end; end
+
+class PublicHolidaysControllerTest < Test::Unit::TestCase
+  fixtures :public_holidays
+
+  def setup
+    @controller = PublicHolidaysController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @request.session[:user_id] = 1000001
+
+    @first_id = public_holidays(:one).id
+  end
+
+  def test_index
+    get :index
+    assert_response :success
+    assert_template 'list'
+  end
+
+  def test_list
+    get :list
+
+    assert_response :success
+    assert_template 'list'
+
+    assert_not_nil assigns(:public_holidays)
+  end
+
+  def test_show
+    get :show, :id => @first_id
+
+    assert_response :success
+    assert_template 'show'
+
+    assert_not_nil assigns(:public_holiday)
+    assert assigns(:public_holiday).valid?
+  end
+
+  def test_new
+    get :new
+
+    assert_response :success
+    assert_template 'new'
+
+    assert_not_nil assigns(:public_holiday)
+  end
+
+  def test_create
+    num_public_holidays = PublicHoliday.count
+
+    post :create, :public_holiday => {:on => '2008-05-27'}
+
+    assert_response :redirect
+    assert_redirected_to :action => 'list'
+
+    assert_equal num_public_holidays + 1, PublicHoliday.count
+  end
+
+  def test_edit
+    get :edit, :id => @first_id
+
+    assert_response :success
+    assert_template 'edit'
+
+    assert_not_nil assigns(:public_holiday)
+    assert assigns(:public_holiday).valid?
+  end
+
+  def test_update
+    post :update, :id => @first_id
+    assert_response :redirect
+    assert_redirected_to :action => 'show', :id => @first_id
+  end
+
+  def test_destroy
+    assert_nothing_raised {
+      PublicHoliday.find(@first_id)
+    }
+
+    post :destroy, :id => @first_id
+    assert_response :redirect
+    assert_redirected_to :action => 'list'
+
+    assert_raise(ActiveRecord::RecordNotFound) {
+      PublicHoliday.find(@first_id)
+    }
+  end
+end

data/test/unit/public_holiday_test.rb

@@ -0,0 +1,10 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class PublicHolidayTest < Test::Unit::TestCase
+  fixtures :public_holidays
+
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end

data/test/unit/time_of_day_test.rb

@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class TimeOfDayTest < Test::Unit::TestCase
+  def setup
+    @twelve_o_clock = TimeOfDay.parse '12:00:00'
+  end
+
+  def teardown
+  end
+
+  def test_parse_full
+    assert_equal @twelve_o_clock, TimeOfDay.parse('12:00:00')
+  end
+
+  def test_parse_hour_and_minute
+    assert_equal @twelve_o_clock, TimeOfDay.parse('12:00')
+  end
+
+  def test_parse_hour_only
+    assert_equal @twelve_o_clock, TimeOfDay.parse('12')
+  end
+
+end

data/vendor/plugins/rails_time/lib/time_of_day.rb

@@ -19,7 +19,9 @@ class TimeOfDay
   end
   
   def self.parse(string)
-    raise "Illegal time format: '#{string}'" unless string =~ /(\d{1,2}):?(\d{2})(?::(\d{1,2}))?/
+    string.strip!
+    return nil if string.empty?
+    raise "Illegal time format: '#{string}'" unless string =~ /(\d{1,2}):?(\d{2})?(?::(\d{1,2}))?/
     self.new($1.to_i, $2.to_i, $3.to_i)
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.26.0
+  version: 0.28.0
 platform: ruby
 authors: 
 - Uwe Kubosch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-28 00:00:00 +01:00
+date: 2008-04-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -133,6 +133,12 @@ files:
 - app/views/work_accounts/_name_list.rhtml
 - app/views/work_accounts/show.rhtml
 - app/views/estimates
+- app/views/public_holidays
+- app/views/public_holidays/new.rhtml
+- app/views/public_holidays/list.rhtml
+- app/views/public_holidays/edit.rhtml
+- app/views/public_holidays/_form.rhtml
+- app/views/public_holidays/show.rhtml
 - app/views/parties
 - app/views/groups
 - app/views/groups/new.rhtml
@@ -163,6 +169,7 @@ files:
 - app/views/works/list.rhtml
 - app/views/works/_row.rhtml
 - app/views/works/list_excel.rhtml
+- app/views/works/_new_row.rhtml
 - app/views/works/_buttons.rhtml
 - app/views/works/_task_id_list.rhtml
 - app/views/works/timeliste.rhtml
@@ -233,6 +240,7 @@ files:
 - app/controllers/periods_controller.rb
 - app/controllers/search_controller.rb
 - app/controllers/work_accounts_controller.rb
+- app/controllers/public_holidays_controller.rb
 - app/controllers/task_files_controller.rb
 - app/controllers/tasks_controller.rb
 - app/controllers/absences_controller.rb
@@ -252,8 +260,10 @@ files:
 - app/helpers/parties_helper.rb
 - app/helpers/periods_helper.rb
 - app/helpers/search_helper.rb
+- app/helpers/public_holidays_helper.rb
 - app/helpers/absences_helper.rb
 - app/models
+- app/models/public_holiday.rb
 - app/models/work_lock_notify.rb
 - app/models/work.rb
 - app/models/work_lock_nagger.rb
@@ -307,6 +317,8 @@ files:
 - test/unit/work_account_test.rb
 - test/unit/localization_test.rb
 - test/unit/work_lock_subscription_test.rb
+- test/unit/time_of_day_test.rb
+- test/unit/public_holiday_test.rb
 - test/unit/period_test.rb
 - test/unit/estimate_test.rb
 - test/unit/party_test.rb
@@ -321,6 +333,7 @@ files:
 - test/functional/tasks_controller_test.rb
 - test/functional/welcome_controller_test.rb
 - test/functional/parties_controller_test.rb
+- test/functional/public_holidays_controller_test.rb
 - test/functional/absences_controller_test.rb
 - test/functional/user_controller_test.rb
 - test/functional/backlogs_controller_test.rb
@@ -354,6 +367,7 @@ files:
 - test/fixtures/periods.yml
 - test/fixtures/parties.yml
 - test/fixtures/works.yml
+- test/fixtures/public_holidays.yml
 - test/fixtures/users.yml
 - test/fixtures/customers.yml
 - test/fixtures/tasks.yml
@@ -683,10 +697,12 @@ files:
 - db/migrate/015_add_user_option.rb
 - db/migrate/028_create_absences.rb
 - db/migrate/019_remove_unique_index_for_period_position.rb
+- db/migrate/030_create_public_holidays.rb
 - db/migrate/021_create_work_accounts.rb
 - db/migrate/014_add_customer_option.rb
 - db/migrate/022_remove_track_done_flag.rb
 - db/migrate/012_add_resolution.rb
+- db/migrate/029_add_work_comments.rb
 - db/migrate/023_add_indices_for_burn_down_chart.rb
 - db/migrate/017_insert_datek_projects.rb
 - db/migrate/006_works_data_fix.rb