five-two-nw-olivander 0.1.2.21 → 0.1.2.22
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/views/application/index.html.haml +10 -10
- data/lib/olivander/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: cf9c0144387ec2d459f02dadea4b96402dac9698093cc3fd897de95fc787ba7d
|
|
4
|
+
data.tar.gz: 84c801572bdec84621c76e8c34c0b640dcbc0f9b106edf4c0425d683455e7673
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: e2cae3668e04550b11d6514e73cd914d29aab621e3b63b3ddaf1d0f79af52bb1d6b92e24d9a1747f0cf8af5e043ccc6a288b4e64a5fc4c960893db417e37d932
|
|
7
|
+
data.tar.gz: a6dd96121cec897f2639f147fca0737fdb20fc4dab3e8879635b6d41bf385dfe9303ece99333687c9e51041d383a051bca081f1896c640eafb73e201ca3ef1de
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
- resource = (@_effective_resource || Effective::Resource.new(controller_path))
|
|
2
2
|
|
|
3
|
+
= render_optional_partial 'index_before'
|
|
4
|
+
|
|
3
5
|
- if @datatable
|
|
4
6
|
- content_for :datatable do
|
|
5
7
|
= render_datatable(@datatable, charts: false)
|
|
@@ -7,18 +9,19 @@
|
|
|
7
9
|
- keys = @datatable._charts.keys
|
|
8
10
|
- ks = keys.size
|
|
9
11
|
- if ks.positive?
|
|
10
|
-
%br
|
|
11
|
-
.row
|
|
12
|
-
-
|
|
12
|
+
%br.foo
|
|
13
|
+
.row{ data: { controller: 'datatable-index-charts' }}
|
|
14
|
+
- keys.each do |k|
|
|
15
|
+
- chart = @datatable._charts[k]
|
|
13
16
|
%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)}"}
|
|
14
|
-
.card.card-primary
|
|
17
|
+
.card.card-primary{ data: { controller: 'datatable-expandable-chart' } }
|
|
15
18
|
.card-header
|
|
16
19
|
%h3.card-title= I18n.t([@datatable.class.name.underscore, 'charts', k].join('.'))
|
|
17
20
|
.card-tools.text-right
|
|
18
21
|
%button.btn.btn-tool{ type: :button, 'data-card-widget': :maximize }
|
|
19
22
|
%i.fas.fa-expand
|
|
20
|
-
.card-body{ style: '
|
|
21
|
-
=
|
|
23
|
+
.card-body{ style: 'height: 220px' }
|
|
24
|
+
= send(chart[:as].underscore, @datatable.to_json[:charts][k][:data], id: chart[:name], height: '90%', adapter: 'google')
|
|
22
25
|
|
|
23
26
|
= content_for :datatable_charts
|
|
24
27
|
|
|
@@ -45,7 +48,4 @@
|
|
|
45
48
|
%p or include Effective::CrudController in your controller
|
|
46
49
|
-# .card-footer
|
|
47
50
|
|
|
48
|
-
|
|
49
|
-
= render partial: 'index_additional'
|
|
50
|
-
- rescue ActionView::MissingTemplate
|
|
51
|
-
- Rails.logger.debug "did not find additional index partial"
|
|
51
|
+
= render_optional_partial 'index_after'
|
data/lib/olivander/version.rb
CHANGED