five-two-nw-olivander 0.1.2.21 → 0.1.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 539b6791367e3d96d805c01c479594b8df38866f9c15641cce69e9523d9556e7
-  data.tar.gz: fc09874c9cd028c1e477db9fd5c448a77334f8c777b607a7527c2793328d03f8
+  metadata.gz: 4e1ff112f4d4b249ab0810df0cec13e2dceddddafcaf228de4caa4d7009fbba5
+  data.tar.gz: 471a085a13daf8ab6468d95999663351a07f761636fd559081dae664b459d11f
 SHA512:
-  metadata.gz: 88815b3f90b87c1dd9ea1312cbc6b41d2f8c99c503f9c37e4d3850ea6427e5031af6a8e06dd3fd016baf2c5cde5fec6372126e8a1a26008528b6ba14af570132
-  data.tar.gz: a73c30e128514624507f6ce823088a8d30fa97b9fa3831c8a919e246339e69fe5d518f022226b04181ccba0dd751a384f349052d03b0605900d5ba2f8656ec32
+  metadata.gz: a4aa345359703da27fcbf09077638bba6c8e229ca43b9792b5da97725af1439da746784496152796bc3a2e603bf4a85cf6efc199746130c09d391d98b2f65d07
+  data.tar.gz: 5fab915b6c4e2cd4fd5a4560ee3cb44b3198d52fc16f78fb47fe8c05a3f21724e6f00a2d84cff83d37468e497022951a0076c803d0fb62759e3069f1ff8d847c

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

@@ -4,7 +4,8 @@
     .row
       - section.fields.each do |field|
         %div{ class: section.column_class }
-          - if field.type == :association
-            = @f.association field.sym, disabled: !field.editable
+          - case field.type
+          - when :association
+            = @f.association field.sym, disabled: !field.editable, input_html: { data: { controller: "input-control-#{field.type}" } }
           - else 
-            = @f.input field.sym, disabled: !field.editable
+            = @f.input field.sym, disabled: !field.editable, as: field.type.to_sym, input_html: { data: { controller: "input-control-#{field.type}" } }

data/app/inputs/date_time_input.rb

@@ -0,0 +1,38 @@
+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?
+
+    disabled = options[:disabled] || false
+
+    field = @builder.text_field(attribute_name, id: "#{attribute_name}_datetimepicker", class: 'form-control', value: raw_value, disabled: disabled, 'data-toggle': 'datetimepicker', 'data-target': "##{attribute_name}_datetimepicker")
+
+    add_on_class = options[:add_on_class] || "fa fa-calendar"
+
+    add_on = template.content_tag(:div, class: "input-group-prepend") do
+      add_on = template.content_tag(:div, class: "input-group-text") do
+        template.content_tag(:i, '', :class => add_on_class, 'data-toggle': 'datetimepicker', 'data-target': "##{attribute_name}_datetimepicker")
+      end
+    end
+
+    all = content_tag(:div, add_on + field, class: 'input-group')
+
+    script = "".html_safe
+    unless disabled then
+      picker_options = options[:picker_options] || { "format" => "MM/DD/YYYY" }
+
+      script = """
+        <script>
+        $(document).ready(function() {
+          $('##{attribute_name}_datetimepicker').datetimepicker(
+            #{picker_options.to_json}
+          );
+        });
+        </script>
+      """.html_safe
+    end
+
+    all + script
+  end
+end

data/app/views/application/index.html.haml

@@ -1,5 +1,7 @@
 - resource = (@_effective_resource || Effective::Resource.new(controller_path))
 
+= render_optional_partial 'index_before'
+
 - if @datatable
   - content_for :datatable do
     = render_datatable(@datatable, charts: false)
@@ -7,18 +9,21 @@
     - keys = @datatable._charts.keys
     - ks = keys.size
     - if ks.positive?
-      %br
-      .row
-        - @datatable._charts.keys.each do |k|
+      %br.foo
+      .row{ data: { controller: 'datatable-index-charts' }}
+        - keys.each do |k|
+          - chart = @datatable._charts[k]
           %div{ class: "#{col_class_num('xl', ks, 3)} #{col_class_num('lg', ks, 2)} #{col_class_num('md', ks, 6)} #{col_class_num('sm', ks, 6)}"}
-            .card.card-primary
+            .card.card-primary{ data: { controller: 'datatable-expandable-chart' } }
               .card-header
                 %h3.card-title= I18n.t([@datatable.class.name.underscore, 'charts', k].join('.'))
                 .card-tools.text-right
+                  %button.btn.btn-tool{ type: :button, 'data-card-widget': :collapse }
+                    %i.fas.fa-minus
                   %button.btn.btn-tool{ type: :button, 'data-card-widget': :maximize }
                     %i.fas.fa-expand
-              .card-body{ style: 'min-height: 220px' }
-                = render_datatable_chart(@datatable, k)
+              .card-body{ style: 'height: 220px' }
+                = send(chart[:as].underscore, @datatable.to_json[:charts][k][:data], id: chart[:name], height: '90%', adapter: 'google')
 
   = content_for :datatable_charts
 
