best_boy 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3a48186ff3fcb4712653b16ab7f071a1c33b83e
-  data.tar.gz: f350d437901b35744ba910b331493cfd5fe3361c
+  metadata.gz: '038bc7a714f4480b375ca6e33d188654b6a5cd5c'
+  data.tar.gz: 7f9fc59aab7775c415de1ecf36900e5862c8f697
 SHA512:
-  metadata.gz: bb69cd09008e0165f26e69e59c45ffeb95aa7e1b927b6f53272e42cd2cc263fb4fd50562a20b48e40ad48901b60143f4d5ed5a0b7c98d790a306b5d3fc4a3917
-  data.tar.gz: f5d8a4677c5661cebc3cbcd3052e64ce661595525a07daf30383d15b3441951975e1983e05d91a29324c8150d3e15178b59f2cf38e3b464814895792fb82b1d0
+  metadata.gz: 2af5962f5d32ab6334ce2bf7b77651015ede4e746350d29d62f48fd2c4aab15bdcdd1aaf46831d7a4a4611f379e9155ba3c48104d13c54678b739d97c0a7e056
+  data.tar.gz: e616b58f2b2b87ad0596674be65c382f32087c54d23bd91bb18d37218c6446978b02b8a4bec862b410de894f11aa22801a8d71bbd7eb0851eabb0d7ff9424fa7

data/README.md

@@ -136,6 +136,9 @@ Changelog
 ---------
 #### HEAD (not released yet)
 
+#### 3.3.0
+* Remove google_visualizr charts
+
 #### 3.2.0
 * Fix date-parsing issue
 * Add frozen_string_literal magic comments
