hellobase 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97553f4ffdcf70e04c9458401cda7c8fa90214289446ed80a9a470b0f33824d5
-  data.tar.gz: 895a9128b0a720b6153b3b1b8e180c909f7f6c591b2bb227d7a0b4e31fb510ba
+  metadata.gz: 6fa5d3298e71115f9af44ce60b01e81c7cbedbb51afe5403ffcbc7e779ce60a7
+  data.tar.gz: d2d63fc84142ea350639817c1f9cdf0aaeeec1c5eba7abcefdacb2c1f1d50ea7
 SHA512:
-  metadata.gz: f6cc31a56055ec57f79230a080ee53c85ac10392c0e662fb730e86f28e3f453eb14a93da96e7f999b94f2ba4abd7690bf666c6644782b1c8d380354c6f9c6309
-  data.tar.gz: c342ae01d51cbba476e1cffd0a043dad49db5463dcc47119588115b211a40c1987b98369ee0acb269d2e266b21ca9a33b0d25893687163c2e243b6794937cf4e
+  metadata.gz: 29caf1fc217aa49f355208131e58b02f4d05e7c3d14e71d41bd341124791694ebe3c016c171de1fb3a5352bb3ebcf23c4fff4201ddd8dde7a8e875661e3d3151
+  data.tar.gz: e6681810f813af2fe9a531f0bacda90a6858f97fc0ae096d14a305f8889b2220d8531736b05c1cf4c5e5c9a357e58b94787aa5c86ef1c40481cc86dc08dbd015

data/lib/hellobase/formtastic/datepicker_with_time_input.rb

@@ -8,7 +8,7 @@ class DatepickerWithTimeInput
   include ::Formtastic::Inputs::Base
 
   def self.virtual_attributes(attr)
-    [:"_dpwt_#{attr}_d", :"_dpwt_#{attr}_t"]
+    [:"_dpwt_#{attr}_d", :"_dpwt_#{attr}_h", :"_dpwt_#{attr}_m"]
   end
 
   def self.define_virtual_attributes(klass, attr)
@@ -21,8 +21,12 @@ class DatepickerWithTimeInput
         self.#{attr}&.strftime('%Y-%m-%d')
       end
 
-      def _dpwt_#{attr}_t
-        self.#{attr}&.strftime('%R')
+      def _dpwt_#{attr}_h
+        self.#{attr}&.strftime('%H')
+      end
+
+      def _dpwt_#{attr}_m
+        self.#{attr}&.strftime('%M')
       end
 
       def _dpwt_#{attr}_d=(val)
@@ -32,8 +36,15 @@ class DatepickerWithTimeInput
         val
       end
 
-      def _dpwt_#{attr}_t=(val)
-        @_dpwt_#{attr}_t = val
+      def _dpwt_#{attr}_h=(val)
+        @_dpwt_#{attr}_h = val
+        _dpwt_set_#{attr}
+
+        val
+      end
+
+      def _dpwt_#{attr}_m=(val)
+        @_dpwt_#{attr}_m = val
         _dpwt_set_#{attr}
 
         val
@@ -42,19 +53,21 @@ class DatepickerWithTimeInput
       private
 
       def _dpwt_set_#{attr}
-        self.#{attr} = @_dpwt_#{attr}_d.blank? || @_dpwt_#{attr}_t.blank? ? nil : [@_dpwt_#{attr}_d, @_dpwt_#{attr}_t].join(' ')
+        self.#{attr} = @_dpwt_#{attr}_d.blank? || @_dpwt_#{attr}_h.blank? || @_dpwt_#{attr}_m.blank? ? nil : [@_dpwt_#{attr}_d, [@_dpwt_#{attr}_h, @_dpwt_#{attr}_m].join(':')].join(' ')
       end
     RUBY
   end
 
   def to_html
     datepicker_html = ActiveAdmin::Inputs::DatepickerInput.new(builder, template, object, object_name, :"_dpwt_#{method}_d", datepicker_options).to_html
-    time_select_html = Formtastic::Inputs::SelectInput.new(builder, template, object, object_name, :"_dpwt_#{method}_t", time_select_options).to_html
+    hour_select_html = Formtastic::Inputs::SelectInput.new(builder, template, object, object_name, :"_dpwt_#{method}_h", hour_select_options).to_html
+    minute_select_html = Formtastic::Inputs::SelectInput.new(builder, template, object, object_name, :"_dpwt_#{method}_m", minute_select_options).to_html
     zone_display_html = options[:time_zone] ? template.content_tag(:span, options[:time_zone]) : nil
 
     wrapper_contents = [
       replace_li_tag(datepicker_html),
-      replace_li_tag(time_select_html),
+      replace_li_tag(hour_select_html),
+      replace_li_tag(minute_select_html),
       zone_display_html,
       error_html,
       hint_html,
@@ -71,11 +84,18 @@ class DatepickerWithTimeInput
     }.merge(options[:datepicker_options] || {})
   end
 
-  def time_select_options
+  def hour_select_options
+    {
+      label: false,
+      collection: 0..23
+    }.merge(options[:hour_select_options] || {})
+  end
+
+  def minute_select_options
     {
       label: false,
-      collection: (0..23).map {|h| (0..59).select {|m| m % 5 == 0 }.map {|m| ['%02i' % h, '%02i' % m].join(':') } }.flatten,
-    }.merge(options[:time_select_options] || {})
+      collection: 0..59,
+    }.merge(options[:minute_select_options] || {})
   end
 
   # formtastic inputs generate <li> with no way to override

data/lib/hellobase/version.rb

@@ -1,3 +1,3 @@
 module Hellobase
-  VERSION = '0.1.12'
+  VERSION = '0.1.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hellobase
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Anthony Wang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-19 00:00:00.000000000 Z
+date: 2020-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -99,9 +99,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.13'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '5.14'
   type: :development
@@ -109,9 +106,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.13'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '5.14'
 - !ruby/object:Gem::Dependency
@@ -184,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.8
 signing_key:
 specification_version: 4
 summary: Ruby runtime environment for Hellobase