From 4a7751959c20254cc3722d22560379b3f6ace62a Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sat, 17 Aug 2013 23:22:07 -0400 Subject: [PATCH] Added end date to user timesheet, removed created & updated --- app/components/user_logs.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/components/user_logs.rb b/app/components/user_logs.rb index 0b82667..2152d19 100644 --- a/app/components/user_logs.rb +++ b/app/components/user_logs.rb @@ -40,12 +40,10 @@ class UserLogs < Netzke::Basepack::Grid c.columns = [ { :name => :start_date, :format => "g:ia - D, M j - Y", :width => 165, :default_value => Time.now.to_formatted_s(:db) }, - { :name => :end_date, :hidden => true, :default_value => Time.now.to_formatted_s(:db) }, + { :name => :end_date, :format => "g:ia - D, M j - Y", :default_value => Time.now.to_formatted_s(:db) }, { :name => :hours, :getter => lambda { |rec| (rec.end_date - rec.start_date)/3600 }, :sorting_scope => :sort_by_duration}, :description, { :name => :user_action__action, :text => 'Action', :default_value => ::ActsAsLoggable::UserAction.all.first.id }, - :created_at, - :updated_at, { :name => :logged_by, :getter => lambda{ |rec| user = User.find_by_id(rec.logger_id) user.nil? ? "" : "#{user.first_name} #{user.last_name}"