@@ -190,7 +193,6 @@ Used gems and resources
 -----------------------
 * [Twitter Bootstrap](http://twitter.github.com/bootstrap/) in its version 3
 * [Stefan Petre](http://www.eyecon.ro/bootstrap-datepicker) for Datepicker in Twitter Bootstrap style
-* [Winston Teo Yong Wei](https://github.com/winston/google_visualr) Google_Visualr in its version 2.1.2
 
 
 Contributors in alphabetic order

data/app/controllers/best_boy/events_controller.rb

@@ -13,7 +13,7 @@ module BestBoy
     helper BestBoy::BestBoyViewHelper
     helper_method :available_owner_types, :available_events, :available_event_sources, :available_event_sources?, :available_years,
                   :current_owner_type, :current_event, :current_event_source, :current_month, :current_year, :collection,
-                  :days_of, :render_chart, :month_name_array, :detail_count
+                  :days_of, :month_name_array, :detail_count
 
     def stats
       collect_occurrences
@@ -31,11 +31,6 @@ module BestBoy
 
     def monthly_details
       collect_occurrences_for_month current_month
-      monthly_details_chart
-    end
-
-    def charts
-      build_chart
     end
 
     private
@@ -142,40 +137,10 @@ module BestBoy
       (reference.beginning_of_month..reference.end_of_month)
     end
 
-    def render_chart(chart, dom)
-      chart.to_js(dom).html_safe
-    end
-
-    def chart_for(data)
-      @chart = GoogleVisualr::Interactive::AreaChart.new(data, { width: 1100, height: 300, title: "" })
-    end
-
     def row_values_for(day)
       available_event_sources.collect{ |event_source| @selected_month_occurrences[event_source][day] } + [@selected_month_occurrences["All"][day]]
     end
 
-    def monthly_details_chart
-      data_table = GoogleVisualr::DataTable.new
-      data_table.new_column('string', 'time')
-
-      labels = available_event_sources.to_a + ["All"]
-      labels.each { |label| data_table.new_column('number', label.to_s) }
-
-      days_of(params[:month]).each { |day| data_table.add_row( [day.strftime("%d")] + row_values_for(day) ) }
-      chart_for data_table
-    end
-
-    def build_chart
-      data_table = GoogleVisualr::DataTable.new
-      data_table.new_column('string', 'time')
-      data_table.new_column('number', current_owner_type.to_s)
-
-      time_periode_range.each do |periode|
-        data_table.add_row([chart_legend_time_name(periode), custom_data_count(current_event_source, calculated_point_in_time(periode))])
-      end
-      chart_for data_table
-    end
-
     def week_name_array
       %w(Mon Tue Wed Thu Fri Sat Sun)
     end
@@ -215,17 +180,6 @@ module BestBoy
       end
     end
 
-    def chart_legend_time_name(periode)
-      case current_time_interval
-      when "year"
-        month_name_array[periode]
-      when "week"
-        week_name_array[periode]
-      else
-        (periode + 1).to_s
-      end
-    end
-
     def current_date
       @current_date ||= Date.strptime(params[:date], "%d-%m-%Y") if params[:date] rescue nil
     end

data/app/views/best_boy/events/monthly_details.html.erb

@@ -1,7 +1,3 @@
-<% content_for :javascripts do %>
-  <%= javascript_include_tag "https://www.google.com/jsapi" %>
-<% end %>
-
 <div class="row">
   <div class="col-md-12">
     <div class="well">
@@ -56,12 +52,3 @@
     </div>
   </div>
 </div>
-
-<div class="row">
-  <div class="col-md-12">
-    <div class="well">
-      <div id='chart'></div>
-      <%= render_chart @chart, 'chart' %>
-    </div>
-  </div>
-</div>

data/app/views/layouts/best_boy/best_boy.html.erb

@@ -25,7 +25,6 @@
           <ul class="nav navbar-nav">
             <li class="<%= action_name == 'stats' ? 'active' : nil %>"><%= link_to "Statistics", stats_events_path %></li>
             <li class="<%= action_name == 'lists' ? 'active' : nil %>"><%= link_to "List & Logs", lists_events_path %></li>
-            <li class="<%= action_name == 'charts' ? 'active' : nil %>"><%= link_to "Charts", charts_events_path %></li>
           </ul>
           <% if BestBoy.custom_redirect.present? %>
           <ul class="nav navbar-nav navbar-right">
@@ -40,4 +39,4 @@
       <%= yield %>
     </div>
   </body>
-</html>
+</html>

data/config/routes.rb

@@ -6,9 +6,8 @@ BestBoy::Engine.routes.draw do
     collection do
       get :stats
       get :lists
-      get :charts
       get :details
       get :monthly_details
     end
   end
-end
+end

data/lib/best_boy.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require 'haml'
-require "google_visualr"
 require 'kaminari'
 require "best_boy/engine"
 require "best_boy/eventable"

data/lib/best_boy/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module BestBoy
-  VERSION = '3.2.0'
+  VERSION = '3.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: best_boy
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Christoph Seydel, Carsten Zimmermann, Robin Neumann, Daniel Schoppmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,20 +44,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.1
-- !ruby/object:Gem::Dependency
-  name: google_visualr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0.beta1
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0.beta1
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -160,7 +146,6 @@ files:
 - app/models/best_boy/event.rb
 - app/models/best_boy/month_report.rb
 - app/views/best_boy/events/_navigation.html.erb
-- app/views/best_boy/events/charts.html.erb
 - app/views/best_boy/events/details.html.erb
 - app/views/best_boy/events/details.xml.haml
 - app/views/best_boy/events/index.html.erb

data/app/views/best_boy/events/charts.html.erb

@@ -1,33 +0,0 @@
-<% content_for :javascripts do %>
-  <%= javascript_include_tag "https://www.google.com/jsapi" %>
-<% end %>
-
-<div class="row">
-  <div class="col-md-12">
-    <%= form_tag charts_events_path, method: :get, id: "chart-form" do %>
-      <div class="form-group">
-        <div class="col-md-3">
-          <%= select_tag :owner_type, options_for_select([["Owner", nil]] + available_owner_types, selected: params[:owner_type]), onchange: "submit();", class: "form-control" %>
-        </div>
-        <div class="col-md-3">
-          <%= select_tag :event, options_for_select([["Event", nil]] + available_events, selected: params[:event]), onchange: "submit();", class: "form-control" %>
-        </div>
-        <div class="col-md-3">
-          <%= select_tag :event_source, options_for_select([["Event Source", nil]] + available_event_sources, selected: params[:event_source]), onchange: "submit();", class: "form-control" %>
-        </div>
-        <div class="col-md-3">
-          <%= select_tag :time_interval, options_for_select([["Time Interval", nil], ["yearly", "year"], ["monthly", "month"], ["weekly", "week"]], selected: params[:time_interval]), onchange: "submit();", class: "form-control" %>
-        </div>
-      </div>
-    <% end %>
-  </div>
-</div>
-
-<div class="row">
-  <div class="col-md-12">
-    <div class="well">
-      <div id='chart'></div>
-      <%= render_chart(@chart, 'chart') %>
-    </div>
-  </div>
-</div>