five-two-nw-olivander 0.1.2.52 → 0.1.2.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e93303d3b518b3409a10ca1d3ca08da710bbfee02e520c25dbca2fd14ff30f2
-  data.tar.gz: 803fc57772644b7ae0205e9c8df64d2fbba922e094ca53066916292b2bb8ca56
+  metadata.gz: 9c7bb9ca1148b73f620fb33abb4d3e0f692a62364cbe6cbbb12caf2842a5675f
+  data.tar.gz: 1f576e6e4fe9021ba796df7d0d3a49f0487364e8b825f70ef60d9d12630ddd2b
 SHA512:
-  metadata.gz: a931367c49c1001c860e979276c0d2e96a6cba7614ab1edd172d2e5306f01a005407aa3a6fac3493f640a113dc07bd0e6757e2a072e9430c209b3437c7d5076d
-  data.tar.gz: d2a97766f50abb22ca3947fe6eff851b7c443d3ef8d2397a4b8ed0400eb370d3756b1c4eb1ac72dc5ba36b678d6274f792464f5d0f25162169d8e1e8319c23b0
+  metadata.gz: c1be74c70e8d8123daf7ebdcc32b9390031e6aea0c720cbe3fb73d70a454dd8b50b496cab31a8cebbf3572efa0c6d8effdc3319f9d62fbd7492e7ab54e16570d
+  data.tar.gz: a429f66dbc812bf6079bc5c56964fad71c748fe0e4bb3e62344c77636826aa148d63208b5e34c63d76bc68279f1ab7eff0b5a44b70bbfdaeb74546d9c2bb4ee8

data/app/assets/javascripts/controllers/datatable_index_charts_controller.js

@@ -0,0 +1,16 @@
+import { Controller } from "@hotwired/stimulus"
+
+// Connects to data-controller="datatable-index-charts"
+export default class extends Controller {
+  connect() {
+    var self = this
+
+    $(".effective-datatable").on("draw.dt", function(e, dt, type, indexes) {
+      var jsonCharts = dt.json.charts
+      for (var chart in jsonCharts) {
+        var chartkickChart = Chartkick.charts[chart]
+        chartkickChart.redraw()
+      }
+    });
+  }
+}

data/app/helpers/olivander/application_helper.rb

@@ -1,5 +1,20 @@
 module Olivander
   module ApplicationHelper
+    def chart_column_class_num(label, count, min)
+      return "col-#{label}-#{min}" if count >= 12
+      modded = count % 12
+      divisor = modded.zero? ? 1 : modded
+      "col-#{label}-#{[12/divisor, min].max}"
+  
+      divisor = count
+      result = 12/divisor
+      while result < min
+        divisor = divisor/2
+        result = 12/divisor
+      end
+      "col-#{label}-#{result}"
+    end
+
     def page_title
       cf = content_for(:title)
       return cf unless cf.blank?

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

@@ -13,7 +13,7 @@
       .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)}"}
+          %div{ class: "#{chart_column_class_num('xl', ks, 3)} #{chart_column_class_num('lg', ks, 2)} #{chart_column_class_num('md', ks, 6)} #{chart_column_class_num('sm', ks, 6)}"}
             .card.card-primary{ data: { controller: 'datatable-expandable-chart' } }
               .card-header
                 %h3.card-title= I18n.t([@datatable.class.name.underscore, 'charts', k].join('.'))

data/config/importmap.rb

@@ -0,0 +1 @@
+pin_all_from "..app/javascript/controllers", under: "controllers"

data/lib/olivander/engine.rb

@@ -3,7 +3,7 @@ module Olivander
     isolate_namespace Olivander
 
     initializer "olivander.assets.precompile" do |app|
-      app.config.assets.precompile += %w[adminlte.js adminlte.css avatar0.png avatar1.png avatar2.png avatar3.png avatar4.png]
+      app.config.assets.precompile += %w[adminlte.js datatable_index_charts_controller.js adminlte.css avatar0.png avatar1.png avatar2.png avatar3.png avatar4.png]
     end
 
     initializer "olivander.action_controller" do |app|
@@ -11,5 +11,9 @@ module Olivander
         helper Olivander::ApplicationHelper
       end
     end
+
+    initializer "olivander.importmap", before: "importmap" do |app|
+      app.config.importmap.paths << Engine.root.join('config/importmap.rb')
+    end
   end
 end

data/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = '0.1.2.52'.freeze
+  VERSION = '0.1.2.54'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.1.2.52
+  version: 0.1.2.54
 platform: ruby
 authors:
 - Eric Dennis
@@ -204,6 +204,7 @@ files:
 - app/assets/javascripts/adminlte/plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min.css
 - app/assets/javascripts/adminlte/plugins/tempusdominus-bootstrap-4/js/tempusdominus-bootstrap-4.min.js
 - app/assets/javascripts/adminlte/select2_defaults.coffee
+- app/assets/javascripts/controllers/datatable_index_charts_controller.js
 - app/assets/stylesheets/adminlte.css
 - app/assets/stylesheets/fa-fix.scss
 - app/assets/stylesheets/olivander/application.css
@@ -251,6 +252,7 @@ files:
 - app/views/layouts/olivander/adminlte/login.html.haml
 - app/views/layouts/olivander/adminlte/main.html.haml
 - app/views/layouts/olivander/application.html.haml
+- config/importmap.rb
 - config/initializers/simple_form.rb
 - config/locales/simple_form.en.yml
 - config/routes.rb