backlog 0.18.0 → 0.19.0

data/History.txt

@@ -1,3 +1,21 @@
+== 0.19.0 2008-01-23
+
+=== Features
+
+* Added button to recalculate the hours when changing start/stop times in the create/edit work record view.
+* Added locking of work records, and notification.
+* Added work accounts list link to navigation top.
+* Changed weekly work sheet to show totals instead of individual work records.
+  Added links in the weekly work sheet to each day for details.
+* Improved daily work sheet.  Maybe usable now.
+
+=== Fixes
+
+* Fixed bug when grabbing/releasing a task and then starting and stopping work.
+  This would render javascript in cleartext.
+* Changed redirect after login from displaying backlog to welcome view.
+* Fixed Excel export.
+
 == 0.18.0 2008-01-21
 
 === Features
@@ -11,6 +29,7 @@
 === Fixes
 
 * Updated graphs in README.txt
+* Sorted work account list by name.
 
 == 0.17.6 2008-01-19
 

data/app/controllers/periods_controller.rb

@@ -147,20 +147,6 @@ class PeriodsController < ApplicationController
     move_task_to_period
   end
   
-  def grab_task
-    @task = Task.find(params[:id])
-    @task.grab
-    load_tasks(@task.period)
-    render :template => '/tasks/_update.rjs'
-  end
-  
-  def release_task
-    @task = Task.find(params[:id])
-    @task.release
-    load_tasks(@task.period)
-    render :template => '/tasks/_update.rjs'
-  end
-  
   def finish_task
     @task = Task.find(params[:id])
     @task.finish(Task::COMPLETED, true)

data/app/controllers/tasks_controller.rb

@@ -196,10 +196,21 @@ class TasksController < ApplicationController
     redirect_to :controller => 'periods', :action => :show_no_layout, :id => task.period_id, :task => task.id
   end
   
-#  def order
-#    params[:list].each_with_index { |id,idx| Model.update(id, :position => idx) }
-#    render :text => 'Updated sort order'
-#  end
+  def grab
+    @task = Task.find(params[:id])
+    @task.grab
+    detour = pop_detour
+    params.update(detour) if detour
+    render :template => '/tasks/_update.rjs'
+  end
+  
+  def release
+    @task = Task.find(params[:id])
+    @task.release
+    detour = pop_detour
+    params.update(detour) if detour
+    render :template => '/tasks/_update.rjs'
+  end
   
   def start_work
     @task = Task.find(params[:id])

data/app/controllers/user_controller.rb

@@ -14,7 +14,7 @@ class UserController < ApplicationController
         cookies[:autologin] = {:value => user.id.to_s, :expires =>90.days.from_now}
         cookies[:token]     = {:value => user.security_token, :expires =>90.days.from_now}
       end
-      back_or_redirect_to :controller => 'backlogs', :action => :index
+      back_or_redirect_to :controller => 'welcome', :action => :index
     else
       @login = params['user']['login']
       flash[:notice] = 'Login failed'
@@ -155,6 +155,20 @@ class UserController < ApplicationController
     @users = User.find(:all)
   end
 
+  def toggle_work_lock_monitoring
+    @user = User.find(params[:id])
+    already_monitoring = @user.work_lock_subscribers.include? current_user
+    if already_monitoring
+      @user.work_lock_subscribers.delete current_user
+      action = 'stopped'
+    else
+      @user.work_lock_subscribers << current_user
+      action = 'started'
+    end
+    flash[:notice] = "Monitoring #{action}"
+    UserNotify.deliver_monitoring(@user, current_user, action)
+  end
+  
   protected
   
   def protect?(action)

data/app/controllers/work_accounts_controller.rb

@@ -9,7 +9,7 @@ class WorkAccountsController < ApplicationController
          :redirect_to => { :action => :list }
 
   def list
-    @work_accounts = WorkAccount.paginate :page => params[:page]
+    @work_accounts = WorkAccount.paginate :page => params[:page], :order => 'name'
   end
 
   def show

data/app/controllers/work_locks_controller.rb

@@ -0,0 +1,88 @@
+class WorkLocksController < 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
+    @work_lock_pages, @work_locks = paginate :work_locks, :per_page => 10
+  end
+  
+  def show
+    @work_lock = WorkLock.find(params[:id])
+  end
+  
+  def new
+    @work_lock = WorkLock.new
+  end
+  
+  def create
+    @work_lock = WorkLock.new(params[:work_lock])
+    if @work_lock.save
+      flash[:notice] = 'WorkLock was successfully created.'
+      redirect_to :action => 'list'
+    else
+      render :action => 'new'
+    end
+  end
+  
+  def edit
+    @work_lock = WorkLock.find(params[:id])
+  end
+  
+  def update
+    @work_lock = WorkLock.find(params[:id])
+    if @work_lock.update_attributes(params[:work_lock])
+      flash[:notice] = 'WorkLock was successfully updated.'
+      redirect_to :action => 'show', :id => @work_lock
+    else
+      render :action => 'edit'
+    end
+  end
+  
+  def destroy
+    WorkLock.find(params[:id]).destroy
+    redirect_to :action => 'list'
+  end
+  
+  def lock
+    @year = (params[:year] && params[:year].to_i) || Date.today.year
+    @week = (params[:week] && params[:week].to_i) || Date.today.cweek
+    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])
+    raise "Already locked" if @lock
+    WorkLock.create! :user_id => current_user.id, :start_on => first_date, :end_on => last_date
+    work_account_subscribers = Work.works_for_week(@year, @week).flatten.compact.map {|w| w.work_account}.uniq.map {|wa| wa.work_lock_subscribers}.flatten.uniq
+    user_subscribers = current_user.work_lock_subscribers
+    notify_users = (work_account_subscribers + user_subscribers).uniq
+    notify_users.each do |user|
+      week_url = url_for :controller => 'works', :action => :weekly_work_sheet_by_work_account, :year => @year, :week => @week
+      spreadsheet_url = url_for :controller => 'works', :action => :timeliste, :year => @year, :week => @week
+      WorkLockNotify.deliver_lock(user, current_user, @week, week_url, spreadsheet_url)
+    end
+    back_or_redirect_to :controller => 'works', :action => :weekly_work_sheet, :year => @year, :week => @week
+  end
+  
+  def unlock
+    get_lock_from_params
+    raise "Not locked" unless @lock
+    raise "Unable to destroy" unless @lock.destroy
+    back_or_redirect_to :controller => 'works', :action => :weekly_work_sheet, :year => @year, :week => @week
+  end
+  
+  private
+  
+  def get_lock_from_params
+    @year = (params[:year] && params[:year].to_i) || Date.today.year
+    @week = (params[:week] && params[:week].to_i) || Date.today.cweek
+    @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])
+  end
+  
+end

data/app/controllers/works_controller.rb

@@ -3,7 +3,7 @@ class WorksController < ApplicationController
   in_place_edit_for :work, :invoice
   in_place_edit_for :work, :started_at_time
   in_place_edit_for :work, :completed_at_time
-  skip_before_filter :populate_layout, :except => [:create, :destroy, :edit, :index, :list, :new, :show, :update]
+  skip_before_filter :populate_layout, :except => [:create, :destroy, :edit, :index, :list, :new, :show, :update, :daily_work_sheet, :weekly_work_sheet_by_work_account]
   auto_complete_for :work, :description
   
   def index
@@ -73,7 +73,7 @@ class WorksController < ApplicationController
     @work.attributes = params[:work]
     @estimate = Estimate.new(params[:estimate])
     @work_accounts = WorkAccount.find(:all)
-    @tasks = Task.find_open
+    @tasks = [@work.task] + Task.find_open
     @users = User.find(:all)
   end
   
@@ -91,6 +91,7 @@ class WorksController < ApplicationController
     update_work
     flash.discard
     @field = params[:field] || 'started_at_time'
+    @work_accounts = WorkAccount.find(:all, :order => :name)
   end
   
   def update_time
@@ -133,6 +134,7 @@ class WorksController < ApplicationController
     @works = Work.find_work_for_day @date
     @started_works = Task.find_started
     @work = Work.new(:started_at => Time.now, :completed_at => Time.now)
+    @work_accounts = WorkAccount.find(:all, :order => :name)
     render :layout => 'wide'
   end
   
@@ -140,12 +142,26 @@ class WorksController < ApplicationController
     @year = (params[:year] && params[:year].to_i) || Date.today.year
     @week = (params[:week] && params[:week].to_i) || Date.today.cweek
     @rows = Work.works_for_week(@year, @week)
+    @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])
+    render :layout => 'wide'
+  end
+  
+  def weekly_work_sheet_by_work_account
+    @year = (params[:year] && params[:year].to_i) || Date.today.year
+    @week = (params[:week] && params[:week].to_i) || Date.today.cweek
+    @work_accounts = Work.works_for_week_by_work_account(@year, @week)
+    @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])
     render :layout => 'wide'
   end
   
   def timeliste
-    @week = (params[:id] && params[:id].to_i) || Date.today.cweek
-    @backlogs = Work.work_totals_for_week(@week)
+    @year = (params[:year] && params[:year].to_i) || Date.today.year
+    @week = (params[:week] && params[:week].to_i) || Date.today.cweek
+    @work_totals_per_work_account = Work.work_totals_for_week(@year, @week)
     headers["Content-Type"] = "application/vnd.ms-excel"
     headers["Content-Disposition"] = 'attachment; filename="export.xml"'
     render :layout => false
@@ -183,6 +199,12 @@ class WorksController < ApplicationController
     
     render :partial => 'description_list'
   end
+
+  def calculate_hours
+    calculated_duration = (Time.parse(params[:completed_at]) - Time.parse(params[:started_at]))
+    new_value = '%2d:%02d' % [calculated_duration / 3600, (calculated_duration % 3600) / 60]
+    render :update do |page| page['work_hours_time'].value = new_value end
+  end
   
   private
   
@@ -194,7 +216,9 @@ class WorksController < ApplicationController
       else
         raise "Unknown time format: '#{params[:work][:hours_time]}'"
       end
-      if @work && @work.started?
+      if params[:work][:completed_at]
+        t = Time.parse params[:work][:completed_at]
+      elsif @work && @work.started?
         t = @work.started_at
       else
         t = Time.now

data/app/helpers/work_locks_helper.rb

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

data/app/models/task.rb

@@ -54,7 +54,7 @@ class Task < ActiveRecord::Base
       user_clause = " OR user_id = #{current_user.id}"
     end
     conditions = "completed_at IS NULL AND (user_id IS NULL#{user_clause})"
-    Work.find(:all, :conditions => conditions).map {|work| work.task}.sort_by do |t|
+    Work.find(:all, :conditions => conditions).map {|work| work.task}.compact.sort_by do |t|
       [t.root_task.backlog.name, t.root_task.period.end_on, t.position || 0]
     end
   end

data/app/models/user.rb

@@ -8,6 +8,7 @@ class User < Party
   # TODO (uwe): We need to specify :join_table, :foreign_key and :association_foreign_key
   # even if they follow the defaults since ClassTableInheritanceInRails breaks it.
   has_and_belongs_to_many :groups, :join_table => "groups_users", :foreign_key => "user_id", :association_foreign_key => 'group_id'
+  has_and_belongs_to_many :work_lock_subscribers, :class_name => 'User', :join_table => "user_work_lock_subscriptions", :foreign_key => "user_id", :association_foreign_key => 'subscriber_user_id'
 
   attr_accessor :password_needs_confirmation
 

data/app/models/user_notify.rb

@@ -1,4 +1,6 @@
 class UserNotify < ActionMailer::Base
