how_are_we_doing 0.0.7 → 0.0.8

data/app/helpers/reports_helper.rb

@@ -8,66 +8,67 @@ module ReportsHelper
   end
   
   def how_are_we_doing_chart(form_id,graph_container_id,graph_type,options={})
-    content_for :javascripts do
-      <<-END.gsub(/^ {6}/, '')
-        <script>
-          $("##{form_id} #analyticals").live('click',function(){
-            $(this).attr('size',10);
-          });
-        
-          $('##{form_id} #analyticals').live('change',function(){
-            $(this).parents('form').find('#analytical_ids').val($(this).val());
-            $(this).parents('form').trigger('submit');
-          });
-        
-        
-          $('##{form_id} input:checkbox').live('change',function(){
-            $(this).parents('form').find('#'+$(this).attr('id').replace('include_','exclude_')).val($(this).attr("checked") ? "" : true);
-            $(this).parents('form').trigger('submit');
-          });
-        
-          $('##{form_id}').live('submit',function(){
-            var data = {};
-            var allowable_params = {
-              exclude_totals:1,
-              exclude_prints:1,
-              exclude_shares:1,
-              exclude_views:1,
-              start_date:1,
-              end_date:1,
-              start_date:1,
-              parent_type: 1,
-              parent_id: 1,
-              analytical_ids: 1,
-              analytical_type:1
-            };
-
-            $(this).find('input,select').each(function(i,element){
-              if(element.name && allowable_params[element.name] && $(element).val()) {
-                data[element.name] = $(element).val();
-              }
-            });
+    script = <<-END.gsub(/^ {6}/, '')
+      <script>
+        $("##{form_id} #analyticals").live('click',function(){
+          $(this).attr('size',10);
+        });
+      
+        $('##{form_id} #analyticals').live('change',function(){
+          $(this).parents('form').find('#analytical_ids').val($(this).val());
+          $(this).parents('form').trigger('submit');
+        });
+      
+      
+        $('##{form_id} input:checkbox').live('change',function(){
+          $(this).parents('form').find('#'+$(this).attr('id').replace('include_','exclude_')).val($(this).attr("checked") ? "" : true);
+          $(this).parents('form').trigger('submit');
+        });
+      
+        $('##{form_id}').live('submit',function(){
+          var data = {};
+          var allowable_params = {
+            exclude_totals:1,
+            exclude_prints:1,
+            exclude_shares:1,
+            exclude_views:1,
+            start_date:1,
+            end_date:1,
+            start_date:1,
+            parent_type: 1,
+            parent_id: 1,
+            analytical_ids: 1,
+            analytical_type:1
+          };
 
-          
-            $.ajax({
-              url: $(this).attr('action')+".json",
-              method: 'get',
-              data: $.param(data),
-              dataType: 'json',
-              success: function(data) {
-                #{graph_type}_graph_it(data,'#{graph_container_id}');
-              }
-            });
-            return false;
+          $(this).find('input,select').each(function(i,element){
+            if(element.name && allowable_params[element.name] && $(element).val()) {
+              data[element.name] = $(element).val();
+            }
           });
+
         
-          $(function(){
-            $('##{form_id}').trigger('submit');
-            $(".date-selector").datepicker();
+          $.ajax({
+            url: $(this).attr('action')+".json",
+            method: 'get',
+            data: $.param(data),
+            dataType: 'json',
+            success: function(data) {
+              #{graph_type}_graph_it(data,'#{graph_container_id}');
+            }
           });
-        </script>
-      END
+          return false;
+        });
+      
+        $(function(){
+          $('##{form_id}').trigger('submit');
+          $(".date-selector").datepicker();
+        });
+      </script>
+    END
+    content_for :javascripts do
+      script.html_safe
     end
-    render "reports/#{graph_type}_graph", :locals => {:form_id => form_id, :graph_container_id => graph_container_id, analytical_ids => options[:analytical_ids], :include_comparision => options[:include_comparision]}
+    render :partial => "reports/#{graph_type}_graph", :locals => {:form_id => form_id, :graph_container_id => graph_container_id, :analytical_ids => options[:analytical_ids], :include_comparison => options[:include_comparison]}
   end
 end

data/app/views/reports/_bar_graph.html.erb

@@ -14,14 +14,14 @@
     <%= hidden_field_tag 'exclude_shares' %>
     <%= hidden_field_tag 'analytical_type', (params[:analytical_type]||params[:default_analytical_type]) %>
     <% if defined?(analytical_ids) %>
-      <%= hidden_field_tag 'analytical_ids', (analytical_ids||[]) %>
+      <%= hidden_field_tag 'analytical_ids', (analytical_ids||[]).join(",") %>
     <% end %>
   
     <%= submit_tag(t(:submit)) %>
     <%= image_submit_tag("hawd/blank.png") %>
   </div>
   
-  <% if defined?(include_comparision) and include_comparision %>
+  <% if defined?(include_comparison) and include_comparison %>
     <fieldset class="graph-compare">
       <%= label_tag 'analyticals', t('hawd.comparision', :analytical => (params[:analytical_type]||params[:default_analytical_type]||"")) %>
       <%= select_tag "analyticals", options_from_collection_for_select(@analyticals, "id", "to_s", {:selected => lambda { |analytical| @analytical_ids.include?(analytical.id) }}), :multiple => true, :size => 1 %>

data/lib/generators/how_are_we_doing/install/templates/public/javascripts/how_are_we_doing.js

@@ -42,7 +42,6 @@ function line_graph_it(data,graph_container_id) {
       hoverable: true
     }
   };
-
   $.plot($('#'+graph_container_id),
     formatted_data,
     $.extend(true, default_format_options, data.format_options)

data/lib/how_are_we_doing/version.rb

@@ -1,3 +1,3 @@
 module HowAreWeDoing
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -2,7 +2,7 @@
 name: how_are_we_doing
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Gunner Technology, Cody Swann