five-two-nw-olivander 0.1.2.53 → 0.1.2.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 632378da94b2fa416a7e6108084b417e89d0c3cf80ed6977c952296e808102de
-  data.tar.gz: d6b59b0877cc908bbb0da4ddb0ffe4acac4ef0195e7c3a5659cdf167760b1dd5
+  metadata.gz: 3530a74b6c8673923e9747c1a96095c4257cc0fe4548915a0268bdcbe2b3eefb
+  data.tar.gz: d90e65ea9ffc37e9270715673d26aae6e14c99bdb95aa0d960c65bd464b4538c
 SHA512:
-  metadata.gz: e4342053f522cb69b4853def238a22cecf0d70927384fd6ddc12c8794d546c054b5594a5000aae0186f512438bb4e0b822f89b2abaf1bda5f9f9d057e213a635
-  data.tar.gz: 1452432fe2d9c5e3469f4878a7f3984ed99e19d54cdfd645eb549f8f04770b760865b0e444731c7cc261456f5904e4b29c91586fe000fb8279b4770712af4174
+  metadata.gz: d1316353cfb569f9fd7f2975b0bd96444a823625cdce839822a94df85670b23f9c1ae2fb0504a848fa4dde81469c177831e08b468b21658297c4be4d5d03904b
+  data.tar.gz: eb61a8b7da698576edfaf71e6b5c4e3223ab2126459df5e83c10829a22a3f2fb467d936311d8a3d0ffa48f22f508d56ea75d13be9e6728138c6c24d835542c38

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

@@ -9,8 +9,20 @@ export default class extends Controller {
       var jsonCharts = dt.json.charts
       for (var chart in jsonCharts) {
         var chartkickChart = Chartkick.charts[chart]
+        chartkickChart.updateData(self.transformData(jsonCharts[chart]))
         chartkickChart.redraw()
       }
     });
   }
+
+  transformData(chart) {
+    var self = this
+    console.log("let's transform some data")
+    if (chart.as == 'LineChart') {
+      // we don't know what to do
+      return chart.data
+    } else {
+      return chart.data
+    }
+  }
 }

data/app/datatables/olivander/datatable.rb

@@ -62,8 +62,6 @@ module Olivander
 
       datatable do
         order(order_by[0], order_by[1]) if order_by.size == 2
-        Rails.logger.debug "bulk actions size: #{datatable._bulk_actions.size}"
-        Rails.logger.debug "bulk actions size: #{datatable._bulk_actions.size.positive?}"
         # bulk_actions_col if datatable._bulk_actions.size.positive?
 
         #TODO: use columns from model here instead of attributes keys

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/models/olivander/application_record.rb

@@ -3,8 +3,7 @@ module Olivander
     self.abstract_class = true
 
     def self.audited_as klazz
-      Rails.logger.debug "#{self.class.name} is audited as #{klazz.name}"
-
+      # Rails.logger.debug "#{self.class.name} is audited as #{klazz.name}"
       @@audited_user_class = klazz
 
       belongs_to :created_by, class_name: klazz.name

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/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = '0.1.2.53'.freeze
+  VERSION = '0.1.2.55'.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.53
+  version: 0.1.2.55
 platform: ruby
 authors:
 - Eric Dennis