+  include Localization
+  
   def signup(user, password, url=nil)
     setup_email(user)
 
@@ -40,6 +42,19 @@ class UserNotify < ActionMailer::Base
     @body["app_name"] = UserSystem::CONFIG[:app_name].to_s
   end
 
+  def monitoring(user, monitoring_user, action)
+    setup_email(user)
+
+    @subject += "#{monitoring_user.name} has #{l(action)} monitoring your time sheets."
+
+    @body["app_name"] = UserSystem::CONFIG[:app_name].to_s
+    @body["user"] = user
+    @body["monitoring_user"] = monitoring_user
+    @body["action"] = action
+  end
+
+  private
+  
   def setup_email(user)
     @recipients = "#{user.email}"
     @from       = UserSystem::CONFIG[:email_from].to_s

data/app/models/work.rb

@@ -44,6 +44,28 @@ class Work < ActiveRecord::Base
     works_by_row = works_per_day.transpose
   end
   
+  # Return a hash with work accounts as keys an array of work hours totals per day as values:
+  # {
+  #   <#WorkAccount#1> => [  8,   7,   9,  12,   4, nil, nil],
+  #   <#WorkAccount#2> => [nil,   1, nil, nil,   4, nil, nil],
+  #   <#WorkAccount#3> => [nil, nil, nil, nil, nil,   4,   3],
+  # ]
+  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 => "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')
+    result = {}
+    works.each do |work|
+      day_of_week = work.completed_at.to_date.cwday - 1
+      result[work.work_account] ||= []
+      result[work.work_account][day_of_week] ||= BigDecimal('0')
+      result[work.work_account][day_of_week] += work.hours
+    end
+    result.values.each {|work_account_totals| work_account_totals[6] ||= nil}
+    result.values.each {|work_account_totals| (0..6).each {|i| work_account_totals[i] = nil if work_account_totals[i] == 0}}
+    result
+  end
+  
   # Return a hash with an array of work totals per day:
   # {
   #   backlog1.id => [[m, t, w, t, f, s, s], [m, t, w, t, f, s, s]],
@@ -52,12 +74,12 @@ 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 started_at BETWEEN '#{first.to_time.iso8601}' AND '#{last.to_time.iso8601}'", :order => 'started_at')
+    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')
     totals_per_work_account = {}
