effective_bootstrap 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c4cc9bb8d5533bc1807d040baf108b8edc4d1be
-  data.tar.gz: 9a398f27371dc2fe8b2b71d2037d0822f67f2608
+  metadata.gz: bff1d75dba9d0ae47c87581ebabc1b30ba624bbc
+  data.tar.gz: 4aca09fc196381f53b7f415a8265e7d98a012a05
 SHA512:
-  metadata.gz: a4679a2e6593d5ae5c3d698bb99da104e72ca89dfac4da1fb3536e33500cc514bfeac67b02dfee12767d7716c8a87a08a0f4d8aa9e18e43a6c36e7beab270aff
-  data.tar.gz: e0d6a2697f01fd98e22514077bb510a8a43f2a2ff9445627ef44b315dfd7cae297e3a635e323604384cc997cbddb689b2d18225c26d8a99946da60388f5333d4
+  metadata.gz: a950fc1c9b922679bbc1316b4f17b081c9a522eb6de3682264dd38f014f05769040ce31495b576e14c67a7abba43601059108073ca314c34902aaa8556bff65a
+  data.tar.gz: 70efe8b067991772b672f6b151301d454b23acf605181a4967f1d6149670d80bffadf0f8f1bef2174727b691ceac0ca6c848fed52b70701408808658b91c79a4

data/README.md

@@ -209,7 +209,7 @@ Bootstrap 3 Datepicker (https://github.com/Eonasdan/bootstrap-datetimepicker)
 The default options used to initialize this form input are as follows:
 
 ```ruby
-input_js: { showTodayButton: true, showClear: true, useCurrent: 'hour' }
+am_pm: true, input_js: { showTodayButton: false, showClear: false, useCurrent: 'hour' }
 ```
 
 For a full list of options, please refer to:

data/app/models/effective/form_inputs/date_field.rb

@@ -5,22 +5,30 @@ module Effective
       def input_html_options
         {
           class: ['form-control', 'effective_date_time_picker', 'effective_date', ('not-date-linked' if not_date_linked?)].compact.join(' '),
-          pattern: '\d{4}(-\d{2})?(-\d{2})?'
+          pattern: pattern
         }
       end
 
       def input_js_options
-        { format: 'YYYY-MM-DD', showTodayButton: true, showClear: true, useCurrent: 'hour', disabledDates: disabled_dates.presence }.compact
+        { format: format, showTodayButton: false, showClear: false, useCurrent: 'hour', disabledDates: disabled_dates.presence }.compact
       end
 
       def input_group_options
         { input_group: { class: 'input-group effective_date_time_picker_input_group' }, prepend: content_tag(:span, icon('calendar'), class: 'input-group-text') }
       end
 
-      def datetime_to_s
+      def datetime_to_s # ruby
         value&.strftime('%F')
       end
 
+      def pattern # html
+        '\d{4}(-\d{2})?(-\d{2})?'
+      end
+
+      def format # moment.js
+        'YYYY-MM-DD'
+      end
+
     end
   end
 end

data/app/models/effective/form_inputs/datetime_field.rb

@@ -5,12 +5,12 @@ module Effective
       def input_html_options
         {
           class: ['form-control', 'effective_date_time_picker', 'effective_datetime', ('not-date-linked' if not_date_linked?)].compact.join(' '),
-          pattern: '\d{4}(-\d{2})?-(\d{2})?( \d+)?(:\d{2})?'
+          pattern: pattern
         }
       end
 
       def input_js_options
-        { format: 'YYYY-MM-DD HH:mm', sideBySide: true, showTodayButton: true, showClear: true, useCurrent: 'hour', disabledDates: disabled_dates.presence }.compact
+        { format: format, sideBySide: true, showTodayButton: false, showClear: false, useCurrent: 'hour', disabledDates: disabled_dates.presence }.compact
       end
 
       def input_group_options
@@ -21,8 +21,16 @@ module Effective
         @builder.super_text_field(name, options[:input].merge(value: datetime_to_s))
       end
 
-      def datetime_to_s
-        value&.strftime('%F %H:%M')
+      def datetime_to_s # ruby
+        value&.strftime(am_pm? ? '%F %I:%M %p' : '%F %H:%M')
+      end
+
+      def pattern # html
+        am_pm? ? '\d{4}(-\d{2})?(-\d{2})?( \d{1,2})?(:\d{2} \[aApPmM]{2})?' : '\d{4}(\-d{2})?(-\d{2})?( \d{2})?(:\d{2})?'
+      end
+
+      def format # moment.js
+        am_pm? ? 'YYYY-MM-DD LT' : 'YYYY-MM-DD HH:mm'
       end
 
       private
@@ -52,6 +60,11 @@ module Effective
         @not_date_linked = (options.delete(:date_linked) == false)
       end
 
+      def am_pm?
+        return @am_pm unless @am_pm.nil?
+        @am_pm = options.key?(:am_pm) ? options.delete(:am_pm) : true
+      end
+
     end
   end
 end

data/app/models/effective/form_inputs/time_field.rb

@@ -5,20 +5,28 @@ module Effective
       def input_html_options
         {
           class: ['form-control', 'effective_date_time_picker', 'effective_time', ('not-date-linked' if not_date_linked?)].compact.join(' '),
-          pattern: '\d{2}:\d{2}'
+          pattern: pattern
         }
       end
 
       def input_js_options
-        { format: 'HH:mm', showTodayButton: true, showClear: true, useCurrent: 'hour', disabledDates: disabled_dates.presence }.compact
+        { format: format, showTodayButton: false, showClear: false, useCurrent: 'hour', disabledDates: disabled_dates.presence }.compact
       end
 
       def input_group_options
         { input_group: { class: 'input-group effective_date_time_picker_input_group' }, prepend: content_tag(:span, icon('clock'), class: 'input-group-text') }
       end
 
-      def datetime_to_s
-        value&.strftime('%H:%M')
+      def datetime_to_s # ruby
+        value&.strftime(am_pm? ? '%I:%M %p' : '%H:%M')
+      end
+
+      def pattern # html
+        am_pm? ? '\d{1,2}(:\d{2} \[aApPmM]{2})?' : '\d{2}(:\d{2})?'
+      end
+
+      def format # moment.js
+        am_pm? ? 'LT' : 'HH:mm'
       end
 
     end

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.1.7'.freeze
+  VERSION = '0.1.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-14 00:00:00.000000000 Z
+date: 2018-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -481,7 +481,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Everything you need to get set up with bootstrap 4.