mountain-goat 1.0.2 → 1.0.3

data/.gitignore

@@ -1,2 +1,3 @@
 .svn
 .DS_Store
+.tmp

data/.gitignore~

@@ -0,0 +1,2 @@
+.svn
+.DS_Store

data/README.md

@@ -40,13 +40,13 @@ For more information, read my blog post on how mountain goat quickly accomplishe
 
 ## Upgrade from < 1.0.0
 
-If you are upgrading from Mountain Goat < 1.0.2, please run the following command (please overwrite mountain-goat.yml when prompted):
+If you are upgrading from Mountain Goat < 1.0.3, please run the following command (please overwrite mountain-goat.yml when prompted):
 
-     ./script/generate mg --update=1.0.0,1.0.2
+     ./script/generate mg --update=1.0.0,1.0.3
 
      rake db:migrate
      
-This will install new migrations necessary for version 1.0.2.  Leave out the 1.0.0 from the command if you are upgrading from version 1.0.0.
+This will install new migrations necessary for version 1.0.3.  Leave out the 1.0.0 from the command if you are upgrading from version 1.0.0.
  
 ## Install
 
@@ -267,6 +267,7 @@ As mountain goat is a suite that is added into your project dynamically, the fol
   * mg_reports
   
 ## Change log
+  1.0.3 - Some overall bug-fixes and start to use Raphael Graphs
   1.0.2 - Big UI overhaul ~ Robert
         - Renamed objects to reflect real-world thinking (e.g. metric => test)
         - Fixed glitch in bandit choice selection

data/generators/mg/mg_generator.rb

@@ -2,7 +2,7 @@ class MgGenerator < Rails::Generator::Base
   def add_options!(opt)
     opt.on('-p', '--password=password', String, "Your password to access Mountain Goat") { |v| options[:password] = v}
     opt.on('-w', '--wkhtmltopdf=/path/to/dir', String, "Path to installation of wkhtmltopdf (optional)") { |v| options[:wkhtmltopdf] = v}
-    opt.on('-u', '--update=1.0.0,1.0.2', String, "If you have previously installed Mountain Goat, use to generate *update* tables.") { |v| options[:update] = v}
+    opt.on('-u', '--update=1.0.0,1.0.3', String, "If you have previously installed Mountain Goat, use to generate *update* tables.") { |v| options[:update] = v}
     puts <<-HELPFUL_INSTRUCTIONS
 
       Mountain Goat is your home for in-house bandit testing.
@@ -42,7 +42,7 @@ class MgGenerator < Rails::Generator::Base
         m.migration_template 'update_mountain_goat_tables.rb', 'db/migrate', { :migration_file_name => "update_mountain_goat_tables" }
       end
       
-      if update.include?("1.0.2") || update.include?("1.0.1")
+      if update.include?("1.0.3") || update.include?("1.0.2") || update.include?("1.0.1")
         m.migration_template 'update_mountain_goat_tables_v2.rb', 'db/migrate', { :migration_file_name => "update_mountain_goat_tables_v2" }
       end
       

data/lib/mountain-goat/controllers/mg/goals_controller.rb

@@ -28,22 +28,19 @@ class Mg::GoalsController < Mg
     end
     
     @results_by_gmt = {}
-    @results_by_gmt_titles = {}
     
     @goal.mg_goal_meta_types.each do |gmt|
       @results_by_gmt[gmt.id] = []
-      @results_by_gmt_titles[gmt.id] = {}
-      i = 0
+      
       gmt.meta.all(:select => "data, count(*) as count", :group => "data").each do |meta|
         next if meta.data.nil?
         if gmt.meta_type == 'cs_meta' || gmt.meta_type == 'gs_meta' 
-          @results_by_gmt[gmt.id].push( { :name => i, :val => meta.count } )
-          @results_by_gmt_titles[gmt.id].merge!({ i => meta.data })
+          @results_by_gmt[gmt.id].push( { :name => meta.data, :val => meta.count, :title => meta.data } )
+          #@results_by_gmt_titles[gmt.id].merge!({ i => meta.data })
         else
-          @results_by_gmt[gmt.id].push( { :name => meta.data, :val => meta.count } )
+          @results_by_gmt[gmt.id].push( { :name => meta.data, :val => meta.count, :title => meta.data } )
         end
         
-        i += 1
       end
     end
     

data/lib/mountain-goat/controllers/mg/report_items_controller.rb

@@ -22,7 +22,7 @@ class Mg::ReportItemsController < Mg
     raise ArgumentError, "Invalid report" if @report.nil?
     
     @report_item = @report.mg_report_items.new(params[:report_item].clone.delete_if { |k, v| k.intern == :reportable || k.intern == :pivot } )
-    @report_item.order = @report.mg_report_items.to_a.map { |ri| ri.order }.push(0).max + 1#@report.report_items.maximum(:order) + 1 -- weird sqlite3 bugs
+    @report_item.order = @report.mg_report_items.maximum(:order) + 1 # @report.mg_report_items.to_a.map { |ri| ri.order }.push(0).max + 1# -- weird sqlite3 bugs
     
     if !params[:report_item][:reportable].blank?
       id, model = params[:report_item][:reportable].split('-')
@@ -78,5 +78,38 @@ class Mg::ReportItemsController < Mg
     end
   end
   
-  #TODO: Destroy
+  def up
+    @report_item = Mg::ReportItem.find(params[:id])
+    
+    old_order = @report_item.order
+    @report_item2 = Mg::ReportItem.last( :conditions => ["mg_report_items.order < ?", old_order], :order => "mg_report_items.order")
+    
+    ( render :json => { :success => true } and return ) if @report_item2.nil?
+    
+    @report_item.update_attribute(:order, @report_item2.order)
+    @report_item2.update_attribute(:order, old_order)
+    
+    render :json => { :success => true, :result => render_to_string( :partial => "mg/reports/report_report_items", :locals => { :report => @report_item.mg_report } ) }
+  end
+  
+  def down
+    @report_item = Mg::ReportItem.find(params[:id])
+    
+    old_order = @report_item.order
+    @report_item2 = Mg::ReportItem.first( :conditions => ["mg_report_items.order > ?", old_order], :order => "mg_report_items.order")
+    
+    ( render :json => { :success => true } and return ) if @report_item2.nil?
+    
+    @report_item.update_attribute(:order, @report_item2.order)
+    @report_item2.update_attribute(:order, old_order)
+    
+    render :json => { :success => true, :result => render_to_string( :partial => "mg/reports/report_report_items", :locals => { :report => @report_item.mg_report } ) }
+  end
+  
+  def destroy
+    @report_item = Mg::ReportItem.find(params[:id])
+    @report_item.destroy
+    
+    render :json => { :success => true, :result => render_to_string( :partial => "mg/reports/report_report_items", :locals => { :report => @report_item.mg_report } ) }
+  end
 end

