kanaui 0.5.0 → 0.5.1

data/app/controllers/kanaui/engine_controller.rb

@@ -14,5 +14,15 @@ module Kanaui
       Kanaui.current_tenant_user.call(session, user)
     end
 
+    def options_for_klient
+      user = current_tenant_user
+      {
+          :username => user[:username],
+          :password => user[:password],
+          :session_id => user[:session_id],
+          :api_key => user[:api_key],
+          :api_secret => user[:api_secret]
+      }
+    end
   end
 end

data/app/controllers/kanaui/reports_controller.rb

@@ -0,0 +1,60 @@
+module Kanaui
+  class ReportsController < Kanaui::EngineController
+
+    def index
+      @reports = JSON.parse(Kanaui::DashboardHelper::DashboardApi.available_reports(options_for_klient)).map(&:deep_symbolize_keys)
+    end
+
+    def new
+      @report = {}
+    end
+
+    def create
+      Kanaui::DashboardHelper::DashboardApi.create_report(report_from_params.to_json, options_for_klient)
+
+      flash[:notice] = 'Report successfully created'
+      redirect_to :action => :index
+    end
+
+    def edit
+      @report = JSON.parse(Kanaui::DashboardHelper::DashboardApi.available_reports(options_for_klient))
+                    .find { |x| x['reportName'] == params.require(:id) }
+                    .deep_symbolize_keys
+    end
+
+    def update
+      Kanaui::DashboardHelper::DashboardApi.update_report(params.require(:id), report_from_params.to_json, options_for_klient)
+
+      flash[:notice] = 'Report successfully updated'
+      redirect_to :action => :index
+    end
+
+    def refresh
+      Kanaui::DashboardHelper::DashboardApi.refresh_report(params.require(:id), options_for_klient)
+
+      flash[:notice] = 'Report refresh successfully scheduled'
+      redirect_to :action => :index
+    end
+
+    def destroy
+      Kanaui::DashboardHelper::DashboardApi.delete_report(params.require(:id), options_for_klient)
+
+      flash[:notice] = 'Report successfully deleted'
+      redirect_to :action => :index
+    end
+
+    private
+
+    def report_from_params
+      {
+          :reportName => params[:report_name],
+          :reportPrettyName => params[:report_pretty_name],
+          :reportType => params[:report_type],
+          :sourceTableName => params[:source_table_name],
+          :refreshProcedureName => params[:refresh_procedure_name],
+          :refreshFrequency => params[:refresh_frequency],
+          :refreshHourOfDayGmt => params[:refresh_hour_of_day_gmt]
+      }
+    end
+  end
+end

data/app/helpers/kanaui/dashboard_helper.rb

@@ -13,13 +13,39 @@ module Kanaui
           response.body
         end
 
-        def reports(start_date, end_date, name, smooth, format, options = {})
-          path = "#{KILLBILL_ANALYTICS_PREFIX}/reports?format=json&startDate=#{start_date}&endDate=#{end_date}&name=#{name}"
+        def reports(start_date, end_date, name, smooth, sql_only, format, options = {})
+          path = "#{KILLBILL_ANALYTICS_PREFIX}/reports?format=#{format}&startDate=#{start_date}&endDate=#{end_date}&name=#{name}"
           path = "#{path}&smooth=#{smooth}" if smooth
+          path = "#{path}&sqlOnly=true" unless sql_only.blank?
           response = KillBillClient::API.get path, {}, options
           response.body
         end
 
+        def report_configuration(name, options = {})
+          path = "#{KILLBILL_ANALYTICS_PREFIX}/reports/#{name}"
+          response = KillBillClient::API.get path, {}, options
+          JSON.parse(response.body).symbolize_keys
+        end
+
+        def create_report(report, options = {})
+          path = "#{KILLBILL_ANALYTICS_PREFIX}/reports"
+          KillBillClient::API.post path, report, {}, options
+        end
+
+        def refresh_report(name, options = {})
+          path = "#{KILLBILL_ANALYTICS_PREFIX}/reports/#{name}?shouldRefresh=true"
+          KillBillClient::API.put path, {}, {}, options
+        end
+
+        def update_report(name, report, options = {})
+          path = "#{KILLBILL_ANALYTICS_PREFIX}/reports/#{name}"
+          KillBillClient::API.put path, report, {}, options
+        end
+
+        def delete_report(name, options = {})
+          path = "#{KILLBILL_ANALYTICS_PREFIX}/reports/#{name}"
+          KillBillClient::API.delete path, {}, {}, options
+        end
       end
     end
 

