Merge pull request #6 from workgena/master

Add data datepicker_options for DateTimeRangeInput, default time form…

Author: Fivell

lib/active_admin_datetimepicker.rb

@@ -1,14 +1,13 @@
-require "activeadmin"
-require "xdan-datetimepicker-rails"
-require "active_admin_datetimepicker/version"
-require "active_admin_datetimepicker/inputs/date_time_picker_input"
-require "active_admin_datetimepicker/inputs/filters/date_time_range_input"
+require 'activeadmin'
+require 'xdan-datetimepicker-rails'
+require 'active_admin_datetimepicker/version'
+require 'active_admin_datetimepicker/base'
+require 'active_admin_datetimepicker/inputs/date_time_picker_input'
+require 'active_admin_datetimepicker/inputs/filters/date_time_range_input'
 
 module ActiveAdminDatetimepicker
-    module Rails
-      class Engine < ::Rails::Engine
-
-      end
+  module Rails
+    class Engine < ::Rails::Engine
     end
-
+  end
 end

lib/active_admin_datetimepicker/base.rb

@@ -0,0 +1,59 @@
+module ActiveAdminDatetimepicker
+  module Base
+    mattr_accessor :default_datetime_picker_options do
+      {}
+    end
+
+    mattr_accessor :format do
+      '%Y-%m-%d %H:%M'
+    end
+
+    def html_class
+      'date-time-picker'
+    end
+
+    def input_html_data
+      {}
+    end
+
+    def input_html_options(input_name = nil)
+      options = {}
+      options[:class] = [self.options[:class], html_class].compact.join(' ')
+      options[:data] ||= input_html_data
+      options[:data].merge!(datepicker_options: datetime_picker_options)
+      options[:value] ||= input_value(input_name)
+      options[:maxlength] = 19
+      options
+    end
+
+    def input_value(input_name = nil)
+      val = object.public_send(input_name || method)
+      return DateTime.new(val.year, val.month, val.day, val.hour, val.min).strftime(format) if val.is_a?(Time)
+      val.to_s
+    end
+
+    def datetime_picker_options
+      @datetime_picker_options ||= begin
+        # backport support both :datepicker_options AND :datetime_picker_options
+        options = self.options.fetch(:datepicker_options, {})
+        options = self.options.fetch(:datetime_picker_options, options)
+        options = Hash[options.map { |k, v| [k.to_s.camelcase(:lower), v] }]
+        _default_datetime_picker_options.merge(options)
+      end
+    end
+
+    protected
+
+    def _default_datetime_picker_options
+      res = default_datetime_picker_options.map do |k, v|
+        if v.respond_to?(:call) || v.is_a?(Proc)
+          [k, v.call]
+        else
+          [k, v]
+        end
+      end
+      Hash[res]
+    end
+  end
+end
+

lib/active_admin_datetimepicker/inputs/date_time_picker_input.rb

@@ -1,28 +1,7 @@
 module ActiveAdmin
   module Inputs
     class DateTimePickerInput < ::Formtastic::Inputs::StringInput
-      def input_html_options
-        super.tap do |options|
-          options[:class] = [options[:class], "date-time-picker"].compact.join(' ')
-          options[:data] ||= {}
-          options[:data].merge! datepicker_options
-          options[:value] ||= value
-        end
-      end
-
-      def value
-        val = object.send(method)
-        return DateTime.new(val.year, val.month, val.day, val.hour, val.min).strftime("%Y-%m-%d %H:%M") if val.is_a?(Time)
-        return val if val.nil?
-        val.to_s
-      end
-
-      private
-      def datepicker_options
-        options = self.options.fetch(:datepicker_options, {})
-        options = Hash[options.map{ |k, v| [k.to_s.camelcase(:lower), v] }]
-        { datepicker_options: options }
-      end
+      include ActiveAdminDatetimepicker::Base
     end
   end
-end
+end

lib/active_admin_datetimepicker/inputs/filters/date_time_range_input.rb

@@ -3,23 +3,14 @@ module Inputs
     module Filters
       class DateTimeRangeInput < DateRangeInput
         include Base
-
-        def html_class
-          "date-time-picker"
-        end
-
-        def format
-          "%Y-%m-%d %H:%M"
-        end
+        include ActiveAdminDatetimepicker::Base
 
         def input_html_options(input_name = gt_input_name)
-          current_value = @object.public_send input_name
-          { size: 12,
-            class: html_class,
-            max: 10,
-            value: current_value.respond_to?(:strftime) ? current_value.strftime(format) : "" }
+          super.tap do |options|
+            options[:class] = html_class
+          end
         end
       end
     end
   end
-end
+end

lib/active_admin_datetimepicker/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdminDatetimepicker
-  VERSION = "0.1.0"
+  VERSION = '0.1.1'
 end