@@ -45,7 +50,4 @@
           %p or include Effective::CrudController in your controller
       -# .card-footer
 
-- begin
-  = render partial: 'index_additional'
-- rescue ActionView::MissingTemplate
-  - Rails.logger.debug "did not find additional index partial"
+= render_optional_partial 'index_after'

data/app/views/application/index.json.jbuilder

@@ -0,0 +1,3 @@
+json.items @resources do |resource|
+  json.id resource.id
+end

data/config/initializers/simple_form.rb

@@ -13,7 +13,7 @@ SimpleForm.setup do |config|
   # wrapper, change the order or even add your own to the
   # stack. The options given below are used to wrap the
   # whole input.
-  config.wrappers :default, class: :input,
+  config.wrappers :default, class: "form-group",
     hint_class: :field_with_hint, error_class: :field_with_errors, valid_class: :field_without_errors do |b|
     ## Extensions enabled by default
     # Any of these extensions can be disabled for a
@@ -52,16 +52,49 @@ SimpleForm.setup do |config|
     b.optional :readonly
 
     ## Inputs
-    # b.use :input, class: 'input', error_class: 'is-invalid', valid_class: 'is-valid'
-    b.use :label_input
+    # b.use :input, class: 'form-control', error_class: 'is-invalid', valid_class: 'is-valid'
+    b.use :label #, class: 'form-control'
+    b.use :input, class: 'form-control'
     b.use :hint,  wrap_with: { tag: :span, class: :hint }
-    b.use :error, wrap_with: { tag: :span, class: :error }
+    b.use :error, wrap_with: { tag: :span, class: "text-danger" }
 
     ## full_messages_for
     # If you want to display the full error message for the attribute, you can
     # use the component :full_error, like:
     #
     # b.use :full_error, wrap_with: { tag: :span, class: :error }
+
+    # b.wrapper
+  end
+
+  config.wrappers :checkbox, class: "form-check",
+    hint_class: :field_with_hint, error_class: :field_with_errors, valid_class: :field_without_errors do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :minlength
+    b.optional :pattern
+    b.optional :min_max
+    b.optional :readonly
+    b.use :input, class: 'form-check-input'
+    b.use :label #, class: 'form-control'
+    b.use :hint,  wrap_with: { tag: :span, class: :hint }
+    b.use :error, wrap_with: { tag: :span, class: "text-danger" }
+  end
+
+  config.wrappers :switch, class: "custom-control custom-switch",
+    hint_class: :field_with_hint, error_class: :field_with_errors, valid_class: :field_without_errors do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :minlength
+    b.optional :pattern
+    b.optional :min_max
+    b.optional :readonly
+    b.use :input, class: 'custom-control-input'
+    #b.use :label, class: 'custom-control-label'
+    b.use :hint,  wrap_with: { tag: :span, class: :hint }
+    b.use :error, wrap_with: { tag: :span, class: "text-danger" }
   end
 
   # The default wrapper to be used by the FormBuilder.
@@ -71,7 +104,7 @@ SimpleForm.setup do |config|
   # Defaults to :nested for bootstrap config.
   #   inline: input + label
   #   nested: label > input
-  config.boolean_style = :nested
+  config.boolean_style = :inline
 
   # Default class for buttons
   config.button_class = 'btn'

data/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = "0.1.2.21"
+  VERSION = "0.1.2.23"
 end

data/lib/templates/erb/scaffold/_form.html.erb

@@ -0,0 +1,15 @@
+<%# frozen_string_literal: true %>
+<%%= simple_form_for(@<%= singular_table_name %>) do |f| %>
+  <%%= f.error_notification %>
+  <%%= f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present? %>
+
+  <div class="form-inputs">
+  <%- attributes.each do |attribute| -%>
+    <%%= f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %> %>
+  <%- end -%>
+  </div>
+
+  <div class="form-actions">
+    <%%= f.button :submit %>
+  </div>
+<%% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.1.2.21
+  version: 0.1.2.23
 platform: ruby
 authors:
 - Eric Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-19 00:00:00.000000000 Z
+date: 2023-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick
@@ -194,6 +194,7 @@ files:
 - app/controllers/olivander/application_controller.rb
 - app/datatables/olivander/datatable.rb
 - app/helpers/olivander/application_helper.rb
+- app/inputs/date_time_input.rb
 - app/jobs/olivander/application_job.rb
 - app/mailers/olivander/application_mailer.rb
 - app/models/olivander/application_record.rb
@@ -201,6 +202,7 @@ files:
 - app/views/application/_resource_form_actions.html.haml
 - app/views/application/edit.html.haml
 - app/views/application/index.html.haml
+- app/views/application/index.json.jbuilder
 - app/views/application/new.html.haml
 - app/views/application/show.html.haml
 - app/views/effective/resource/_actions_dropleft.html.haml
@@ -228,6 +230,7 @@ files:
 - lib/olivander/menus/menu_item.rb
 - lib/olivander/version.rb
 - lib/tasks/olivander_tasks.rake
+- lib/templates/erb/scaffold/_form.html.erb
 - lib/templates/erb/scaffold/_form.html.haml
 homepage: https://rubygems.org/gems/olivander
 licenses: