lotus_admin 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a6d6f7dab65888fc3cc1d0c1823baa23eb80d80605bc11c292bccff92f2242a
-  data.tar.gz: 72edd101b774056720d793cbab45c79f52519add43976762c1a32f1962719037
+  metadata.gz: '0009428266da5d0d9c3ea09cbbea1c6f4f2e7f09c9da6a5792c5f2891f9f7f09'
+  data.tar.gz: 8e0480793bc75ea33106336c1a5fb75d79c09ef1e93fc4b596c92761019fdf93
 SHA512:
-  metadata.gz: 442cdf1f5eaf5ee45be321bfdf1dcbd0cf503101abf3a1f441e98521bb3d70a37b802e6526319edac810f46932ece767d389290fb379a27ff73ba87f917ed2f2
-  data.tar.gz: 7427bb13393baf8774e1be6bdc0613bccec45baaac602fb718e8abdedc659c4219bef7ad0b09b94a6c8a0e3bc7da890271635a2d6ca836b01513819512fb9f7c
+  metadata.gz: 7a92fecdde33a23f2fb010d551aaf90f3db1688d767c01154f0c6d6394a3adc3fa1092edc9575b9a4cce5375a7f8e18f3b1e0bb32241acf8b0d726a9f7f4c971
+  data.tar.gz: 5ffdaafacaba4d838bab07471d727614ff17cacd4da9fae3f75b3aab13254050be2986aa7b57fc80ff8ce0b7678161ee6e6a37637dea2bdf8fe362aa8e8c1c64

data/app/assets/javascripts/lotus_admin/datepickers.js.coffee

@@ -12,14 +12,13 @@ $ ->
   }
 
   setup_datepickers = (container)->
-    container.find('.input-group.date, .form-control.date').datetimepicker
+    container.find('.input-group.date').datetimepicker
       format: 'YYYY-MM-DD',
       icons: icons
 
-    container.find('.input-group.datetime, .form-control.datetime').datetimepicker
+    container.find('.input-group.datetime').datetimepicker
       format: 'YYYY-MM-DD hh:mm a',
-      icons: icons,
-      debug: true
+      icons: icons
 
   # On page load
   setup_datepickers($('body'))

data/app/inputs/currency_input.rb

@@ -0,0 +1,22 @@
+class CurrencyInput < SimpleForm::Inputs::Base
+  def input(wrapper_options)
+    currency = options.delete(:currency) || default_currency
+    merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
+
+    content_tag(:div, input_group(currency, merged_input_options), class: "input-group")
+  end
+
+  private
+
+  def input_group(currency, merged_input_options)
+    "#{currency_addon(currency)} #{@builder.text_field(attribute_name, merged_input_options)}".html_safe
+  end
+
+  def currency_addon(currency)
+    content_tag(:span, currency, class: "input-group-addon")
+  end
+
+  def default_currency
+    "$"
+  end
+end

data/app/inputs/date_time_input.rb

@@ -0,0 +1,28 @@
+class DateTimeInput < SimpleForm::Inputs::Base
+  def input(wrapper_options)
+    merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
+
+    content_tag(:div, input_group(merged_input_options), class: "input-group datetime")
+  end
+
+  private
+
+  def input_group(merged_input_options)
+    "#{calendar_addon} #{@builder.text_field(attribute_name, merged_input_options)}".html_safe
+  end
+
+  def calendar_addon
+    content_tag(:span, calendar_icon, class: "input-group-addon")
+  end
+
+  def calendar_icon
+    @builder.template.fa_icon(:calendar)
+  end
+
+  def input_html_options
+    super.merge({
+      class: 'datetime',
+      value: @builder.object.public_send(attribute_name)&.strftime('%Y-%m-%d %l:%M %P')
+    })
+  end
+end

data/lib/lotus_admin/version.rb

@@ -1,3 +1,3 @@
 module LotusAdmin
-  VERSION = '1.5.2'
+  VERSION = '1.5.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lotus_admin
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Matt Millsaps-Brewer
@@ -405,7 +405,9 @@ files:
 - app/helpers/lotus_admin/panel_helpers.rb
 - app/helpers/lotus_admin/render_helpers.rb
 - app/helpers/lotus_admin/sidebar_helpers.rb
+- app/inputs/currency_input.rb
 - app/inputs/date_picker_input.rb
+- app/inputs/date_time_input.rb
 - app/jobs/lotus_admin/application_job.rb
 - app/mailers/lotus_admin/application_mailer.rb
 - app/mailers/lotus_admin/user_mailer.rb