ecm_time_tracking_backend 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d71dd7daacb0594ccce10e177b28f324e6860133
-  data.tar.gz: 5a0414bf93282b519a6d174e6f812b7c04bf7dde
+  metadata.gz: 7f2fc187a605d95522e0a8c6b44f620b05009d00
+  data.tar.gz: c8da001b27e09ec5717a9923215fae3807e0a35a
 SHA512:
-  metadata.gz: a844bb3041196e0587b0857e26aaa9eccd47ff82d430d53539ad671f2353e0c3ae3c85262104ba5c03ba0be11b6f929affc28ae408bf46788f2b7556d229cdc6
-  data.tar.gz: 538257f7cb586c7c5c7e67d56b87e938a96f79a9d473c19b0d3d9a9903459bd6d857bdfd26b81f62986b1669a7f027a1a7c9f5682039e14c317b43ec41a1a960
+  metadata.gz: 70ebcf79ed98e9bfb0bbd1e755a67fd7e2f84887345ff3728c63ebf893ba6e9e7d358f56ebd4ef078f158d8900c36ddc4655d08bea8cb99e0fd39c183dfcb09f
+  data.tar.gz: 03ea28acd6b4f6262497b15e5ff9506f910cdda7459248da1518e88496125f31000df23b18da096d45360ddde988332965b548e53fa28ae481b7f107bc6a8f2c

data/app/views/ecm/time_tracking/backend/entries/_head_extras.haml

@@ -0,0 +1 @@
+= javascript_include_tag "https://www.google.com/jsapi", "chartkick"

data/app/views/ecm/time_tracking/backend/entries/_index_extras.haml

@@ -1,10 +1,2 @@
-.panel.panel-default
-  .panel-heading= Ecm::TimeTracking::SumsService.model_name.human
-  .table
-    - @sums = Ecm::TimeTracking::SumsService.call(entries: @collection)
-    = render_resource(@sums, as: :bootstrap_attribute_table) do |table|
-      = table.row :overtime do |resource|
-        = [resource.overtime / 3600, resource.overtime / 60 % 60, resource.overtime % 60].map { |t| t.to_i.to_s.rjust(2,'0') }.join(':')
-      - table.resource.count_by_entry_type.each do |entry_type, count|
-        = table.row entry_type.identifier do |r|
-          = count
+= render 'sums_table', entries: @collection
+= render 'overtime_chart', entries: @collection

data/app/views/ecm/time_tracking/backend/entries/_overtime_chart.haml

@@ -0,0 +1,7 @@
+.panel.panel-default
+  .panel-heading
+    .panel-title
+      %h3= t(".title")
+    .panel-body
+      - data = entries.group_by { |t| t.begin_at.to_date }.sort.each_with_object({}) {|(k, v), h| h[I18n.l(k, format: :short)] = (v.map(&:overtime).reduce(0, :+) / 3600) }
+      = column_chart data

data/app/views/ecm/time_tracking/backend/entries/_sums_table.haml

@@ -0,0 +1,15 @@
+.panel.panel-default
+  .panel-heading
+    .panel-title
+      %h3= Ecm::TimeTracking::SumsService.model_name.human
+  .table
+    - sums = Ecm::TimeTracking::SumsService.call(entries: entries)
+    - if sums.success?
+      = render_resource(sums, as: :bootstrap_attribute_table) do |table|
+        = table.row :overtime do |resource|
+          = [resource.overtime / 3600, resource.overtime / 60 % 60, resource.overtime % 60].map { |t| t.to_i.to_s.rjust(2,'0') }.join(':')
+        - table.resource.count_by_entry_type.each do |entry_type, count|
+          = table.row entry_type.identifier do |r|
+            = count
+    - else
+      = sums.errors.full_messages.to_sentence

data/app/views/ecm/time_tracking/backend/entries/_table.haml

@@ -1,3 +1,4 @@
+= table.association :tracker, label_method: :human
 = table.association :entry_type, label_method: :human
 = table.column :begin_at
 = table.column :end_at

data/config/locales/de.yml

@@ -1,3 +1,9 @@
 de:
   classes:
-    ecm/time_tracking/backend/engine: "Zeiterfassung"
+    ecm/time_tracking/backend/engine: "Zeiterfassung"
+  ecm:
+    time_tracking:
+      backend:
+        entries:
+          overtime_chart:
+            title: 'Überzeit'

data/lib/ecm/time_tracking/backend/version.rb

@@ -1,7 +1,7 @@
 module Ecm
   module TimeTracking
     module Backend
-      VERSION = '0.0.4'.freeze
+      VERSION = '0.0.5'.freeze
     end
   end
 end

data/lib/ecm_time_tracking_backend.rb

@@ -1,2 +1,4 @@
+require 'chartkick'
+
 require 'ecm/time_tracking/backend'
 require 'ecm/time_tracking/backend/engine'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecm_time_tracking_backend
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: chartkick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ecm::TimeTracking::Backend Module.
 email:
 - roberto@vasquez-angel.de
@@ -45,8 +59,11 @@ files:
 - app/controllers/ecm/time_tracking/backend/home_controller.rb
 - app/helpers/ecm/time_tracking/backend/application_helper.rb
 - app/views/ecm/time_tracking/backend/entries/_form.haml
+- app/views/ecm/time_tracking/backend/entries/_head_extras.haml
 - app/views/ecm/time_tracking/backend/entries/_index_extras.haml
+- app/views/ecm/time_tracking/backend/entries/_overtime_chart.haml
 - app/views/ecm/time_tracking/backend/entries/_show.haml
+- app/views/ecm/time_tracking/backend/entries/_sums_table.haml
 - app/views/ecm/time_tracking/backend/entries/_table.haml
 - app/views/ecm/time_tracking/backend/entry_types/_form.haml
 - app/views/ecm/time_tracking/backend/entry_types/_show.haml