eitil 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1d078f5e3e79e4849d54692fcbfa418bec803333e69dcc6f4df72b09941ff31
-  data.tar.gz: 9e1232d63ae999afbbb5d0df2405fdb1ca038269096a73a8f8b82dc29de9ab1e
+  metadata.gz: b566e2911d13c9952ef93916e929e1bf4666790e2d07934ccc3cb7d00f421319
+  data.tar.gz: d492741da447ce1777c79a07c1968acc611f558eec690d933c3e8eff94422f4b
 SHA512:
-  metadata.gz: 6d80703adbc3faf1be7faf8ffdbed5d70b7e04f9edbd7f88dba9baef9b5e3b7b79cf8091732d0e03aaa28fa0ec8efe66260da9d64ca595fd31b64f667e742160
-  data.tar.gz: cf450d841ca4f1a528ba3aa2d7be7a018b9a4ae08f2a16e491cec44ce69245e8f7a3193ce00824a3b7fda959917c0127d1528c979bce14a4b5c221a79b4bfdec
+  metadata.gz: 27376302a08134d0f7b14d55c4dda41eabd230b93cd1bce4f719d12505241e817779fc4feaa83e03443cc910516e33e477c10760ed9be7d5c543b2b53d98e2ae
+  data.tar.gz: 2fe73ac66fe0ef8bfc64260fc95e05f4a5c8dee3c8f7afb2c376da25fc65b1b93ab8da6b008bbb5d31537789d1c8b697258f87dbf9bde956f3c849ffa7e46bd1

data/eitil_integrate/lib/eitil_integrate/application_exporter/auto_sum/format_data.rb

@@ -10,9 +10,12 @@ module EitilIntegrate::RubyXL
         format_ints_to_floats
       end
 
-      def format_time_strings
-        @hash.transform_values! { |array| array.map { |item| incomplete_time_string?(item) ? "#{item}:00" : item } }
-      end
+      # outcommented method in favour of AutoSum#chronic_sum_array: no longer accept days, since the method excepts
+      # either hh:mm or hh:mm:ss
+
+      # def format_time_strings
+        # @hash.transform_values! { |array| array.map { |item| incomplete_time_string?(item) ? "#{item}:00" : item } }
+      # end
 
       def incomplete_time_string?(string)
         string.is_a?(String) && string.length == 5 && string.scan(/\d{2}:\d{2}/)

data/eitil_integrate/lib/eitil_integrate/application_exporter/auto_sum/sum_data.rb

@@ -22,15 +22,30 @@ module EitilIntegrate::RubyXL
       end
 
       def chronic_sum_array(array)
-        sum     = array.map { |item| ChronicDuration.parse(item) }.compact.sum
-        hours   = format_time(sum / (60 * 60))
-        sum     = sum % (60 * 60)
-        minutes = format_time(sum / 60)
-        seconds = format_time(sum % 60)
-
-        # currently doesn't return seconds, since those will never 
-        # be set (?) and screw the consistency of data formatting
-        ["#{hours}:#{minutes}"]
+        
+        #total minutes, hours and days
+        tm, th, td = [0]*3
+        
+        array.each do |time_string|
+
+          # add empty 0's, to avoid defining nil values when time values are absent
+          h, m, s = *time_string.split(':').map(&:to_i), *[0]*3
+          tm += m; th += h
+
+        end
+        
+        # parsing times into maxes (60 m, 24 h, ∞ days)
+        th += tm / 60
+        tm =  tm % 60
+        td += th / 24
+        th =  th % 24
+
+        # formatting strings
+        sd = td.to_s
+        sh = th.to_s.rjust(2,'0')
+        sm = tm.to_s.rjust(2,'0')
+
+        [[sd, sh, sm].join(':')]
       end
 
       def format_time(time)

data/lib/eitil/version.rb

@@ -1,5 +1,5 @@
 module Eitil
   
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eitil
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Jurriaan Schrofer