Refactor chart module

boveus · Aug 31, 2017 · 810a2fe · 810a2fe
1 parent f40306b
commit 810a2fe
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/app/controllers/data_handler.rb → app/controllers/chart_handler.rb b/app/controllers/data_handler.rb → app/controllers/chart_handler.rb
@@ -1,15 +1,18 @@
-module DataHandler
-
+module ChartHandler
   def shape_chart
     shape_label, shape_data = AlienSighting.count_by_shape
+    setup_chart(shape_label, shape_data, 'Reported Shapes')
+  end
+
+  def setup_chart(data_label, chart_data, chart_label)
     {
-    labels: shape_label,
+    labels: data_label,
     datasets: [
       {
-          label: "Reported shapes",
+          label: chart_label,
           backgroundColor: "rgba(220,220,220,0.2)",
           borderColor: "rgba(220,220,220,1)",
-          data: shape_data
+          data: chart_data
       },
     ]
   }

diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb
@@ -1,5 +1,5 @@
 class MainController < ApplicationController
-include DataHandler
+include ChartHandler
   def index
   end
 

diff --git a/app/views/main/dashboard.html.erb b/app/views/main/dashboard.html.erb
@@ -1,6 +1,6 @@
 <h3> ITS A DASHBOARD </h3>
-<% options = {:width => 100, :height => 100} %>
-<%= pie_chart @shape_chart, options %>
+
+<%= pie_chart @shape_chart, {:width => 100, :height => 100} %>
 
 <ol>
   Sightings by Country
@@ -23,8 +23,6 @@
   <% end %>
 </ol>
 
-<%= line_chart @shape_data %>
-
 <ol>
   Sightings by year
   <% @sightings_by_year.each do |date, count| %>