[HOURS] added offset reporting and editing

ironmtntech · Feb 24, 2011 · bb4afc2 · bb4afc2
1 parent e01db28
commit bb4afc2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/app/views/admin/users/edit.html.haml b/app/views/admin/users/edit.html.haml
@@ -18,6 +18,9 @@
           .field_wrap
             = f.label :email
             = f.text_field :email
+          .field_wrap 
+            = f.label :daily_target_hours, t(:daily_target_hours) 
+            = f.text_field(:daily_target_hours)
           .field_wrap
             = f.label :password
             = f.password_field :password

diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml
@@ -11,6 +11,7 @@
               %th= t(:name)
               %th= t(:email)
               %th= t(:current)
+              %th= t(:target_hours_offset)
               %th= "#{t(:locked)}?"
               %th= t(:roles)
               %th= t(:edit)
@@ -25,6 +26,7 @@
                     user_path(user) 
                 %td= user.email
                 %td= user.unpaid_work_units.sum(:hours)
+                %td= user.daily_target_hours ? user.target_hours_offset(Date.today).to_s : ''
                 %td= user.locked_at? ? 'X' : '&nbsp;'.html_safe
                 %td
                   - if user.admin?

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -175,4 +175,4 @@ en:
   edit_user: "Edit User"
   full_width: "Full Width"
   daily_target_hours: "Daily Target Hours"
-  target_hours_offset: "Year Target Offset"
+  target_hours_offset: "Offset"