From 9feae35f5f99ed2e7cab902105d38794d613c62c Mon Sep 17 00:00:00 2001 From: Ken Johnson Date: Tue, 28 May 2013 09:44:17 -0400 Subject: [PATCH] switching to a different graph --- app/models/paid_time_off.rb | 14 -- app/views/paid_time_off/index.html.erb | 172 +++++++++---------------- 2 files changed, 61 insertions(+), 125 deletions(-) diff --git a/app/models/paid_time_off.rb b/app/models/paid_time_off.rb index 7850197..3648359 100644 --- a/app/models/paid_time_off.rb +++ b/app/models/paid_time_off.rb @@ -3,18 +3,4 @@ class PaidTimeOff < ActiveRecord::Base belongs_to :user has_one :schedule, :foreign_key => :user_id, :primary_key => :user_id - # Refactor this duplication when it's not 3am - def sick_days_remaining(val="") - self.sick_days_earned - self.sick_days_taken - end - - - def pto_days_remaining(val="") - self.pto_earned - self.pto_taken - end - - def pto_percentages - end - - end diff --git a/app/views/paid_time_off/index.html.erb b/app/views/paid_time_off/index.html.erb index 8391dc8..cd7bc29 100644 --- a/app/views/paid_time_off/index.html.erb +++ b/app/views/paid_time_off/index.html.erb @@ -34,122 +34,24 @@
- -
-
-
-
- Sick Days -
-
-
-
    -
  • -
    - - Sick Days Taken - - - <%= @pto.sick_days_taken %> - -
    -
    -
    -
    -
    -
    • -
  • -
    - - Sick Days Earned - - - <%= @pto.sick_days_earned %> - -
    -
    -
    -
    -
    -
    • -
  • -
    - - Sick Days Remaining - - - <%= @pto.sick_days_remaining %> - -
    -
    -
    -
    -
    -
    • -
+
+
+
+
+ Column Chart
+
+
+
- -

-
-
-
-
-
- Vacation Days (PTO) -
-
-
-
    -
  • -
    - - PTO Days Taken - - - <%= @pto.pto_taken %> - -
    -
    -
    -
    -
    -
    • -
  • -
    - - PTO Days Earned - - - <%= @pto.pto_earned %> - -
    -
    -
    -
    -
    -
    • -
  • -
    - - PTO Days Remaining - - - <%= @pto.pto_days_remaining %> - -
    -
    -
    -
    -
    -
    • -
-
-
+
+
- + + \ No newline at end of file