-    WorkAccount.find(:all).each do |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.started_at.to_date == (first + day)) && (work.user_id.nil? || (user && work.user_id == user.id)) }
+        works_for_day = works.select {|work| (work.work_account == work_account) && (work.completed_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? }
         
@@ -74,8 +96,8 @@ class Work < ActiveRecord::Base
   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')
+    Work.find(:all, :conditions => "(completed_at IS NULL OR completed_at BETWEEN '#{date}' AND '#{date+1}') AND user_id = #{current_user.id}",
+    :order => 'completed_at, started_at')
   end
   
   def started?
@@ -94,7 +116,7 @@ class Work < ActiveRecord::Base
   end
   
   def completed_at_time
-    completed_at.strftime('%H:%M')
+    completed_at && completed_at.strftime('%H:%M')
   end
   
   def completed_at_time=(new_value)

data/app/models/work_account.rb

@@ -1,9 +1,11 @@
 class WorkAccount < ActiveRecord::Base
   has_many :backlogs, :dependent => :nullify
   has_many :works, :dependent => :destroy
+  has_and_belongs_to_many :work_lock_subscribers, :class_name => 'User', :join_table => "work_lock_subscriptions", :foreign_key => "work_account_id", :association_foreign_key => 'subscriber_user_id'
 
   validates_inclusion_of :track_times, :in => [true, false], :allow_nil => true, :message => ActiveRecord::Errors.default_error_messages[:blank]
   validates_length_of :invoice_code, :allow_nil => true, :maximum => 255
+  validates_uniqueness_of :name
 
   def enable_invoicing?
     invoice_code && invoice_code.length > 0

data/app/models/work_lock.rb

@@ -0,0 +1,3 @@
+class WorkLock < ActiveRecord::Base
+  belongs_to :user
+end

data/app/models/work_lock_notify.rb

@@ -0,0 +1,27 @@
+class WorkLockNotify < ActionMailer::Base
+  def lock(user, lock_user, week, week_url, spreadsheet_url)
+    setup_email(user)
+
+    # Email header info
+    @subject += "#{lock_user.name} has marked week #{week} as locked."
+
+    # Email body substitutions
+    @body["app_name"] = UserSystem::CONFIG[:app_name].to_s
+    @body["app_url"] = UserSystem::CONFIG[:app_url].to_s
+    @body["name"] = "#{user.first_name} #{user.last_name}"
+    @body["login"] = user.login
+    @body["lock_user"] = lock_user
+    @body["week_url"] = week_url
+    @body["spreadsheet_url"] = spreadsheet_url
+  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/work_lock_subscription.rb

@@ -0,0 +1,3 @@
+class WorkLockSubscription < ActiveRecord::Base
+  belongs_to :work_account
+end

data/app/views/display_notice.rjs

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

data/app/views/layouts/_left_top.rhtml

@@ -6,6 +6,7 @@
       
       <% if user? %>
       | <%= link_to l(:backlogs), :controller => 'backlogs', :action => :list %>
+      | <%= link_to l(:work_accounts), :controller => 'work_accounts', :action => :list %>
       | <%= link_to l(:log_out), :controller => 'user', :action => :logout %>
       <% else %>
       | <%= detour_to l(:log_in), :controller => 'user', :action => :login %>

data/app/views/tasks/_task.rhtml

@@ -87,9 +87,9 @@
             <% unless @task.work_started? -%>
 			  <% if @task.backlog.enable_users? %>
 			  	<% if @task.users.include?(current_user) %>
-	              <%=image_link_to_remote('grab.png', l(:grab_task), {:action => :release_task, :id => @task}, nil, true)%>
+	              <%=image_link_to_remote('grab.png', l(:grab_task), with_detour({:controller => 'tasks', :action => :release, :id => @task}), nil, true)%>
 			  	<% else %>
-	              <%=image_link_to_remote('grab_gray.png', l(:grab_task), {:action => :grab_task, :id => @task}, nil, true)%>
+	              <%=image_link_to_remote('grab_gray.png', l(:grab_task), with_detour({:controller => 'tasks', :action => :grab, :id => @task}), nil, true)%>
 			  	<% end %>
 			  <% end %>
               <%=image_link_to_remote('arrow_right.png', l(:move_to_next_period), {:action => :move_task_to_next_period, :id => @task}, nil, true) if @task.backlog.enable_periods? || @task.period_id%>

data/app/views/user/edit.rhtml

@@ -1,6 +1,19 @@
-<div id="spotlight" title="<%= title_helper %>" class="form">
-  <% @page_title = "#{l :editing} #{l :user}" %>
+<% @page_title = "#{l :editing} #{l :user}" %>
 
+<div id="spotlight" title="<%= title_helper %>" class="form">
+	<% if @user == current_user %>
+		<% unless @user.work_lock_subscribers.empty? %>
+		<table align="right">
+			<tr><th>Subscribers</th></tr>
+			<% for subscriber in @user.work_lock_subscribers %>
+				<tr><td><%=detour_to subscriber.name, :action => :edit%></td></tr>
+			<% end %>
+		</table>
+		<% end %>
+	<% else %>
+		<% monitoring = @user.work_lock_subscribers.include? current_user %>
+		<%=image_link_to_remote "email#{'_grey' unless monitoring}.png", "#{l(monitoring ? :stop : :start)} #{l(:monitoring)}", {:action => :toggle_work_lock_monitoring, :id => @user.id}, {:id => :work_lock_monitor_icon, :style => 'float: right'} %>
+	<% end %>
     <%= start_form_tag_helper %>
       <%= render_partial 'edit', :user => @user, :submit => true %>
     </form>

data/app/views/user/toggle_work_lock_monitoring.rjs

@@ -0,0 +1,2 @@
+display_notice(page)
+page['work_lock_monitor_icon'].src = image_path("email#{'_grey' unless @user.work_lock_subscribers.include? current_user}.png")

data/app/views/user_notify/monitoring_en.rhtml

@@ -0,0 +1,3 @@
+Regarding your account at <%=@app_name %>, <%=@user.name %>.
+
+<%=@monitoring_user.name%> has <%=@action%> monitoring your time sheets.

data/app/views/user_notify/monitoring_no.rhtml

@@ -0,0 +1,3 @@
+Angående din konto på <%=@app_name %>, <%=@user.name %>.
+
+<%=@monitoring_user.name%> har <%=@action%> monitorering av dine timelister.

data/app/views/work_lock_notify/lock_en.rhtml

@@ -0,0 +1,7 @@
+<%=@name %>
+
+<%=@lock_user.name%> har godkjent timeliste for uke <%=@week%>.
+
+Klikk på linken under for en ukeoversikt:
+
+<%=@week_url%>

data/app/views/work_lock_notify/lock_no.rhtml

@@ -0,0 +1,7 @@
+<%=@name %>
+
+<%=@lock_user.name%> has marked week <%=@week%> as complete.
+
+Please click on the following link to go to the week overview:
+
+<%=@week_url%>

data/app/views/work_locks/_form.rhtml

@@ -0,0 +1,10 @@
+<%= error_messages_for 'work_lock' %>
+
+<!--[form:work_lock]-->
+<p><label for="work_lock_start_on">Start on</label><br/>
+<%= date_select 'work_lock', 'start_on'  %></p>
+
+<p><label for="work_lock_end_on">End on</label><br/>
+<%= date_select 'work_lock', 'end_on'  %></p>
+<!--[eoform:work_lock]-->
+

data/app/views/work_locks/edit.rhtml

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

data/app/views/work_locks/list.rhtml

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

data/app/views/work_locks/new.rhtml

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

data/app/views/work_locks/show.rhtml

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

data/app/views/works/_buttons.rhtml

@@ -1,3 +1,8 @@
+        <%=image_detour_to('hammer.png', l(:weekly_work_sheet), :controller => 'works', :action => :weekly_work_sheet_by_work_account)%>
+<!--
         <%=image_detour_to('hammer.png', l(:weekly_work_sheet), :controller => 'works', :action => :weekly_work_sheet)%>
+-->
         <%=link_to(image_tag(url_for("hammer.png"), :alt => l(:daily_work_sheet), :title => l(:daily_work_sheet), :class => 'image-submit'), :controller => 'works', :action => :daily_work_sheet)%>
+<!--
         <%=link_to(image_tag(url_for("hammer.png"), :alt => l(:edit_works), :title => l(:edit_works), :class => 'image-submit'), :controller => 'periods', :action => 'list_work', :id => (@period ? @period.id : (@backlog && @backlog.periods.first ? @backlog.periods.first.id : nil))) if @period || @backlog%>
+-->

data/app/views/works/_form.rhtml

@@ -63,7 +63,10 @@
 
 <% if @work.task.nil? || @work.task.track_done?%>
 <p style="float: left;"><label for="work_hours"><%=l :hours%></label><br/>
-<%= text_field 'work', 'hours_time', :class => :task_hours, :value => t(@work.hours)  %></p>
+<%=text_field 'work', 'hours_time', :class => :task_hours, :value => t(@work.hours)  %></p>
+
+<p style="float: left;"><br/><%=image_link_to_remote 'refresh.png', l(:refresh), :action => :calculate_hours, :started_at => "' + $('work_started_at').value + '", :completed_at => "' + $('work_completed_at').value + '" %></p>
+
 <% end %>
 
 <% if @work.task.nil? || @work.task.enable_invoicing? %>