data/app/views/kanaui/dashboard/index.html.erb

@@ -2,15 +2,19 @@
 <!--             MENU        -->
 <div class="col-md-3 col-sm-12 col-lg-4 reports-options">
   <div class="row">
-    <% if params['report1'] %>
+    <% if params[:name] && @report['reportType'] == 'TIMELINE' %>
       <div id="date-picker" class="col-md-12">
         <h4>End date</h4>
-        <%= form_tag kanaui_engine.dashboard_index_path(params), :method => :get do %>
-            <input name="report1" type="hidden" value="<%= params['report1'] %>">
+        <%= form_tag kanaui_engine.dashboard_index_path, :method => :get do %>
+            <input name="name" type="hidden" value="<%= @raw_name %>">
+            <input name="smooth" type="hidden" value="<%= params[:smooth] %>">
+            <input name="sql_only" type="hidden" value="<%= params[:sql_only] %>">
+            <input name="format" type="hidden" value="<%= params[:format] %>">
+            <input name="delta_days" type="hidden" value="<%= (@end_date.to_date - @start_date.to_date).to_i %>">
 
             <div class="form-group">
               <div class="col-md-5">
-                <input class="form-control" name="endDate" type="text" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-today-highlight="true" value="<%= @endDate %>">
+                <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 %>">
               </div>
             </div>
             <div class="form-group">
@@ -20,19 +24,19 @@
       </div>
     <% end %>
     <div class="col-md-12 col-sm-8">
-      <h4>Available Reports</h4>
+      <h4><%= link_to 'Available Reports', kanaui_engine.url_for(:controller => :reports) %></h4>
         <ul class="nav nav-tabs nav-stacked">
           <% if Rails.env.development? %>
             <li class="nav-element">
-              <%= link_to "Fake pie", kanaui_engine.dashboard_index_path('report1' => 'fake_pie', 'fake' => 1, 'type' => 'pie') %>
+              <%= link_to "Fake pie", kanaui_engine.dashboard_index_path(:fake => 1, :name => 'fake_pie', :type => 'pie') %>
             </li>
             <li class="nav-element">
-              <%= link_to "Fake line", kanaui_engine.dashboard_index_path('report1' => 'fake_line', 'fake' => 1, 'type' => 'line') %>
+              <%= link_to "Fake line", kanaui_engine.dashboard_index_path(:fake => 1, :name => 'fake_line', :type => 'line') %>
             </li>
           <% end %>
         <% @reports.each do |r| %>
-          <% link = kanaui_engine.dashboard_index_path(:params => {'startDate' => @startDate, 'endDate' => @endDate, 'report1' => r['reportName']}) %>
-          <li class="nav-element <%= params['report1'] == r['reportName'] ? 'current' : '' %>">
+          <% link = kanaui_engine.dashboard_index_path(params.merge(:name => r['reportName'])) %>
+          <li class="nav-element <%= params[:name] == r['reportName'] ? 'current' : '' %>">
             <%= link_to r['reportPrettyName'], link, :class => "truncate-text", title: r['reportName'].titleize %>
           </li>
         <% end %>
@@ -44,22 +48,93 @@
 <!--             DASHBOARD        -->
 <div class="col-md-9 col-sm-12 col-lg-8">
   <div class="row">
-    <% if params['report1'] %>
+    <% if params[:name] %>
       <h2 class="chart-title">
-        <%= params['report1'].titleize %>
+        <%= @raw_name.titleize %>
       </h2>
       <div id="loading-spinner"></div>
-      <div id="chartAnchor" data-reports-path="<%= kanaui_engine.reports_path(params.merge!(name: params['report1'])) %>"></div>
-      <div id="date-controls">
+      <div id="chartAnchor" data-reports-path="<%= kanaui_engine.reports_path(params) %>"></div>
+      <div id="date-controls" style="display: none;">
         <ul class="nav nav-pills nav-justified">
           <% @available_start_dates.each do |key, value| %>
-            <li><%= link_to key, kanaui_engine.dashboard_index_path(params.merge!(startDate: value)) %></li>
+            <li><%= link_to key, kanaui_engine.dashboard_index_path(params.merge(:start_date => value)) %></li>
           <% end %>
         </ul>
       </div>
       <hr>
       <div class="pull-right">
-        <%= link_to 'Download raw data', kanaui_engine.reports_path(params.merge!(name: params['report1'])), class: 'btn btn-default' %>
+        <%= link_to 'Download raw data', kanaui_engine.reports_path(params.merge(:format => 'csv')), class: 'btn btn-default' %>
+      </div>
+      <a class="btn btn-default" role="button" data-toggle="collapse" href="#advanced-controls" aria-expanded="false" aria-controls="advanced-controls">
+        Advanced controls
+      </a>
+      <div class="collapse" id="advanced-controls">
+        <div class="well">
+          <ul>
+            <% if @report['reportType'] == 'TIMELINE' %>
+              <% at_least_two_months = params[:start_date].blank? || params[:end_date].blank? || (params[:end_date].to_date.beginning_of_month - 1.month > params[:start_date].to_date) %>
+              <% at_least_two_weeks = params[:start_date].blank? || params[:end_date].blank? || (params[:end_date].to_date.beginning_of_week - 1.week > params[:start_date].to_date) %>
+              <% if params[:smooth] != 'AVERAGE_WEEKLY' && at_least_two_weeks %>
+                <li><%= link_to 'Weekly average', kanaui_engine.dashboard_index_path(params.merge(:smooth => 'AVERAGE_WEEKLY')) %></li>
+              <% end %>
+              <% if params[:smooth] != 'AVERAGE_MONTHLY' && at_least_two_months %>
+                <li><%= link_to 'Monthly average', kanaui_engine.dashboard_index_path(params.merge(:smooth => 'AVERAGE_MONTHLY')) %></li>
+              <% end %>
+              <% if params[:smooth] != 'SUM_WEEKLY' && at_least_two_weeks %>
+                <li><%= link_to 'Weekly sum', kanaui_engine.dashboard_index_path(params.merge(:smooth => 'SUM_WEEKLY')) %></li>
+              <% end %>
+              <% if params[:smooth] != 'SUM_MONTHLY' && at_least_two_months %>
+                <li><%= link_to 'Monthly sum', kanaui_engine.dashboard_index_path(params.merge(:smooth => 'SUM_MONTHLY')) %></li>
+              <% end %>
+            <% end %>
+            <% filter_fields = ((@report['schema'] || {})['fields'] || []).select { |field| !field['distinctValues'].blank? && field['dataType'] =~ /char/ } # To ignore tenant_record_id %>
+            <% unless filter_fields.empty? %>
+              <li>Slicing & Dicing:
+                <%= form_tag kanaui_engine.dashboard_index_path(params), :method => :get, :class => 'form-horizontal' do %>
+                    <input name="start_date" type="hidden" value="<%= @start_date %>">
+                    <input name="end_date" type="hidden" value="<%= @end_date %>">
+                    <input name="name" type="hidden" value="<%= @raw_name %>">
+                    <input name="smooth" type="hidden" value="<%= params[:smooth] %>">
+                    <input name="sql_only" type="hidden" value="<%= params[:sql_only] %>">
+                    <input name="format" type="hidden" value="<%= params[:format] %>">
+
+                    <fieldset class="form-group">
+                      <legend>Filters</legend>
+                      <% filter_fields.each do |field| %>
+                          <div class="form-group">
+                            <%= label_tag "filter_#{field['name']}", field['name'], :class => 'col-sm-2 control-label' %>
+                            <div class="col-sm-10">
+                              <%= select_tag "filter_#{field['name']}", options_for_select(field['distinctValues']), :multiple => true, :class => 'form-control' %>
+                            </div>
+                          </div>
+                      <% end %>
+                    </fieldset>
+                    <fieldset class="form-group">
+                      <legend>Dimensions to plot</legend>
+                      <% filter_fields.each do |field| %>
+                          <div class="form-group">
+                            <%= label_tag "group_#{field['name']}", field['name'], :class => 'col-sm-2 control-label' %>
+                            <div class="col-sm-10">
+                              <%= select_tag "group_#{field['name']}", options_for_select(field['distinctValues']), :multiple => true, :class => 'form-control' %>
+                            </div>
+                          </div>
+                      <% end %>
+                    </fieldset>
+
+                    <div class="form-group">
+                      <div class="col-sm-offset-2 col-sm-10">
+                        <%= submit_tag 'Refresh', :class => 'btn btn-default' %>
+                      </div>
+                    </div>
+                <% end %>
+              </li>
+                <li>Current Analytics query:&nbsp;<%= link_to '<i class="fa fa-question-circle"></i>'.html_safe, 'http://docs.killbill.io/latest/userguide_analytics.html#_dashboard_api', :target => '_blank' %>
+                <pre><%= params[:name] -%></pre>
+              </li>
+          <% end %>
+            <li><%= link_to 'SQL query', kanaui_engine.reports_path(params.merge(:sql_only => true)) %></li>
+          </ul>
+        </div>
       </div>
     <% end %>
   </div>

