ecm_time_tracking 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f7858a89c71006be1cf675ab74c7ae847c99f05
-  data.tar.gz: 8d94facde52dcf0974619cac797623dbd90c1632
+  metadata.gz: b5c131b35bbb0364d26d38f996943e9be397781c
+  data.tar.gz: 9741719c01035c18fd114bb47ddcc0a725722f8b
 SHA512:
-  metadata.gz: 1dc4b7c78873ab4e79c8f8dc452c0df02122e164855d4e6af6905bfb8197a7f47aaca837e948891d0b42fcf17ff87c18fa70e9e9ddcb0a3c8da3cf7c5ae499a6
-  data.tar.gz: 946179cf1484a9db5850bc2d59a27d2d88ae2dc3be88ddd1959f7449d99e19209e555fa5c27b5375c21851f2f5a3259058e0bc63b47a7fdda3f686c08201a1a6
+  metadata.gz: a9eeeaabdae7262b126c5225c0c60e8b29714e369eee67b5b8284bd56086422b0389ee8b6beb1ec7af2219470858f9f2d802b3c7d2f9b6c745ea473164017008
+  data.tar.gz: 36de389b82d7e2c03806bb14f55833b3f10370679633563a688d1a5e5839359d891771f25d69c3f9ab695ba1b1ef80d49d865423a45c40b195f4e96f5d296a1a

data/app/models/ecm/time_tracking/entry.rb

@@ -4,6 +4,7 @@ module Ecm::TimeTracking
     DEFAULT_BREAK_LENGTH_IN_MINUTES = 45
 
     belongs_to :tracker, class_name: Configuration.tracker_class_name, foreign_key: 'tracker_id'
+    belongs_to :entry_type
 
     validates :tracker, :begin_at, :end_at, presence: true
 
@@ -22,7 +23,11 @@ module Ecm::TimeTracking
     end
 
     def overtime
-      length - due - (break_length_in_seconds || 0)
+      length - due_in_seconds - (break_length_in_seconds || 0)
+    end
+
+    def due_in_seconds
+      entry_type.try(:due_in_seconds) || 0
     end
 
     private
@@ -32,9 +37,5 @@ module Ecm::TimeTracking
       self.begin_at = self.end_at - DEFAULT_DUE_HOURS_PER_DAY.hours - DEFAULT_BREAK_LENGTH_IN_MINUTES.minutes
       self.break_length_in_minutes = DEFAULT_BREAK_LENGTH_IN_MINUTES
     end
-
-    def due
-      DEFAULT_DUE_HOURS_PER_DAY * 60 * 60
-    end
   end
 end

data/app/models/ecm/time_tracking/entry_type.rb

@@ -0,0 +1,27 @@
+module Ecm::TimeTracking
+  class EntryType < ActiveRecord::Base
+    validates :identifier, presence: true, uniqueness: true
+    validates :due_in_seconds, presence: true
+
+    def due_in_minutes=(due_in_minutes)
+      self.due_in_seconds = due_in_minutes.to_i * 60
+    end
+
+    def due_in_minutes
+      (due_in_seconds || 0) / 60
+    end
+
+    def due_in_hours=(due_in_hours)
+      self.due_in_minutes = due_in_hours.to_i * 60
+    end
+
+    def due_in_hours
+      (due_in_minutes || 0) / 60
+    end
+
+
+    def human
+      identifier
+    end
+  end
+end

data/config/locales/de.yml

@@ -6,12 +6,19 @@ de:
         break_length_in_minutes: Pause [Minuten]
         description: Beschreibung
         end_at: Bis
+        entry_type: Typ
         length: Länge
         overtime: Überzeit
         tracker: Erfasser
         created_at: Erstellt am
         updated_at: Aktualisiert am
+      ecm/time_tracking/entry_type:
+        identifier: Bezeichner
+        due_in_hours: Soll [Stunden]
     models:
       ecm/time_tracking/entry:
         one: Eintrag
-        other: Einträge
+        other: Einträge
+      ecm/time_tracking/entry_type:
+        one: Eintragstyp
+        other: Eintragstypen

data/db/migrate/20160305142931_create_ecm_time_tracking_entries.rb

@@ -2,6 +2,7 @@ class CreateEcmTimeTrackingEntries < ActiveRecord::Migration
   def change
     create_table :ecm_time_tracking_entries do |t|
       t.integer :tracker_id
+      t.integer :entry_type_id
       t.timestamp :begin_at
       t.timestamp :end_at
       t.integer :break_length_in_seconds

data/db/migrate/20160307185539_create_ecm_time_tracking_entry_types.rb

@@ -0,0 +1,10 @@
+class CreateEcmTimeTrackingEntryTypes < ActiveRecord::Migration
+  def change
+    create_table :ecm_time_tracking_entry_types do |t|
+      t.string :identifier
+      t.integer :due_in_seconds
+
+      t.timestamps null: false
+    end
+  end
+end

data/lib/ecm/time_tracking/version.rb

@@ -1,5 +1,5 @@
 module Ecm
   module TimeTracking
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecm_time_tracking
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-06 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -39,10 +39,12 @@ files:
 - app/controllers/ecm/time_tracking/application_controller.rb
 - app/helpers/ecm/time_tracking/application_helper.rb
 - app/models/ecm/time_tracking/entry.rb
+- app/models/ecm/time_tracking/entry_type.rb
 - app/views/layouts/ecm/time_tracking/application.html.erb
 - config/locales/de.yml
 - config/routes.rb
 - db/migrate/20160305142931_create_ecm_time_tracking_entries.rb
+- db/migrate/20160307185539_create_ecm_time_tracking_entry_types.rb
 - lib/ecm/time_tracking.rb
 - lib/ecm/time_tracking/configuration.rb
 - lib/ecm/time_tracking/engine.rb