data/lib/mountain-goat/mg_core.rb

@@ -19,7 +19,7 @@ module MgCore
       mg.resources :tests, :has_many => :choices, :member => { :hide => :get, :unhide => :get }
       mg.resources :records, :collection => { :new_records => :get }
       mg.resources :reports, :has_many => :report_items, :member => { :show_svg => :get, :hide => :get, :unhide => :get }
-      mg.resources :report_items, :member => { :destroy => :get, :update => :post }, :collection => { :get_extra => :get }
+      mg.resources :report_items, :member => { :destroy => :get, :update => :post, :up => :get, :down => :get }, :collection => { :get_extra => :get }
       mg.resources :playground, :collection => { :test => :get }
       mg.new_records '/records/new', :controller => :records, :action => :new_records 
       mg.fresh_choices '/fresh-choices', :controller => :tests, :action => :fresh_choices

data/lib/mountain-goat/models/mg/goal.rb

@@ -27,7 +27,7 @@ class Mg::Goal < ActiveRecord::Base
   
   # Helper function to retrieve a goal by symbol
   def self.by_type(s)
-    Mg::Goal.find( :first, :conditions => { :mg_goal_type => s.to_s } )
+    Mg::Goal.find( :first, :conditions => { :goal_type => s.to_s } )
   end
   
   # Get all records for given meta (e.g. for "Referer": { "Youtube" => Record1, } ...)

data/lib/mountain-goat/models/mg/report.rb

@@ -1,7 +1,7 @@
 class Mg::Report < ActiveRecord::Base
   set_table_name :mg_reports
   
-  has_many :mg_report_items, :class_name => "Mg::ReportItem", :foreign_key => "mg_report_id"
+  has_many :mg_report_items, :class_name => "Mg::ReportItem", :foreign_key => "mg_report_id", :order => "mg_report_items.order"
   has_many :reportables, :through => :mg_report_items
   
   validates_presence_of :title

data/lib/mountain-goat/public/g-funnel.js

@@ -58,7 +58,7 @@ Raphael.fn.g.funnelchart = function (cx, cy, cw, ch, values, opts) {
 		var path = trap(sx0, sy0, w0, w1, sh);
 		var p = this.path(path).attr({fill: opts.colors && opts.colors[i] || this.g.colors[i] || "#666", stroke: opts.stroke || "#fff", "stroke-width": (opts.strokewidth == null ? 1 : opts.strokewidth), "stroke-linejoin": "round"});
 		if (values[i].labeltext)
-			p.insetLabel = this.text(sx0 + w0 / 2.0, sy0 + sh / 3.0, values[i].labeltext + ( i > 0 ? ( " " + ( values[i] - values[i - 1] / values[i - 1] ) + "%" ) : "")).attr({font: "20px Helvetica", stroke: "#fff", fill: "#eee", "fill-opacity": 0.95, "stroke-opacity": 0 });
+			p.insetLabel = this.text(sx0 + w0 / 2.0, sy0 + sh / 3.0, values[i].labeltext + ( i > 0 ? ( " " + ( ( values[i] - values[i - 1] ) / values[i - 1] ) + "%" ) : "")).attr({font: "20px Helvetica", stroke: "#fff", fill: "#eee", "fill-opacity": 0.95, "stroke-opacity": 0 });
 			
     	p.value = values[i];
     	sectors.push(p);

data/lib/mountain-goat/switch_choice.rb

@@ -15,9 +15,9 @@ class SwitchChoice
         # each option and make sure we have a back-end entry in choices
         # for the type
         @logger.warn "Looking at option #{sym.to_s}"
-        if @test.choices.find( :first, :conditions => { :switch_type => sym.to_s } ).nil?
+        if @test.mg_choices.find( :first, :conditions => { :switch_type => sym.to_s } ).nil?
           @logger.warn "Creating switch-type choice #{sym.to_s}"
-          @test.choices.create!( :name => sym.to_s, :switch_type => sym.to_s, :value => nil )
+          @test.mg_choices.create!( :name => sym.to_s, :switch_type => sym.to_s, :value => nil )
         end
       else
         if @chosen_choice.switch_type.to_s == sym.to_s

data/lib/mountain-goat/version.rb

@@ -1,3 +1,3 @@
 class MountainGoat
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/mountain-goat/views/mountain_goat/mg/goals/.tmp_show.html.erb.86489~

@@ -0,0 +1,32 @@
+<div id="container-main" class="mg-goals show">
+	<h1><%=h @goal.name.capitalize %></h1>
+	<div class="container-content">
+		<div class="statboard">
+			<div class="flyer-analysis statpad">
+				<div class="title">Records by Day</div>
+				<div class="statbody">
+					<%= mg_chart("analysis_graph#{@goal.id}",
+								{ "Conversions" => { :collection => @results_per_day, :x => :date, :y => :val } },
+								  { :xaxis => {:mode => 'time', :timeformat => "%b %d" }, :yaxis => { :min => 0, :minTickSize => 1 }, :lines => { :show => true }, :legend => { :position => "ne" }, :grid => { :hoverable => true, :clickable => true }, :inline => false }, :placeholder_size => "420x260", :pie_hover => true, :line_hover_absolute => true, :item_title => "records(s)") %>
+				</div>
+			</div>
+			
+			<% @goal.mg_goal_meta_types.each do |gmt| %>
+				<div class="flyer-analysis statpad">
+					<div class="title">Records by <%=h gmt.name %></div>
+					<div class="statbody">					
+						<% if gmt.meta_type == 'ci_meta' || gmt.meta_type == 'gi_meta' %>
+							<%= mg_chart("analysis_graph#{gmt.id}",
+									{ "Records" => { :collection => @results_by_gmt[gmt.id], :x => :name, :y => :val } },
+									  { :xaxis => {:autoscaleMargin => 1, :minTickSize => 1 }, :yaxis => { :min => 0, :minTickSize => 1 }, :bars => { :show => true, :align => 'center', :barWidth => 1 }, :legend => { :position => "ne" }, :grid => { :hoverable => true, :clickable => true }, :inline => false }, :placeholder_size => "420x260", :pie_hover => true, :line_hover_absolute => true, :item_title => "records(s)") %>
+						<% elsif gmt.meta_type == 'cs_meta' || gmt.meta_type == 'gs_meta' %>
+							<%= mg_chart("analysis_graph#{gmt.id}",
+									{ "Conversions" => { :collection => @results_by_gmt[gmt.id], :x => :name, :y => :val } },
+									  { :xaxis => {:autoscaleMargin => 0.1, :ticks => @results_by_gmt_titles[gmt.id].map { |i,t| [i + 0.5, t] }.sort }, :yaxis => { :min => 0, :minTickSize => 1 }, :bars => { :show => true }, :legend => { :position => "ne" }, :grid => { :hoverable => true, :clickable => true }, :inline => false }, :placeholder_size => "420x260", :pie_hover => true, :line_hover_absolute => true, :item_title => "records(s)") %>
+						<% end %>
+					</div>
+				</div>
+			<% end %>
+		</div>
+	</div>
+</div>

data/lib/mountain-goat/views/mountain_goat/mg/goals/show.html.erb

@@ -5,9 +5,16 @@
 			<div class="flyer-analysis statpad">
 				<div class="title">Records by Day</div>
 				<div class="statbody">
-					<%= mg_chart("analysis_graph#{@goal.id}",
-								{ "Conversions" => { :collection => @results_per_day, :x => :date, :y => :val } },
-								  { :xaxis => {:mode => 'time', :timeformat => "%b %d" }, :yaxis => { :min => 0, :minTickSize => 1 }, :lines => { :show => true }, :legend => { :position => "ne" }, :grid => { :hoverable => true, :clickable => true }, :inline => false }, :placeholder_size => "420x260", :pie_hover => true, :line_hover_absolute => true, :item_title => "records(s)") %>
+					<% if @results_per_day.count > 2 %>
+						<div id="chart_item<%=h @goal.id %>" data-raphael="line" data-x-axis="date"
+							data-title0="Records"
+							data-x0="<%= @results_per_day.map { |i| i[:date] }.join(',') %>"
+							data-y0="<%= @results_per_day.map { |i| i[:val] }.join(',') %>"
+							style="width: 425px; height: 260px;" />
+						</div>
+					<% else %>
+						Results will populate shortly
+					<% end %>
 				</div>
 			</div>
 			
@@ -15,15 +22,16 @@
 				<div class="flyer-analysis statpad">
 					<div class="title">Records by <%=h gmt.name %></div>
 					<div class="statbody">					
-						<% if gmt.meta_type == 'ci_meta' || gmt.meta_type == 'gi_meta' %>
-							<%= mg_chart("analysis_graph#{gmt.id}",
-									{ "Records" => { :collection => @results_by_gmt[gmt.id], :x => :name, :y => :val } },
-									  { :xaxis => {:autoscaleMargin => 1, :minTickSize => 1 }, :yaxis => { :min => 0, :minTickSize => 1 }, :bars => { :show => true, :align => 'center', :barWidth => 1 }, :legend => { :position => "ne" }, :grid => { :hoverable => true, :clickable => true }, :inline => false }, :placeholder_size => "420x260", :pie_hover => true, :line_hover_absolute => true, :item_title => "records(s)") %>
-						<% elsif gmt.meta_type == 'cs_meta' || gmt.meta_type == 'gs_meta' %>
-							<%= mg_chart("analysis_graph#{gmt.id}",
-									{ "Conversions" => { :collection => @results_by_gmt[gmt.id], :x => :name, :y => :val } },
-									  { :xaxis => {:autoscaleMargin => 0.1, :ticks => @results_by_gmt_titles[gmt.id].map { |i,t| [i + 0.5, t] }.sort }, :yaxis => { :min => 0, :minTickSize => 1 }, :bars => { :show => true }, :legend => { :position => "ne" }, :grid => { :hoverable => true, :clickable => true }, :inline => false }, :placeholder_size => "420x260", :pie_hover => true, :line_hover_absolute => true, :item_title => "records(s)") %>
-						<% end %>
+						<div id="chart_item_gmt_<%=h gmt.id %>" data-raphael="pie" data-x-axis="date"
+							<% if gmt.meta_type == 'ci_meta' || gmt.meta_type == 'gi_meta' %>
+								data-title="<%= @results_by_gmt[gmt.id].map { |i| "'#{( i[:title] || "(Blank)" )}'" }.join(',') %>"
+								data-x="<%= @results_by_gmt[gmt.id].map { |i| i[:name] }.join(',') %>"
+							<% else %>
+								data-x="<%= @results_by_gmt[gmt.id].map { |i| "'#{i[:name]}'" }.join(',') %>"
+							<% end %>
+							data-y="<%= @results_by_gmt[gmt.id].map { |i| i[:val] }.join(',') %>"
+							style="width: 425px; height: 260px;" />
+						</div>
 					</div>
 				</div>
 			<% end %>

data/lib/mountain-goat/views/mountain_goat/mg/report_items/.tmp__show.html.erb.52502~

@@ -0,0 +1,29 @@
+<%# locals => report_item %>
+
+<div class="report-item">
+	<span class="report-info">
+		<span class="report">
+			<% if report_item.reportable.nil? || !report_item.reportable.respond_to?(:name) %>
+				&lt;Undefined&gt;
+			<% else %>
+				<%= report_item.reportable.name %>
+			<% end %>
+		</span>
+		<span class="pivot">
+			<% if report_item.pivot.nil? || !report_item.pivot.respond_to?(:name) %>
+				[None]
+			<% else %>
+				<%= report_item.pivot.name %>
+			<% end %>
+		</span>
+	</span>
+	<span class="report-item-actions">
+		<span class="edit">
+			<a href="javascript:void(0)" class="remote-link smallbutton" data-path="<%= edit_mg_report_item_url(:id => report_item.id) %>" data-res=".report-items-model .model">Edit</a>
+		</span>
+		
+		<span class="remove">
+			<a href="javascript:void(0)" class="remote-link smallbutton" data-path="<%= destroy_mg_report_item_url(:id => report_item.id) %>" data-res=".report-items-model .model">Remove</a>
+		</span>
+	</span>
+</div>

data/lib/mountain-goat/views/mountain_goat/mg/report_items/_show.html.erb

@@ -1,4 +1,4 @@
-<%# locals => report_item %>
+<%# locals => report_item, show_up, show_down %>
 
 <div class="report-item">
 	<span class="report-info">
@@ -23,7 +23,18 @@
 		</span>
 		
 		<span class="remove">
-			<a href="javascript:void(0)" class="remote-link smallbutton" data-path="<%= destroy_mg_report_item_url(:id => report_item.id) %>" data-res=".report-items-model .model">Remove</a>
+			<a href="javascript:void(0)" class="remote-link smallbutton" data-path="<%= destroy_mg_report_item_url(:id => report_item.id) %>" data-res=".report-report-items">Remove</a>
+		</span>
+		
+		<span class="up-down">
+			<% if show_up %>
+				<a href="javascript:void(0)" class="remote-link smallbutton" data-path="<%= up_mg_report_item_url(:id => report_item.id) %>" data-res=".report-report-items">Up</a>
+			<% end %>
+			
+			<% if show_down %>
+				<% if show_up %>/<% end %>
+				<a href="javascript:void(0)" class="remote-link smallbutton" data-path="<%= down_mg_report_item_url(:id => report_item.id) %>" data-res=".report-report-items">Down</a>
+			<% end %>
 		</span>
 	</span>
 </div>

data/lib/mountain-goat/views/mountain_goat/mg/reports/.tmp__report_form.html.erb.42949~

@@ -0,0 +1,26 @@
+<%# locals => f %>
+
+<div class="item title">
+	<%= f.label :title %>
+	<%= f.text_field :title %>
+</div>
+
+<div class="item description">
+	<%= f.label :description %>
+	<%= f.text_field :description %>
+</div>
+
+<div class="item report_type">
+	<%= f.label :report_type, 'Report Type' %>
+	<%= f.select :report_type, options_for_select( [ [ 'Graph', 'graph' ], [ 'Funnel', 'funnel' ] ] ) %>
+</div>
+
+<div class="item delivert_set">
+	<%= f.label :delivery_set, 'Frequency' %>
+	<%= f.select :delivery_set, options_for_select( [ [ 'Daily', 'daily' ], [ 'Weekly', 'weekly' ], [ 'Monthly', 'monthly' ], ['Never', 'never'] ] ) %>
+</div>
+
+<div class="item recipients">
+	<%= f.label :recipients, 'Recipients' %>
+	<%= f.text_area :recipients %>
+</div>

data/lib/mountain-goat/views/mountain_goat/mg/reports/{.tmp__report_report_items.html.erb.26030~ → .tmp__report_report_items.html.erb.96264~}

@@ -1,5 +1,5 @@
 <%# locals => report %>
 
-<% report.report_items.each do |report_item| %>
+<% report.mg_report_items.each do |report_item| %>
 	<%= render :partial => 'mg/report_items/show', :locals => { :report_item => report_item } %>
 <% end %>

data/lib/mountain-goat/views/mountain_goat/mg/reports/.tmp_edit.html.erb.39909~

@@ -0,0 +1,33 @@
+<div id="container-main" class="mg-report-edit">
+	<h1>Edit <%= @report.title %></h1>
+	<div class="container-content">
+		<div class="edit-form">
+		
+			<% form_for :report, @report, :url => mg_report_url(:id => @report.id), :html => { :method => :put } do |f| %>
+		 		<%= f.error_messages %>
+
+				<%= render :partial => 'mg/reports/report_form', :locals => { :f => f } %>
+
+				<div class="report-report-items">
+					<h4>Report Items</h4>
+					
+					<%= render :partial => "mg/reports/report_report_items", :locals => { :report => @report } %>
+				</div>
+				
+				<div class="action-bar">
+					<a href="javascript:void(0)" class="button remote-link" data-path="<%= new_mg_report_report_item_url(:report_id => @report.id) %>" data-res=".report-items-model .model">Add Item</a>
+
+					<%= f.submit 'Submit' %>
+				</div>
+	
+				<div class="report-items-model flash-model model">
+					<div class="jqmWindow">
+						<a href="#" class="jqmClose">Close</a>
+						<div class="model" data-model=".jqmWindow"></div>
+					</div>
+				</div>
+			<% end %>
+		</div>
+	</div>
+</div>
+

data/lib/mountain-goat/views/mountain_goat/mg/reports/.tmp_show.html.erb.37905~

@@ -0,0 +1,18 @@
+<div id="container-main" class="mg-report-show">
+	<h1><%=h @report.title %></h1>
+	<div class="container-content">
+		<h3><%=h @report.description %></h3>
+		
+		<% if @report.report_type == 'graph' %>
+			<% @report.mg_report_items.each do |report_item| %>
+				<%= render 'mg/report_items/chart', :report_item => report_item %>
+			<% end %>
+		<% elsif @report.report_type == 'funnel' %>
+			<%= render 'mg/report_items/funnel', :report => @report %>
+		<% end %>
+		
+		<div class="actions">
+			<a class="button" href="<%= edit_mg_report_url @report %>">Edit</a>
+		</div>
+	</div>
+</div>

data/lib/mountain-goat/views/mountain_goat/mg/reports/_report_form.html.erb

@@ -12,12 +12,12 @@
 
 <div class="item report_type">
 	<%= f.label :report_type, 'Report Type' %>
-	<%= f.select :report_type, options_for_select( [ [ 'Graph', 'graph' ], [ 'Funnel', 'funnel' ] ] ) %>
+	<%= f.select :report_type, options_for_select( [ [ 'Graph', 'graph' ], [ 'Funnel', 'funnel' ] ], f.object.report_type ) %>
 </div>
 
 <div class="item delivert_set">
 	<%= f.label :delivery_set, 'Frequency' %>
-	<%= f.select :delivery_set, options_for_select( [ [ 'Daily', 'daily' ], [ 'Weekly', 'weekly' ], [ 'Monthly', 'monthly' ], ['Never', 'never'] ] ) %>
+	<%= f.select :delivery_set, options_for_select( [ [ 'Daily', 'daily' ], [ 'Weekly', 'weekly' ], [ 'Monthly', 'monthly' ], ['Never', 'never'] ], f.object.delivery_set ) %>
 </div>
 
 <div class="item recipients">

data/lib/mountain-goat/views/mountain_goat/mg/reports/_report_report_items.html.erb

@@ -1,5 +1,7 @@
 <%# locals => report %>
 
+<% i = 0 %>
 <% report.mg_report_items.each do |report_item| %>
-	<%= render :partial => 'mg/report_items/show', :locals => { :report_item => report_item } %>
+	<%= render :partial => 'mg/report_items/show', :locals => { :report_item => report_item, :show_up => i > 0, :show_down => i < report.mg_report_items.count - 1 } %>
+	<% i += 1 %>
 <% end %>

data/lib/mountain-goat/views/mountain_goat/mg/tests/.tmp_show.html.erb.19989~

@@ -0,0 +1,63 @@
+<div id="container-main" class="mg-tests">
+	<h1><%=h @test.title.capitalize %> Test</h1>
+	<div class="container-content">
+
+		<div class="choices">
+			<% if @test.mg_choices.count == 0 %>
+				<span class="none">No choices</span>
+			<% else %>
+				<div class="statboard">
+					<div class="flyer-analysis statpad">
+						<div class="title">Records</div>
+						<div class="statbody">
+							<%= mg_chart("analysis_graph#{@test.id}",
+												{ "Served" => { :collection => @rates[:served], :x => :choice_type, :y => :value },
+													"Reward Count" => { :collection => @rates[:reward_count], :x => :choice_type, :y => :value } },
+													{ :xaxis => { :ticks => @rates[:titles].map { |i,t| [i + 0.5, t] }.sort }, :yaxis => { :min => 0, :minTickSize => 1 }, :bars => { :show => true }, :legend => { :show => false, :position => "ne" }, :grid => { :hoverable => true, :clickable => true }, :inline => false }, :placeholder_size => "420x260", :pie_hover => true, :line_hover_absolute => true, :item_title => "record(s)") %>
+						
+						</div>
+					</div>
+					<div class="flyer-analysis statpad">
+						<div class="title">Reward Rates</div>
+						<div class="statbody">
+							<%= mg_chart("analysis_conv_graph#{@test.id}",
+												{ "Reward Rate" => { :collection => @rates[:reward_rates], :x => :choice_type, :y => :value } },
+													{ :xaxis => { :ticks => @rates[:titles].map { |i,t| [i + 0.5, t] }.sort }, :yaxis => { :min => 0, :minTickSize => 1 }, :bars => { :show => true }, :legend => { :show => false, :position => "ne" }, :grid => { :hoverable => true, :clickable => true }, :inline => false }, :placeholder_size => "420x260", :pie_hover => true, :line_hover_absolute => true, :item_title => "") %>
+						
+						</div>
+					</div>
+				</div>
+		
+						
+				<div class="choices">
+					<% if @test.mg_choices.count == 0 %>
+						<span class="none">No choices [<a href="<%= new_mg_test_choice_url :test_id => @test.id %>">Add one</a>]</span>
+					<% else %>
+						<div class="title-bar">
+							<span class="category choice">Choice</span>
+							<span class="category served">Served</span>
+							<span class="category hit-points">Points</span>
+							<span class="category hit-points-avg">Avg. Points</span>
+							<span class="category actions">Actions</span>
+						</div>
+						<ul class="listed">
+							<% @test.mg_choices.each do |choice| %>
+								<li class="choice">
+									<span class="category choice"><%=h choice.name %></span>
+									<span class="category served"><%= choice.served %></span>
+									<span class="category hit-points"><%= choice.reward || "None" %></span>
+									<span class="category hit-points-avg"><%=h choice.reward_rate || "N/A" %></span>
+									<span class="category actions"><a href="<%= mg_choice_url choice %>">Edit</a></span>
+								</li>
+							<% end %>
+						</ul>
+					<% end %>
+				</div>
+			<% end %>
+		</div>
+		
+		<div class="action-bar">
+			<a class="button" href="<%= new_mg_test_choice_url :test_id => @test.id %>">New Choice</a>
+		</div>
+	</div>
+</div>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mountain-goat
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Geoffrey Hayes
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-09 00:00:00 -07:00
+date: 2011-10-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,6 +62,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .gitignore~
 - Gemfile
 - Gemfile.lock
 - History.md
@@ -128,7 +129,6 @@ files:
 - lib/mountain-goat/public/utils.js
 - lib/mountain-goat/switch_choice.rb
 - lib/mountain-goat/version.rb
-- lib/mountain-goat/views/mountain_goat/layouts/.tmp_mountain_goat.html.erb.50680~
 - lib/mountain-goat/views/mountain_goat/layouts/_pdf.html.erb
 - lib/mountain-goat/views/mountain_goat/layouts/mountain_goat.html.erb
 - lib/mountain-goat/views/mountain_goat/layouts/xhr.html.erb
@@ -137,10 +137,7 @@ files:
 - lib/mountain-goat/views/mountain_goat/mg/choices/index.html.erb
 - lib/mountain-goat/views/mountain_goat/mg/choices/new.html.erb
 - lib/mountain-goat/views/mountain_goat/mg/choices/show.html.erb
-- lib/mountain-goat/views/mountain_goat/mg/goals/.tmp__goal_form.html.erb.5027~
-- lib/mountain-goat/views/mountain_goat/mg/goals/.tmp__goal_meta_type_form.html.erb.39992~
-- lib/mountain-goat/views/mountain_goat/mg/goals/.tmp_edit.html.erb.55874~
-- lib/mountain-goat/views/mountain_goat/mg/goals/.tmp_index.html.erb.97274~
+- lib/mountain-goat/views/mountain_goat/mg/goals/.tmp_show.html.erb.86489~
 - lib/mountain-goat/views/mountain_goat/mg/goals/_goal_form.html.erb
 - lib/mountain-goat/views/mountain_goat/mg/goals/_goal_meta_type_form.html.erb
 - lib/mountain-goat/views/mountain_goat/mg/goals/edit.html.erb
@@ -156,12 +153,8 @@ files:
 - lib/mountain-goat/views/mountain_goat/mg/records/index.html.erb
 - lib/mountain-goat/views/mountain_goat/mg/records/new.html.erb
 - lib/mountain-goat/views/mountain_goat/mg/records/show.html.erb
-- lib/mountain-goat/views/mountain_goat/mg/report_items/.tmp__chart.html.erb.13419~
-- lib/mountain-goat/views/mountain_goat/mg/report_items/.tmp__funnel.html.erb.60493~
-- lib/mountain-goat/views/mountain_goat/mg/report_items/.tmp__report_item_form.html.erb.87420~
-- lib/mountain-goat/views/mountain_goat/mg/report_items/.tmp__report_item_pivot_form.html.erb.77056~
-- lib/mountain-goat/views/mountain_goat/mg/report_items/.tmp_edit.html.erb.31048~
-- lib/mountain-goat/views/mountain_goat/mg/report_items/.tmp_new.html.erb.36371~
+- lib/mountain-goat/views/mountain_goat/mg/report_items/.tmp__chart.html.erb.73596~
+- lib/mountain-goat/views/mountain_goat/mg/report_items/.tmp__show.html.erb.52502~
 - lib/mountain-goat/views/mountain_goat/mg/report_items/_chart.html.erb
 - lib/mountain-goat/views/mountain_goat/mg/report_items/_funnel.html.erb
 - lib/mountain-goat/views/mountain_goat/mg/report_items/_report_item_form.html.erb
@@ -171,11 +164,10 @@ files:
 - lib/mountain-goat/views/mountain_goat/mg/report_items/edit.html.erb
 - lib/mountain-goat/views/mountain_goat/mg/report_items/new.html.erb
 - lib/mountain-goat/views/mountain_goat/mg/report_mailer/report.html.erb
-- lib/mountain-goat/views/mountain_goat/mg/reports/.tmp__report_form.html.erb.76535~
-- lib/mountain-goat/views/mountain_goat/mg/reports/.tmp__report_report_items.html.erb.26030~
-- lib/mountain-goat/views/mountain_goat/mg/reports/.tmp_edit.html.erb.78064~
-- lib/mountain-goat/views/mountain_goat/mg/reports/.tmp_index.html.erb.74591~
-- lib/mountain-goat/views/mountain_goat/mg/reports/.tmp_show.html.erb.58427~
+- lib/mountain-goat/views/mountain_goat/mg/reports/.tmp__report_form.html.erb.42949~
+- lib/mountain-goat/views/mountain_goat/mg/reports/.tmp__report_report_items.html.erb.96264~
+- lib/mountain-goat/views/mountain_goat/mg/reports/.tmp_edit.html.erb.39909~
+- lib/mountain-goat/views/mountain_goat/mg/reports/.tmp_show.html.erb.37905~
 - lib/mountain-goat/views/mountain_goat/mg/reports/_report.html.erb
 - lib/mountain-goat/views/mountain_goat/mg/reports/_report_form.html.erb
 - lib/mountain-goat/views/mountain_goat/mg/reports/_report_report_items.html.erb
@@ -183,6 +175,7 @@ files:
 - lib/mountain-goat/views/mountain_goat/mg/reports/index.html.erb
 - lib/mountain-goat/views/mountain_goat/mg/reports/new.html.erb
 - lib/mountain-goat/views/mountain_goat/mg/reports/show.html.erb
+- lib/mountain-goat/views/mountain_goat/mg/tests/.tmp_show.html.erb.19989~
 - lib/mountain-goat/views/mountain_goat/mg/tests/_test_form.html.erb
 - lib/mountain-goat/views/mountain_goat/mg/tests/edit.html.erb
 - lib/mountain-goat/views/mountain_goat/mg/tests/index.html.erb

data/lib/mountain-goat/views/mountain_goat/layouts/.tmp_mountain_goat.html.erb.50680~

@@ -1,76 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<% is_mobile = false if local_assigns[:is_mobile].nil? %>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-	<title>Mountain Goat <% if @title %> - <%=h @title %><% end %></title>
-	
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	
-	<%# These are mobile specific settings.  We are disabling zooming and fixing the width. %>
-	<meta content='True' name='HandheldFriendly' />
-	<!--<meta content='width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;' name='viewport' />-->
-	<meta name="viewport" content="width=device-width" />
-	
-	<link rel="stylesheet" href="/mg/public/mg_css" type="text/css" />
-	<link rel="stylesheet" href="/mg/public/jqModel_css" type="text/css" />
-	
-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script>
-	<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js" type="text/javascript"></script>
-	<script src="/mg/public/jqModel_js" type="text/javascript"></script>
-	<script src="/mg/public/raphael-min_js" type="text/javascript"></script>
-	<script src="/mg/public/g-raphael-min_js" type="text/javascript"></script>
-	<script src="/mg/public/g-bar-min_js" type="text/javascript"></script>
-	<script src="/mg/public/g-dot-min_js" type="text/javascript"></script>
-	<script src="/mg/public/g-line-min_js" type="text/javascript"></script>
-	<script src="/mg/public/g-pie-min_js" type="text/javascript"></script>
-	<script src="/mg/public/jquery_flot_js" type="text/javascript"></script>
-	<script src="/mg/public/jquery_timeago_js" type="text/javascript"></script>
-	<script src="/mg/public/jquery_raphael_js" type="text/javascript"></script>
-	<script src="/mg/public/mg_js" type="text/javascript"></script>
-	<script src="/mg/public/utils_js" type="text/javascript"></script>
-	
-</head>
-
-<body>
-	<div class="mg-header structure">
-		<div class="container-center">
-			<div class="header">
-				<a href="/mg" class="logo">
-					<img src="/mg/public/mg_png" />
-				</a>
-				<ul class="nav">
-					<li><a href="<%= mg_goals_url %>">Goals</a></li>
-					<li><a href="<%= mg_tests_url %>">Tests</a></li>
-					<li><a href="<%= mg_records_url %>">Records</a></li>
-					<li><a href="<%= mg_reports_url %>">Reports</a></li>
-					<li><a href="/">Exit</a></li>
-				</ul>
-			</div>
-		</div>
-	</div>
-
-	<div class="mg-content structure">
-		<div class="container-center">
-			<% if !flash[:notice].blank? || !flash[:error].blank? %>
-				<div class="flash">
-					<% if !flash[:error].blank? %>
-						<div class="error"><%= flash[:error] %></div>
-					<% end %>
-					<% if !flash[:notice].blank? %>
-						<div class="notice"><%= flash[:notice] %></div>
-					<% end %>
-				</div>
-			<% end %>
-			<%= yield %>
-		</div>
-	</div>
-
-	<div class="mg-footer structure">
-		
-	</div>
-</body>
-
-</html>

data/lib/mountain-goat/views/mountain_goat/mg/goals/.tmp_index.html.erb.97274~

@@ -1,36 +0,0 @@
-<div id="container-main" class="mg-goals">
-	<h1>Your Goals</h1>
-	<div class="container-content">
-		<div class="title-bar">
-			<span class="category name">Goal</span>
-			<span class="category hit-total">Total</span>
-			<span class="category hit-recent">Recent</span>
-			<span class="category hit-points">Points</span>
-			<span class="category actions">Actions</span>
-		</div>
-		<ul class="listed">
-			<% @goals.each do |goal| %>
-				<li class="conversion-goal">
-					<span class="category name"><%=h goal.name %></span>
-					<span class="category hit-total"><%=h goal.mg_records.count %></span>
-					<span class="category hit-recent"><%=h goal.recent_records(1.week).count %></span>
-					<span class="category hit-points"><%=h goal.rewards_total || "None" %></span>
-					<span class="category actions">
-						<a href="<%= mg_goal_url :id => goal.id %>">View</a>
-						<a href="<%= hide_mg_goal_url :id => goal.id %>">Hide</a>
-					</span>
-				</li>
-			<% end %>
-		</ul>
-		<div class="action-bar">
-			<a class="button" href="<%= new_mg_goal_url %>">New Goal</a>
-		</div>
-	</div>
-	
-	<div class="hidden-goals">
-		<% @hidden_goals.each do |goal| %>
-			<span class="name"><%=h goal.name %></span>
-			<span class="unhide"><a href="<%= unhide_mg_goal_url :id => goal.id %>">Restore</a></span>
-		<% end %>
-	</div>
-</div>

data/lib/mountain-goat/views/mountain_goat/mg/report_items/.tmp__funnel.html.erb.60493~

@@ -1,18 +0,0 @@
-<%# locals => report_item %>
-
-<div class="statpad">
-	<div class="title"><%= report_item.chart_title %></div>
-	<div class="statbody">
-		<div id="chart_item<%=h report_item.id %>" data-raphael="line" data-x-axis="date"
-			<% it = 0 %>
-			<%# TODO: There's a ton of assumptions here %>
-			<% report_item.chart_items.each do |name, channel| %>
-				data-title<%= it %>="<%= name || "Direct" %>"
-			 	data-x<%= it %>="<%= channel.map { |i| i[:x].to_time.to_i * 1000 }.join(',') %>"
-				data-y<%= it %>="<%= channel.map { |i| i[:y] }.join(',') %>"
-				<% it = it + 1 %>
-			<% end %>
-			style="width: 425px; height: 260px;" />
-		</div>
-	</div>
-</div>

data/lib/mountain-goat/views/mountain_goat/mg/report_items/.tmp__report_item_form.html.erb.87420~

@@ -1,10 +0,0 @@
-<%# locals => f %>
-<div class="item reportable">
-    <%= f.label :reportable, "Report Item" %>
-    <%= f.select :reportable, options_for_select( [[ "Select a Goal", "" ]] + Mg::Convert.all.map { |conv| [ conv.name, "#{conv.id}-#{conv.class}" ] }, f.object.reportable.nil? ? "" : "#{f.object.reportable_id}-#{f.object.reportable_type}" ), {}, :'data-varies' => 'change', :'data-varies-path' => get_extra_mg_report_items_url, :'data-varies-res' => '#extra' %>
-</div>
-<div id="extra">
-    <% if !f.object.nil? && !f.object.reportable.nil? %>
-    	<%= render :partial => 'mg/report_items/report_item_pivot_form', :locals => { :reportable => f.object.reportable }.merge( f.object.pivot.nil? ? {} : { :pivot => f.object.pivot } ) %>
-    <% end %>
-</div>

data/lib/mountain-goat/views/mountain_goat/mg/report_items/.tmp__report_item_pivot_form.html.erb.77056~

@@ -1,14 +0,0 @@
-<%# locals => reportable, optional => pivot %>
-
-<% pivot = nil if !local_assigns.has_key?(:pivot) %>
-
-<% if reportable.instance_of?(Mg::Convert) %>
-	<% cmts = reportable.convert_meta_types %>
-<% end %>
-
-<% if !cmts.nil? %>
-	<div class="item pivot">
-		<%= label_tag :'report_item[pivot]', "Pivot" %>
-		<%= select_tag :'report_item[pivot]', options_for_select( [[ "None", "" ]] + cmts.map { |cmt| [ cmt.name, "#{cmt.id}-#{cmt.class}" ] }, pivot.nil? ? "" : "#{pivot.id}-#{pivot.type}" ) %>
-	</div>
-<% end %>

data/lib/mountain-goat/views/mountain_goat/mg/report_items/.tmp_edit.html.erb.31048~

@@ -1,19 +0,0 @@
-
-<div class="header">
-	<span class="title">Edit Report Item</span>
-</div>
-<div class="body">
-	<div class="report-items">
-		<% form_for :report_item, @report_item, :url => update_mg_report_item_url(:id => @report_item.id), :html => { :method => :post, :class => "remote-form report-item", :'data-res' => ".report-items-model .model" } do |f| %>
-			
-			<div>
-				<%= f.error_messages %>
-				<%= render :partial => 'mg/report_items/report_item_form', :locals => { :f => f } %>
-			</div>
-			
-			<div class="submit">
-				<%= f.submit 'Update', :class => 'bluebutton' %>
-			</div>
-		<% end %>
-	</div>
-</div>

data/lib/mountain-goat/views/mountain_goat/mg/report_items/.tmp_new.html.erb.36371~

@@ -1,17 +0,0 @@
-
-<div class="header">
-	<span class="title">Add a new Report Item</span>
-</div>
-<div class="body">
-	<% form_for :report_item, @report_item, :url => mg_report_report_items_url(:report_id => @report.id), :html => { :method => :post, :class => "remote-form report-item", :'data-res' => ".report-items-model .model" } do |f| %>
-
-		<div>
-			<%= f.error_messages %>
-			<%= render :partial => 'mg/report_items/report_item_form', :locals => { :f => f } %>
-		</div>
-		
-		<div class="submit">
-			<%= f.submit 'Save', :class => 'bluebutton' %>
-		</div>
-	<% end %>
-</div>

data/lib/mountain-goat/views/mountain_goat/mg/reports/.tmp__report_form.html.erb.76535~

@@ -1,21 +0,0 @@
-<%# locals => f %>
-
-<div class="item title">
-	<%= f.label :title %>
-	<%= f.text_field :title %>
-</div>
-
-<div class="item description">
-	<%= f.label :description %>
-	<%= f.text_area :description %>
-</div>
-
-<div class="item delivert_set">
-	<%= f.label :delivery_set, 'Frequency' %>
-	<%= f.select :delivery_set, options_for_select( [ [ 'daily', 'daily' ], [ 'weekly', 'weekly' ], [ 'monthly', 'monthly' ] ] ) %>
-</div>
-
-<div class="item recipients">
-	<%= f.label :recipients, 'Recipients' %>
-	<%= f.text_area :recipients %>
-</div>

data/lib/mountain-goat/views/mountain_goat/mg/reports/.tmp_edit.html.erb.78064~

@@ -1,36 +0,0 @@
-
-<div id="container-main" class="mt-reports">
-	<div class="mountain-goat-panel centered">
-		<ul class="nav">
-			<li><a href="<%= mg_reports_url %>">Reports</a></li>
-			<li><a href="<%= mg_report_url @report.id %>"><%=h @report.title %></a></li>
-		</ul>
-		
-		<h1>Edit <%= @report.title %></h1>
-	
-		<% form_for :report, @report, :url => mg_report_url(:id => @report.id), :html => { :method => :put } do |f| %>
-	 		<%= f.error_messages %>
-	
-			<div class="report-report-items">
-				<h4>Report Items</h4>
-				<%= render :partial => "mg/reports/report_report_items", :locals => { :report => @report } %>
-			</div>
-			
-			<a href="javascript:void(0)" class="smallbutton redbutton remote-link" data-path="<%= new_mg_report_report_item_url(:report_id => @report.id) %>" data-res=".report-items-model .model">+ Add Item</a>
-			
-			<%= render :partial => 'mg/reports/report_form', :locals => { :f => f } %>
-			
-			<div class="item submit">
-				<%= f.submit 'Submit' %>
-			</div>
-
-			<div class="report-items-model flash-model model">
-				<div class="jqmWindow">
-					<a href="#" class="jqmClose">Close</a>
-					<div class="model" data-model=".jqmWindow"></div>
-				</div>
-			</div>
-		<% end %>
-	</div>
-</div>
-

data/lib/mountain-goat/views/mountain_goat/mg/reports/.tmp_index.html.erb.74591~

@@ -1,23 +0,0 @@
-<div id="container-main" class="mg-reports">
-	<h1>Your Reports</h1>
-	<div class="container-content">
-		<div class="title-bar">
-			<span class="category name">Report</span>
-			<span class="category frequency">Frequency</span>
-			<span class="category actions">Actions</span>
-		</div>
-		<ul class="listed">
-			<% @reports.each do |report| %>
-				<li class="report">
-					<span class="category name"><%=h report.title %></span>
-					<span class="category frequency">Frequency</span>
-					<span class="category actions"><a href="<%= edit_mg_report_url :id => report.id %>">Edit</a> Hide</span>
-				</li>
-			<% end %>
-		</ul>
-		
-		<div class="action-bar">
-			<a class="button" href="<%= new_mg_report_url %>">New Report</a>
-		</div>
-	</div>
-</div>

data/lib/mountain-goat/views/mountain_goat/mg/reports/.tmp_show.html.erb.58427~

@@ -1,21 +0,0 @@
-
-<div id="container-main" class="mt-reports show">
-	<div class="mountain-goat-panel centered">
-		<ul class="nav">
-			<li><a href="<%= mg_reports_url %>">Reports</a></li>
-			<li><a href="<%= mg_report_url @report.id %>"><%=h @report.title %></a></li>
-		</ul>
-		
-		<h2><%=h @report.title %></h2>
-		
-		<h4><%=h @report.description %></h4>
-		
-		<% @report.report_items.each do |report_item| %>
-			<%= render 'mg/report_items/chart', :report_item => report_item %>
-		<% end %>
-		
-		<div class="actions">
-			<a class="button" href="<%= edit_mg_report_url @report %>">Edit</a>
-		</div>
-	</div>
-</div>