data/app/views/kanaui/reports/_form.html.erb

@@ -0,0 +1,49 @@
+<%= form_tag @report[:reportName].blank? ? url_for(:controller => :reports, :action => :create) : report_path(@report[:reportName]), :method => (@report[:reportName].blank? ? :post : :put), :class => 'form-horizontal' do %>
+    <div class="form-group">
+      <%= label_tag :report_name, 'Report name', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= text_field_tag :report_name, @report[:reportName], :class => 'form-control', :disabled => !@report[:reportName].blank?, :read_only => !@report[:reportName].blank? %>
+      </div>
+    </div>
+    <div class="form-group">
+      <%= label_tag :report_pretty_name, 'Pretty name', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= text_field_tag :report_pretty_name, @report[:reportPrettyName], :class => 'form-control' %>
+      </div>
+    </div>
+    <div class="form-group">
+      <%= label_tag :report_type, 'Type', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= select_tag :report_type, options_for_select(%w(TIMELINE COUNTERS TABLE), @report[:reportType] || 'TABLE'), :class => 'form-control' %>
+      </div>
+    </div>
+    <div class="form-group">
+      <%= label_tag :source_table_name, 'Source', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= text_field_tag :source_table_name, @report[:sourceTableName], :class => 'form-control' %>
+      </div>
+    </div>
+    <div class="form-group">
+      <%= label_tag :refresh_procedure_name, 'Refresh procedure', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= text_field_tag :refresh_procedure_name, @report[:refreshProcedureName], :class => 'form-control' %>
+      </div>
+    </div>
+    <div class="form-group">
+      <%= label_tag :refresh_frequency, 'Refresh frequency', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= select_tag :refresh_frequency, options_for_select(%w(HOURLY DAILY), @report[:refreshFrequency] || 'HOURLY'), :class => 'form-control' %>
+      </div>
+    </div>
+    <div class="form-group">
+      <%= label_tag :refresh_hour_of_day_gmt, 'Refresh hour (GMT)', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= number_field_tag :refresh_hour_of_day_gmt, @report[:refreshHourOfDayGmt], {:min => 1, :max => 23, :class => 'form-control'} %>
+      </div>
+    </div>
+    <div class="form-group">
+      <div class="col-sm-offset-2 col-sm-10">
+        <%= submit_tag 'Save', :class => 'btn btn-default' %>
+      </div>
+    </div>
+<% end %>

data/app/views/kanaui/reports/_reports_table.html.erb

@@ -0,0 +1,60 @@
+<table id="reports-table" class="table table-condensed table-striped mobile-data">
+  <thead>
+  <tr>
+    <th>Name</th>
+    <th>Pretty name</th>
+    <th>Type</th>
+    <th>Source</th>
+    <th>Refresh procedure</th>
+    <th>Refresh frequency</th>
+    <th>Refresh hour (GMT)</th>
+    <th>Fields</th>
+    <th></th>
+  </tr>
+  </thead>
+  <tbody>
+  <% reports.each do |report| %>
+      <tr>
+        <td><%= report[:reportName] %></td>
+        <td><%= report[:reportPrettyName] %></td>
+        <td><%= report[:reportType] %></td>
+        <td><%= report[:sourceTableName] %></td>
+        <td><%= report[:refreshProcedureName] %></td>
+        <td><%= report[:refreshFrequency] %></td>
+        <td><%= report[:refreshHourOfDayGmt] %></td>
+        <td>
+          <ul>
+            <% report[:schema][:fields].each do |field| %>
+                <li><%= field[:name] %> (<%= field[:dataType] %>)</li>
+            <% end %>
+          </ul>
+        </td>
+        <td>
+          <%= link_to '<i class="fa fa-refresh"></i>'.html_safe, refresh_report_path(report[:reportName]), :method => :put %>
+          <%= link_to '<i class="fa fa-pencil"></i>'.html_safe, edit_report_path(report[:reportName]) %>
+          <%= link_to '&nbsp;<i class="fa fa-times"></i>'.html_safe, report_path(report[:reportName]), :method => :delete %>
+        </td>
+      </tr>
+  <% end %>
+  </tbody>
+</table>
+
+<%= javascript_tag do %>
+  $(document).ready(function() {
+    $('#reports-table').dataTable({
+      "dom": "t",
+      "paging": false,
+      "columns": [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        { "orderable": false },
+        { "orderable": false }
+      ]
+    });
+  });
+<% end %>

data/app/views/kanaui/reports/edit.html.erb

@@ -0,0 +1,10 @@
+<div class="register">
+  <div class="col-md-8 col-md-offset-2">
+
+    <div class="column-block">
+      <h1>Update report</h1>
+      <%= render 'form' %>
+    </div>
+
+  </div>
+</div>

data/app/views/kanaui/reports/index.html.erb

@@ -0,0 +1,17 @@
+<div class="search">
+
+  <div class="column-block">
+
+    <h1>Configured reports
+      <%= link_to '&nbsp;<i class="fa fa-plus-square"></i>'.html_safe, new_report_path %>
+    </h1>
+
+    <%= render :partial => 'kanaui/reports/reports_table', :locals => {:reports => @reports} %>
+
+  </div>
+
+  <hr/>
+
+  <h1><%= link_to 'Dashboard', dashboard_index_path %></h1>
+
+</div>

data/app/views/kanaui/reports/new.html.erb

@@ -0,0 +1,10 @@
+<div class="register">
+  <div class="col-md-8 col-md-offset-2">
+
+    <div class="column-block">
+      <h1>Add new report</h1>
+      <%= render 'form' %>
+    </div>
+
+  </div>
+</div>

data/config/routes.rb

@@ -1,10 +1,14 @@
 Kanaui::Engine.routes.draw do
 
   root to: 'dashboard#index'
-  resources :dashboard, :only => [ :index ]
+  resources :dashboard, :only => [:index]
   scope "/dashboard" do
     match "/available_reports" => "dashboard#available_reports", :via => :get, :as => "available_reports"
     match "/reports" => "dashboard#reports", :via => :get, :as => "reports"
   end
 
+  resources :reports, :only => [:index, :new, :create, :edit, :update, :destroy]
+  scope "/reports" do
+    match "/refresh/:id" => "reports#refresh", :via => :put, :as => "refresh_report"
+  end
 end

data/lib/kanaui/version.rb

@@ -1,3 +1,3 @@
 module Kanaui
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,323 +1,323 @@
 --- !ruby/object:Gem::Specification
 name: kanaui
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-11-13 00:00:00.000000000 Z
+date: 2017-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 4.2.1
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.1
+  name: rails
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: js-routes
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 4.2.1
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+  name: js-routes
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: '1.1'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.4
+  name: jquery-rails
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: jquery-datatables-rails
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.0.4
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.3.0
+  name: jquery-datatables-rails
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: money-rails
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 3.3.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
+  name: money-rails
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: d3_rails
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.8
+  name: d3_rails
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: twitter-bootstrap-rails
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.8
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
+  name: twitter-bootstrap-rails
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: spinjs-rails
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+  name: spinjs-rails
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: bootstrap-datepicker-rails
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.4'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
+  name: bootstrap-datepicker-rails
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: momentjs-rails
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.6
+        version: 1.4.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.10.6
+  name: momentjs-rails
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: killbill-client
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.10.6
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+  name: killbill-client
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: devise
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: '1.0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.4.1
+  name: devise
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: cancan
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.10
+        version: 3.4.1
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.10
+  name: cancan
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: carmen-rails
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.6.10
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
+  name: carmen-rails
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: symmetric-encryption
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.6.0
+  name: symmetric-encryption
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: fakeweb
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 3.6.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+  name: fakeweb
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '1.3'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
+  name: rake
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: simplecov
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.7
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: simplecov
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: activerecord-jdbc-adapter
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.9
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.9
+  name: activerecord-jdbc-adapter
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: activerecord-jdbcmysql-adapter
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.9
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.9
+  name: activerecord-jdbcmysql-adapter
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: activerecord-jdbcsqlite3-adapter
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.9
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.9
+  name: activerecord-jdbcsqlite3-adapter
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: jdbc-mysql
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.25
+        version: 1.3.9
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.1.25
+  name: jdbc-mysql
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.1.25
 description: Rails UI plugin for the Analytics plugin.
 email: killbilling-users@googlegroups.com
 executables: []
@@ -350,24 +350,24 @@ files:
 - app/assets/javascripts/kanaui/kiddo/kiddo_initialize.js
 - app/assets/javascripts/kanaui/kiddo/renderer.js
 - app/assets/javascripts/kanaui/kiddo/settings.js
-- app/assets/javascripts/kanaui/killbill.js
-- app/assets/javascripts/kanaui/purl.js
 - app/assets/javascripts/kanaui/reports.dataTables.js
-- app/assets/javascripts/kanaui/reports.graphs.js
-- app/assets/javascripts/kanaui/reports.js
-- app/assets/javascripts/kanaui/reports.urls.js
-- app/assets/javascripts/kanaui/tests.js
 - app/assets/stylesheets/application.css
 - app/assets/stylesheets/bootstrap_and_overrides.css
 - app/assets/stylesheets/kanaui/kanaui.css
 - app/assets/stylesheets/kanaui/reports.css
 - app/controllers/kanaui/dashboard_controller.rb
 - app/controllers/kanaui/engine_controller.rb
+- app/controllers/kanaui/reports_controller.rb
 - app/helpers/kanaui/application_helper.rb
 - app/helpers/kanaui/dashboard_helper.rb
 - app/models/kanaui/dashboard.rb
 - app/views/kanaui/dashboard/index.html.erb
 - app/views/kanaui/layouts/kanaui_application.html.erb
+- app/views/kanaui/reports/_form.html.erb
+- app/views/kanaui/reports/_reports_table.html.erb
+- app/views/kanaui/reports/edit.html.erb
+- app/views/kanaui/reports/index.html.erb
+- app/views/kanaui/reports/new.html.erb
 - config/locales/en.bootstrap.yml
 - config/routes.rb
 - lib/kanaui.rb
@@ -418,17 +418,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Kill Bill Analytics UI mountable engine