eitil 1.1.8 → 1.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 553e46e2412cfb314a151d30836ee432400c76a6df65f11a97bcedf5b7f988d1
-  data.tar.gz: 70e2e7fcc0318f80580a1354645b7cdf74361aff39e863a3f18ec688557a0dfd
+  metadata.gz: 707b27f67c74dec844efce22b99755420d624a11060e5c7fafdd0a4b3b4ce60a
+  data.tar.gz: 47c775e85c7f8d04466c802b8b717a8c6c478c982b0d34935e21f1846bff7d11
 SHA512:
-  metadata.gz: ab78b467f0161f4d8e2af95eb734cfddea9acac0bb7b1cfffd50bff2d7debdcc8840d76f00a3e9f51c430bd0cf7796bf2cb11509536a788afd192adcb343b506
-  data.tar.gz: 21ed2ec339292a9b9349610c72179f7dd55bbf0fa6849be0b7f7c76d8b6ec11e2e1067da7135b277a161759eef136439d5b69248154a1aa5634830b15ff87977
+  metadata.gz: 06023f05445799146cf9a4e43e4a9247f89281ee59a5770b909541641024052ef8c34ae9ab07dfd03191f0c43484ed84f2c5d2c321b89bf4958261f73f086171
+  data.tar.gz: 52aa15d5003c3234703426e365d1488442cd8e4230c7423489cd4713c2ef3bc2aea662ca984ef104cece728e2c6397d7ce29a828c50fd4734b7fba3ce9f552c6

data/eitil_core/lib/eitil_core/active_record/hash_to_relation.rb

@@ -7,7 +7,12 @@ class Array
 
   def to_relation
     
-    return self unless self.present?
+    # Return an empty ActiveRecord_Relation instance when no objects are present,
+    # instead of returning the empty array itself. The reason being, that when you
+    # always return an association, you won't run into problems with undefined methods
+    # called later on, expecting an association instead of an array.
+
+    return ApplicationRecord.none unless self.present?
 
     unless self.all? { |item| item.class.ancestors.include? ApplicationRecord }
       raise_error "InvalidArrayError", ".to_relation requires that all array items are model instances"

data/eitil_core/lib/eitil_core/application_controller/permit_model_atts.rb

@@ -1,14 +1,18 @@
 
 # require "eitil_core/application_controller/permit_model_atts"
 
+require "pry"
+
 module ActionController
   class Parameters
 
-    def permit_model_atts(*models, include: nil, except: nil)
+    def permit_model_atts(*models, include: nil, except: nil, arrays: nil, hashes: nil)
       
-      models  = models.is_a?(Array) ? models : [models]
-      except  = except.is_a?(Array) ? except : [except]
+      models  = models.is_a?(Array)  ? models : [models]
+      except  = except.is_a?(Array)  ? except : [except]
       include = include.is_a?(Array) ? include : [include]
+      arrays  = arrays.is_a?(Array)  ? arrays : [arrays]
+      hashes  = hashes.is_a?(Array)  ? hashes : [hashes]
 
       columns = models.map do |model|
         model.columns_hash.keys.map &:to_sym
@@ -17,8 +21,23 @@ module ActionController
       default_reject  = %i( id updated_at created_at )
       given_reject    = except.map { |key| key&.to_sym }
       accepted_values = columns + include - default_reject - given_reject     
+      
+      arrays = arrays.all?(&:present?) ? arrays.each_with_object({}) { |i,h| h[i] = [] } : nil
+      hashes = hashes.all?(&:present?) ? hashes.each_with_object({}) { |i,h| h[i] = {} } : nil
+
+      if arrays.blank? and hashes.blank?
+        return self.permit(*accepted_values)
+
+      elsif arrays.blank?
+        return self.permit(*accepted_values, **hashes)
+
+      elsif hashes.blank?
+        return self.permit(*accepted_values, **arrays)
+
+      else
+        return self.permit(*accepted_values, **arrays, **hashes)
 
-      return self.permit(*accepted_values)
+      end
     end
 
   end

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

@@ -34,18 +34,26 @@ module EitilIntegrate::RubyXL
 
         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
+        # ALERT: the outcomment below is made to skip formatting days at all, so that
+        # – following eitje business logic – we currently only return an hh:mm notation
+
+        # # 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(':')]
+        # ALERT: the outcomment below is made to skip formatting days at all, so that
+        # – following eitje business logic – we currently only return an hh:mm notation
+
+        # [[sd, sh, sm].join(':')]
+        [[sh, sm].join(':')]
       end
 
       def format_time(time)

data/eitil_integrate/lib/eitil_integrate/application_exporter/log_state.rb

@@ -25,7 +25,7 @@ module EitilIntegrate::RubyXL
         report_state
 
         # style logs
-        style_first_x_columns_width(1, 40)
+        base_style_first_x_columns_width 1, 40
         style_first_column_bold
 
         # restore what was previously active

data/eitil_integrate/lib/eitil_integrate/application_exporter/style_cells.rb

@@ -59,6 +59,8 @@ module EitilIntegrate::RubyXL
       base_style_x_columns_width (0...n_columns), width
     end
 
+    alias_method :base_style_first_x_columns_width, :style_first_x_columns_width
+
     def style_x_columns_width(column_indices = [], width)
       column_indices.each { |i| @sheet.change_column_width(i, width) }
     end

data/lib/eitil/version.rb

@@ -1,5 +1,5 @@
 module Eitil
   
-  VERSION = '1.1.8'
+  VERSION = '1.1.12'
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eitil
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.12
 platform: ruby
 authors:
 - Jurriaan Schrofer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-06 00:00:00.000000000 Z
+date: 2021-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails