kanaui 4.0.0 → 4.0.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +3 -2
- data/app/assets/javascripts/application.js +1 -4
- data/app/assets/javascripts/kanaui/reports.dataTables.js +2 -2
- data/app/assets/stylesheets/application.css +1 -3
- data/app/assets/stylesheets/kanaui/reports.css +1 -1
- data/app/views/kanaui/dashboard/index.html.erb +57 -48
- data/app/views/kanaui/layouts/kanaui_application.html.erb +18 -15
- data/app/views/kanaui/reports/_reports_table.html.erb +1 -1
- data/lib/kanaui/engine.rb +1 -1
- data/lib/kanaui/version.rb +1 -1
- metadata +17 -37
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c34744bca37ea95f575d60fb6ffdaeda6b188d8683918c994b121a0a3d04d3d5
|
|
4
|
+
data.tar.gz: ee332f7b4ba98dc8ae84dcc2058f084a93d3bf9e4f63aadedf1fc8d5fa4f294f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d705a4948ade55bd113af552bb0d9914cc395dd19c1ca47328dc433078837f7b4fdfa3c35369abccdc985ba7688496113d17a9a3059f51302070320d4a303e37
|
|
7
|
+
data.tar.gz: a2acf72aa3c5add5d56ee3ceaff571b2935c50d53d7b17e446477e7daae8624fdbd9c72c9fb8f9ef9ae3663524d5a4135ca400c337a59b62f5b9e26e459e5306
|
data/README.md
CHANGED
|
@@ -15,8 +15,9 @@ Kill Bill compatibility
|
|
|
15
15
|
| 0.5.y | 0.18.z (Rails 4) |
|
|
16
16
|
| 0.6.y | 0.18.z (Rails 5) |
|
|
17
17
|
| 1.x.y | 0.20.z (Rails 5) |
|
|
18
|
-
| 2.
|
|
19
|
-
|
|
|
18
|
+
| 2.1.y | 0.22.z (Rails 5) |
|
|
19
|
+
| 2.2.y | 0.24.z (Rails 6) |
|
|
20
|
+
| 4.x.y | 0.24.z (Rails 7) |
|
|
20
21
|
|
|
21
22
|
Getting Started
|
|
22
23
|
===============
|
|
@@ -4,15 +4,12 @@
|
|
|
4
4
|
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
|
|
5
5
|
// the compiled file.
|
|
6
6
|
//
|
|
7
|
-
//= require js-routes
|
|
8
7
|
//= require log4javascript
|
|
9
8
|
//= require spin
|
|
10
9
|
//= require jquery
|
|
11
10
|
//= require jquery_ujs
|
|
12
|
-
//= require dataTables/jquery.dataTables
|
|
13
|
-
//= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
|
|
14
|
-
//= require dataTables/extras/dataTables.colVis
|
|
15
11
|
//= require d3
|
|
16
12
|
//= require bootstrap-datepicker
|
|
17
13
|
//= require jquery.spin
|
|
18
14
|
//= require kanaui/kanaui
|
|
15
|
+
//= require assets/common
|
|
@@ -17,7 +17,7 @@ ReportsDataTables.prototype.build = function(data, id, wrapper) {
|
|
|
17
17
|
aaData.push([data.values[i]['x'], data.values[i]['y']])
|
|
18
18
|
}
|
|
19
19
|
|
|
20
|
-
dataTable.
|
|
20
|
+
dataTable.DataTable({
|
|
21
21
|
"aaData": aaData,
|
|
22
22
|
"aoColumns": [
|
|
23
23
|
{ "sTitle": "Date" },
|
|
@@ -49,7 +49,7 @@ ReportsDataTables.prototype.buildTable = function(data, wrapper) {
|
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
51
|
|
|
52
|
-
dataTable.
|
|
52
|
+
dataTable.DataTable({
|
|
53
53
|
"aaData": aaData,
|
|
54
54
|
"aoColumns": aoColumns,
|
|
55
55
|
"scrollX": true,
|
|
@@ -4,9 +4,7 @@
|
|
|
4
4
|
* the top of the compiled file, but it's generally better to create a new file per style scope.
|
|
5
5
|
*= require_self
|
|
6
6
|
*= require bootstrap-datepicker3
|
|
7
|
-
*= require dataTables/jquery.dataTables
|
|
8
|
-
*= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
|
|
9
|
-
*= require dataTables/extras/dataTables.colVis
|
|
10
7
|
*= require font-awesome
|
|
11
8
|
*= require kanaui/kanaui
|
|
9
|
+
*= require assets/common
|
|
12
10
|
*/
|
|
@@ -2,57 +2,50 @@
|
|
|
2
2
|
<!-- MENU -->
|
|
3
3
|
<div class="reports-options flex-inner-left-panel">
|
|
4
4
|
<div class="row">
|
|
5
|
+
<div class="col-md-12 col-sm-8">
|
|
6
|
+
<div class="calendar-container">
|
|
7
|
+
<span class="calendar-icon"><i class="fa fa-calendar"></i><i class="fa fa-caret-down"></i></span>
|
|
5
8
|
<% if params[:name] %>
|
|
6
|
-
<div class="
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
<%
|
|
32
|
-
<
|
|
33
|
-
<div class="col-md-7">
|
|
34
|
-
<%= definition['name'].titleize %>:
|
|
35
|
-
<% # TODO Not fully implemented server side %>
|
|
36
|
-
<% if definition['dataType'] == 'date' %>
|
|
37
|
-
<% # TODO datepicker breaks :hover %>
|
|
38
|
-
<input class="form-control" name="variable_<%= definition['name'] %>" type="text" data-provide="datepicker-BROKEN" data-date-format="yyyy-mm-dd" data-date-today-highlight="true" value=""/>
|
|
39
|
-
<% else %>
|
|
40
|
-
<input class="form-control" name="variable_<%= definition['name'] %>" type="text" value=""/>
|
|
41
|
-
<% end %>
|
|
42
|
-
</div>
|
|
43
|
-
</div>
|
|
9
|
+
<div class="form-container">
|
|
10
|
+
<%= form_tag kanaui_engine.dashboard_index_path, :class => 'form-horizontal', :method => :get do %>
|
|
11
|
+
<input name="name" type="hidden" value="<%= @raw_name %>">
|
|
12
|
+
<input name="smooth" type="hidden" value="<%= params[:smooth] %>">
|
|
13
|
+
<input name="sql_only" type="hidden" value="<%= params[:sql_only] %>">
|
|
14
|
+
<input name="format" type="hidden" value="<%= params[:format] %>">
|
|
15
|
+
<input name="delta_days" type="hidden" value="<%= (@end_date.to_date - @start_date.to_date).to_i %>">
|
|
16
|
+
<div class="form-group">
|
|
17
|
+
<div id="dp1" class="col-md-7">
|
|
18
|
+
From:<input class="form-control datepicker" name="start_date" type="text" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-today-highlight="true" value="<%= @start_date %>">
|
|
19
|
+
</div>
|
|
20
|
+
</div>
|
|
21
|
+
<div class="form-group">
|
|
22
|
+
<div class="col-md-7">
|
|
23
|
+
To:<input class="form-control" name="end_date" type="text" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-today-highlight="true" value="<%= @end_date %>">
|
|
24
|
+
</div>
|
|
25
|
+
</div>
|
|
26
|
+
<% ((@report['variables'] || {})['fields'] || []).each do |definition| %>
|
|
27
|
+
<div class="form-group">
|
|
28
|
+
<div class="col-md-7">
|
|
29
|
+
<%= definition['name'].titleize %>:
|
|
30
|
+
<% # TODO Not fully implemented server side %>
|
|
31
|
+
<% if definition['dataType'] == 'date' %>
|
|
32
|
+
<% # TODO datepicker breaks :hover %>
|
|
33
|
+
<input class="form-control" name="variable_<%= definition['name'] %>" type="text" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-today-highlight="true" value=""/>
|
|
34
|
+
<% else %>
|
|
35
|
+
<input class="form-control" name="variable_<%= definition['name'] %>" type="text" value=""/>
|
|
44
36
|
<% end %>
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
</div
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
</div
|
|
37
|
+
</div>
|
|
38
|
+
</div>
|
|
39
|
+
<% end %>
|
|
40
|
+
<div class="form-group">
|
|
41
|
+
<div class="col-sm-12">
|
|
42
|
+
<%= submit_tag 'Refresh', :class => 'btn btn-default' %>
|
|
43
|
+
</div>
|
|
44
|
+
</div>
|
|
45
|
+
<% end %>
|
|
46
|
+
</div>
|
|
55
47
|
<% end %>
|
|
48
|
+
</div>
|
|
56
49
|
<div class="col-md-12 col-sm-8">
|
|
57
50
|
<h4><%= link_to 'Available Reports', kanaui_engine.url_for(:controller => :reports) %></h4>
|
|
58
51
|
<ul class="nav nav-tabs nav-stacked">
|
|
@@ -72,6 +65,7 @@
|
|
|
72
65
|
<% end %>
|
|
73
66
|
</ul>
|
|
74
67
|
</div>
|
|
68
|
+
</div>
|
|
75
69
|
</div>
|
|
76
70
|
<div class="row">
|
|
77
71
|
<div class="col-md-12 col-sm-8">
|
|
@@ -182,3 +176,18 @@
|
|
|
182
176
|
</div>
|
|
183
177
|
</div>
|
|
184
178
|
</div>
|
|
179
|
+
|
|
180
|
+
|
|
181
|
+
<%= javascript_tag do %>
|
|
182
|
+
$(document).ready(function() {
|
|
183
|
+
$('.calendar-icon').click(function() {
|
|
184
|
+
$('.form-container').toggle();
|
|
185
|
+
});
|
|
186
|
+
});
|
|
187
|
+
<% end %>
|
|
188
|
+
|
|
189
|
+
<style type="text/css">
|
|
190
|
+
.form-container {
|
|
191
|
+
display: none;
|
|
192
|
+
}
|
|
193
|
+
</style>
|
|
@@ -7,25 +7,28 @@
|
|
|
7
7
|
<%= javascript_include_tag 'application' %>
|
|
8
8
|
<%= csrf_meta_tags %>
|
|
9
9
|
</head>
|
|
10
|
-
<
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
10
|
+
<body>
|
|
11
|
+
<div class="container">
|
|
12
|
+
<div class="container-fluid">
|
|
13
|
+
<%- # :alert used by devise -%>
|
|
14
|
+
<% [:error, :alert].each do |key| %>
|
|
15
|
+
<% if flash[key] %>
|
|
16
|
+
<div class="row">
|
|
17
|
+
<div class="col-md-10 col-md-offset-2">
|
|
18
|
+
<div class="alert alert-error"><%= flash[key] %></div>
|
|
19
|
+
</div>
|
|
20
|
+
</div>
|
|
21
|
+
<% end %>
|
|
22
|
+
<% end %>
|
|
23
|
+
<% if flash[:notice] %>
|
|
14
24
|
<div class="row">
|
|
15
25
|
<div class="col-md-10 col-md-offset-2">
|
|
16
|
-
<div class="alert alert-
|
|
26
|
+
<div class="alert alert-info"><%= flash[:notice] %></div>
|
|
17
27
|
</div>
|
|
18
28
|
</div>
|
|
19
29
|
<% end %>
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
<div class="col-md-10 col-md-offset-2">
|
|
24
|
-
<div class="alert alert-info"><%= flash[:notice] %></div>
|
|
25
|
-
</div>
|
|
26
|
-
</div>
|
|
27
|
-
<% end %>
|
|
28
|
-
<%= yield %>
|
|
29
|
-
</div>
|
|
30
|
+
<%= yield %>
|
|
31
|
+
<div>
|
|
32
|
+
</div>
|
|
30
33
|
</body>
|
|
31
34
|
</html>
|
data/lib/kanaui/engine.rb
CHANGED
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
# See also https://github.com/carlhuda/bundler/issues/49
|
|
9
9
|
require 'js-routes'
|
|
10
10
|
require 'jquery-rails'
|
|
11
|
-
require '
|
|
11
|
+
require 'killbill_assets_ui'
|
|
12
12
|
require 'font-awesome-rails'
|
|
13
13
|
require 'bootstrap-datepicker-rails'
|
|
14
14
|
require 'd3_rails'
|
data/lib/kanaui/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: kanaui
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 4.0.
|
|
4
|
+
version: 4.0.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Kill Bill core team
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2024-01-30 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bootstrap-datepicker-rails
|
|
@@ -28,22 +28,16 @@ dependencies:
|
|
|
28
28
|
name: d3_rails
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
|
30
30
|
requirements:
|
|
31
|
-
- -
|
|
32
|
-
- !ruby/object:Gem::Version
|
|
33
|
-
version: 3.2.8
|
|
34
|
-
- - "<"
|
|
31
|
+
- - '='
|
|
35
32
|
- !ruby/object:Gem::Version
|
|
36
|
-
version: 4.
|
|
33
|
+
version: 4.1.0
|
|
37
34
|
type: :runtime
|
|
38
35
|
prerelease: false
|
|
39
36
|
version_requirements: !ruby/object:Gem::Requirement
|
|
40
37
|
requirements:
|
|
41
|
-
- -
|
|
42
|
-
- !ruby/object:Gem::Version
|
|
43
|
-
version: 3.2.8
|
|
44
|
-
- - "<"
|
|
38
|
+
- - '='
|
|
45
39
|
- !ruby/object:Gem::Version
|
|
46
|
-
version: 4.
|
|
40
|
+
version: 4.1.0
|
|
47
41
|
- !ruby/object:Gem::Dependency
|
|
48
42
|
name: font-awesome-rails
|
|
49
43
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -58,20 +52,6 @@ dependencies:
|
|
|
58
52
|
- - ">="
|
|
59
53
|
- !ruby/object:Gem::Version
|
|
60
54
|
version: '0'
|
|
61
|
-
- !ruby/object:Gem::Dependency
|
|
62
|
-
name: jquery-datatables-rails
|
|
63
|
-
requirement: !ruby/object:Gem::Requirement
|
|
64
|
-
requirements:
|
|
65
|
-
- - "~>"
|
|
66
|
-
- !ruby/object:Gem::Version
|
|
67
|
-
version: '3.3'
|
|
68
|
-
type: :runtime
|
|
69
|
-
prerelease: false
|
|
70
|
-
version_requirements: !ruby/object:Gem::Requirement
|
|
71
|
-
requirements:
|
|
72
|
-
- - "~>"
|
|
73
|
-
- !ruby/object:Gem::Version
|
|
74
|
-
version: '3.3'
|
|
75
55
|
- !ruby/object:Gem::Dependency
|
|
76
56
|
name: jquery-rails
|
|
77
57
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -107,7 +87,7 @@ dependencies:
|
|
|
107
87
|
- !ruby/object:Gem::Version
|
|
108
88
|
version: '3.0'
|
|
109
89
|
- !ruby/object:Gem::Dependency
|
|
110
|
-
name: killbill-
|
|
90
|
+
name: killbill-assets-ui
|
|
111
91
|
requirement: !ruby/object:Gem::Requirement
|
|
112
92
|
requirements:
|
|
113
93
|
- - ">="
|
|
@@ -121,33 +101,33 @@ dependencies:
|
|
|
121
101
|
- !ruby/object:Gem::Version
|
|
122
102
|
version: '0'
|
|
123
103
|
- !ruby/object:Gem::Dependency
|
|
124
|
-
name:
|
|
104
|
+
name: killbill-client
|
|
125
105
|
requirement: !ruby/object:Gem::Requirement
|
|
126
106
|
requirements:
|
|
127
|
-
- - "
|
|
107
|
+
- - ">="
|
|
128
108
|
- !ruby/object:Gem::Version
|
|
129
|
-
version: '
|
|
109
|
+
version: '0'
|
|
130
110
|
type: :runtime
|
|
131
111
|
prerelease: false
|
|
132
112
|
version_requirements: !ruby/object:Gem::Requirement
|
|
133
113
|
requirements:
|
|
134
|
-
- - "
|
|
114
|
+
- - ">="
|
|
135
115
|
- !ruby/object:Gem::Version
|
|
136
|
-
version: '
|
|
116
|
+
version: '0'
|
|
137
117
|
- !ruby/object:Gem::Dependency
|
|
138
|
-
name:
|
|
118
|
+
name: rails
|
|
139
119
|
requirement: !ruby/object:Gem::Requirement
|
|
140
120
|
requirements:
|
|
141
|
-
- - "
|
|
121
|
+
- - "~>"
|
|
142
122
|
- !ruby/object:Gem::Version
|
|
143
|
-
version: '0'
|
|
123
|
+
version: '7.0'
|
|
144
124
|
type: :runtime
|
|
145
125
|
prerelease: false
|
|
146
126
|
version_requirements: !ruby/object:Gem::Requirement
|
|
147
127
|
requirements:
|
|
148
|
-
- - "
|
|
128
|
+
- - "~>"
|
|
149
129
|
- !ruby/object:Gem::Version
|
|
150
|
-
version: '0'
|
|
130
|
+
version: '7.0'
|
|
151
131
|
- !ruby/object:Gem::Dependency
|
|
152
132
|
name: spinjs-rails
|
|
153
133
|
requirement: !ruby/object:Gem::Requirement
|