five-two-nw-olivander 0.2.0.30 → 0.2.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf65e51e30f810ec8599078545ed70b9b8ba984c6e32c6485823a46995bac530
-  data.tar.gz: e4b702e0da5ef1bda84add56712f4bf2d20ae672e955a44645eb3e44a80ed96f
+  metadata.gz: 3aa4679fd3ac4496649900ee060cb20b1826f8e1b43c4757d548a9d5b77b6e4c
+  data.tar.gz: 61615323b1201dbd021800a5525062036bc80aab414c36028aa4e43c8ab1e2d0
 SHA512:
-  metadata.gz: 24050b1455acf076f8707f4d031972995e98e31e82ebf2eaa970f0e24c8fc52fe1120a3bd1425c62499cfea954039f6e8c5bdb9b23e4d3c1c384696b7b6e9004
-  data.tar.gz: 3778d4b7121de45d24e60421bb9d7bdad26fd1424bb4073fff5f4419624c9aaf24aa7516c8faad407eb5d796dcefe03d55c7049d92d666b955d9f43f15fd94e2
+  metadata.gz: 50bc6dc97b5826eef4ec98b15e20f11560a758f4b9c82b42e04d6962bc492cb697caa9094264ded682f0afdfc3195122953313595809f6a428aef461b9b68ea9
+  data.tar.gz: 577a779f683e1a5a5719747dc74f585633628186025770629b0e847c99fbfe47a573a045fbe1775cb15e0a75ed54c89b536a6bc7d5b1bfeb9bec9bfb6e090902

data/app/components/olivander/components/resource_form_component.html.haml

@@ -14,4 +14,4 @@
             - elsif boolean?(field)
               = @f.input field.sym, disabled: !field.editable, as: field.type.to_sym, input_html: { data: input_data_hash_for(field) }
             - else 
-              = @f.input field.sym, disabled: !field.editable, as: field.type.to_sym, input_html: { rows: 10, data: input_data_hash_for(field) }
+              = @f.input field.sym, disabled: !field.editable, as: field.type.to_sym, picker_options: input_picker_options_for(field), input_html: { rows: 10, data: input_data_hash_for(field) }

data/app/components/olivander/components/resource_form_component.rb

@@ -28,6 +28,17 @@ class Olivander::Components::ResourceFormComponent < ViewComponent::Base
     }
   end
 
+  def input_picker_options_for(field)
+    case field.type
+    when :datetime
+      { icons: { time: 'far fa-clock' } }
+    when :date
+      { 'format': 'MM/DD/YYYY' }
+    else
+      {}
+    end
+  end
+
   def taggable?(field)
     method_key = "#{field.sym}_taggable?"
     return false unless @resource.class.respond_to?(method_key)

data/app/controllers/concerns/olivander/resources/auto_form_attributes.rb

@@ -66,10 +66,11 @@ module Olivander
               reflections.map{ |x| x[1] }
                          .filter{ |x| x.foreign_key == inc || x.name == inc }
                          .each do |r|
+                type = r.association_class.name.demodulize.underscore.to_sym
                 begin
-                  resource_field(r.name, r.association_class.name.demodulize.underscore.to_sym, editable: editable && !r.options.keys.include?(:through))
+                  resource_field(r.name, type, editable: editable && !uneditable_association?(r, type))
                 rescue NotImplementedError
-                  resource_field(r.name, :association, editable: editable && !r.options.keys.include?(:through))
+                  resource_field(r.name, :association, editable: editable && !uneditable_association?(r, type))
                 end
               end
 
@@ -82,6 +83,13 @@ module Olivander
           end
         end
 
+        def self.uneditable_association?(r, type)
+          return false unless r.options.keys.include?(:through)
+
+          # this collection may prove to be larger than one...
+          %i[has_one_through_association].include?(type)
+        end
+
         def self.resource_field_group(key = :default, editable: true, &block)
           self.resource_field_group_collection ||= []
           self.current_resource_field_group = resource_field_group_collection.select{ |x| x.key == key}.first

data/app/controllers/concerns/olivander/resources/crud_controller.rb

@@ -195,8 +195,10 @@ module Olivander
         def rearrange_date_param(value)
           return nil if value.blank?
 
-          parts = value.split('/')
-          "#{parts[2]}-#{parts[0]}-#{parts[1]}"
+          datetime_parts = value.split(' ')
+          date_parts = datetime_parts.first.split('/')
+          datetime_parts[0] = "#{date_parts[2]}-#{date_parts[0]}-#{date_parts[1]}"
+          datetime_parts.join(' ')
         end
       end
     end

data/app/helpers/olivander/application_helper.rb

@@ -5,7 +5,7 @@ module Olivander
       modded = count % 12
       divisor = modded.zero? ? 1 : modded
       "col-#{label}-#{[12/divisor, min].max}"
-
+  
       divisor = count
       result = 12/divisor
       while result < min

data/app/inputs/date_time_input.rb

@@ -1,12 +1,10 @@
 class DateTimeInput < SimpleForm::Inputs::Base
   def input(wrapper_options)
-    date_format = options[:date_format] || '%m/%d/%Y'
-    raw_value = object.public_send(attribute_name)
-    raw_value = raw_value.strftime(date_format) if raw_value.present?
+    raw_value = parse_value(object.public_send(attribute_name), options[:date_format])
 
     disabled = options[:disabled] || false
 
-    hash = { id: "#{attribute_name}_datetimepicker", class: 'form-control', value: raw_value, disabled: disabled, 'data-toggle': 'datetimepicker', 'data-target': "##{attribute_name}_datetimepicker" }
+    hash = { id: "#{attribute_name}_datetimepicker", class: 'form-control datetimepicker-input', value: raw_value, disabled: disabled, 'data-toggle': 'datetimepicker', 'data-target': "##{attribute_name}_datetimepicker" }
     data = options[:data] || {}
     data.keys.each do |d|
       hash["data-#{d.to_s.dasherize}".to_sym] = data[d]
@@ -26,7 +24,7 @@ class DateTimeInput < SimpleForm::Inputs::Base
 
     script = "".html_safe
     unless disabled then
-      picker_options = options[:picker_options] || { "format" => "MM/DD/YYYY" }
+      picker_options = options[:picker_options] || { "format": "MM/DD/YYYY" }
 
       script = """
         <script>
@@ -41,4 +39,16 @@ class DateTimeInput < SimpleForm::Inputs::Base
 
     all + script
   end
+
+  def parse_value(raw_value, format)
+    return nil unless raw_value.present?
+
+    format ||=  case raw_value.class.name
+                when 'Time', 'ActiveSupport::TimeWithZone'
+                  '%m/%d/%Y %H:%M %p'
+                else
+                  '%m/%d/%Y'
+                end
+    raw_value.strftime(format)
+  end
 end

data/lib/olivander/version.rb

@@ -2,5 +2,5 @@
 
 # needed for gem
 module Olivander
-  VERSION = '0.2.0.30'
+  VERSION = '0.2.0.32'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.2.0.30
+  version: 0.2.0.32
 platform: ruby
 authors:
 - Eric Dennis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-27 00:00:00.000000000 Z
+date: 2024-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick