From e7deae763f553543c3dfbd7d0cb2a9e4ef7958e7 Mon Sep 17 00:00:00 2001
From: Aaron Wiggins <apw7177@gmail.com>
Date: Sun, 9 Aug 2015 18:25:08 -0400
Subject: [PATCH] fix sort and query. now will display by votes if there is a
 tie

---
 app/controllers/experiments_controller.rb     | 25 +++--------
 app/views/experiments/_age_ordered.html.erb   | 44 -------------------
 ...html.erb => _ordered_experiments.html.erb} |  0
 app/views/experiments/_time_ordered.html.erb  | 44 -------------------
 .../experiments/order_experiments.js.erb      |  7 +--
 5 files changed, 8 insertions(+), 112 deletions(-)
 delete mode 100644 app/views/experiments/_age_ordered.html.erb
 rename app/views/experiments/{_order_experiments.html.erb => _ordered_experiments.html.erb} (100%)
 delete mode 100644 app/views/experiments/_time_ordered.html.erb

diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb
index 9e27ac3..35d7ab4 100644
--- a/app/controllers/experiments_controller.rb
+++ b/app/controllers/experiments_controller.rb
@@ -10,7 +10,7 @@ def landing_page
 
   def index
     if params[:query]
-      @experiments = Experiment.text_search(params[:query])
+      @experiments = Experiment.text_search(params[:query]).all.by_votes
       if @experiments.length == 0
         flash.now[:notice] = "No items found"
       end
@@ -20,26 +20,13 @@ def index
   end
 
   def order_experiments
-    @experiments = Experiment.text_search(params[:queryValue])
-    # if params[:selectValue] == "1"
-    #   # if params[:selectValue] == "1" && params[:query]
-    #     # @experiments = Experiment.text_search(params[:query])
-    #     @sorted_experiments = Experiment.text_search(params[:query]).all.sort_by {|e| [e.age, -1*e.experiment_votes.count]}
-    #   # else
-    #   #   @sorted_experiments = Experiment.all.sort_by {|e| [e.age, -1*e.experiment_votes.count]}
-    #   # end
-    # elsif params[:selectValue] == "2"
-    #   if params[:selectValue] == "2" && params[:query]
-    #     #@experiments = Experiment.text_search(params[:query])
-    #     @sorted_experiments = Experiment.text_search(params[:query]).all.sort_by {|e| [e.complete_time, -1*e.experiment_votes.count]}
-    #   else
-    #     @sorted_experiments = Experiment.all.sort_by {|e| [e.complete_time, -1*e.experiment_votes.count]}
-    #   end
-    # end
+    if params[:queryValue] && params[:selectValue] == "1"
+      @experiments = Experiment.text_search(params[:queryValue]).all.sort_by {|e| [e.age, -1*e.experiment_votes.count]}
+    elsif params[:queryValue] && params[:selectValue] == "2"
+      @experiments = Experiment.text_search(params[:queryValue]).all.sort_by {|e| [e.complete_time, -1*e.experiment_votes.count]}
+    end
   end
 
-  # end
-
   # GET /experiments/1
   # GET /experiments/1.json
   def show
diff --git a/app/views/experiments/_age_ordered.html.erb b/app/views/experiments/_age_ordered.html.erb
deleted file mode 100644
index 48833dc..0000000
--- a/app/views/experiments/_age_ordered.html.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-<div class="index-wrapper">
-
-  <% experiments.order(:age).each do |experiment| %>
-
-    <div class="index-experiment-card">
-      <% if experiment.uploaded_file.blank? %>
-        <a href="<%= url_for experiment %>" class="index-photo" style="background-image: url(<%= image_path "bubbles.jpg" %>)">
-      <% else %>
-        <a href="<%= url_for experiment %>" class="index-photo" style="background-image: url('<%= experiment.uploaded_file %>')">
-      <% end %>
-        <span class="index-exp-title-bar"><h3 class="index-exp-title"><%= experiment.name %></h3>
-          <i class="fa fa-thumbs-up index-likes"> <%= pluralize experiment.votes, "like" %></i>
-        </span>
-      </a>
-
-      <div class="index-info">
-        <div class="index-exp-ratings">
-          <span class="ratings-container">
-            <span class="index-concept-icon">
-              <% c = experiment.concepts.sample %>
-              <%= image_tag "#{c.name}.png", class: "concept-img-small" %><br>
-              <%= link_to c.name, concept_path(c) %>
-            </span>
-
-            <div class="index-time">
-              <%= image_tag "time.png", class: "icon-small" %><br>
-              <%= experiment.complete_time %> hour(s)
-            </div>
-
-            <div class="index-age">
-              <%= image_tag "age.png", class: "icon-small" %><br>
-              Ages <%= experiment.return_age %>
-            </div>
-
-            <div class="mess-rate-disable index-mess">
-              <%= rating_for experiment, "name", star_path: '/images/ratyrate', :disable_rate => true %><br>
-              Mess
-            </div>
-          </span>
-        </div>
-      </div>
-    </div>
-  <% end %>
-</div>
diff --git a/app/views/experiments/_order_experiments.html.erb b/app/views/experiments/_ordered_experiments.html.erb
similarity index 100%
rename from app/views/experiments/_order_experiments.html.erb
rename to app/views/experiments/_ordered_experiments.html.erb
diff --git a/app/views/experiments/_time_ordered.html.erb b/app/views/experiments/_time_ordered.html.erb
deleted file mode 100644
index 966cb58..0000000
--- a/app/views/experiments/_time_ordered.html.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-<div class="index-wrapper">
-
-  <% experiments.order(:complete_time).each do |experiment| %>
-
-    <div class="index-experiment-card">
-      <% if experiment.uploaded_file.blank? %>
-        <a href="<%= url_for experiment %>" class="index-photo" style="background-image: url(<%= image_path "bubbles.jpg" %>)">
-      <% else %>
-        <a href="<%= url_for experiment %>" class="index-photo" style="background-image: url('<%= experiment.uploaded_file %>')">
-      <% end %>
-        <span class="index-exp-title-bar"><h3 class="index-exp-title"><%= experiment.name %></h3>
-          <i class="fa fa-thumbs-up index-likes"> <%= pluralize experiment.votes, "like" %></i>
-        </span>
-      </a>
-
-      <div class="index-info">
-        <div class="index-exp-ratings">
-          <span class="ratings-container">
-            <span class="index-concept-icon">
-              <% c = experiment.concepts.sample %>
-              <%= image_tag "#{c.name}.png", class: "concept-img-small" %><br>
-              <%= link_to c.name, concept_path(c) %>
-            </span>
-
-            <div class="index-time">
-              <%= image_tag "time.png", class: "icon-small" %><br>
-              <%= experiment.complete_time %> hour(s)
-            </div>
-
-            <div class="index-age">
-              <%= image_tag "age.png", class: "icon-small" %><br>
-              Ages <%= experiment.return_age %>
-            </div>
-
-            <div class="mess-rate-disable index-mess">
-              <%= rating_for experiment, "name", star_path: '/images/ratyrate', :disable_rate => true %><br>
-              Mess
-            </div>
-          </span>
-        </div>
-      </div>
-    </div>
-  <% end %>
-</div>
diff --git a/app/views/experiments/order_experiments.js.erb b/app/views/experiments/order_experiments.js.erb
index a920497..93419d1 100644
--- a/app/views/experiments/order_experiments.js.erb
+++ b/app/views/experiments/order_experiments.js.erb
@@ -1,5 +1,2 @@
-<% if params[:selectValue] == "1" %>
-  $(".index-wrapper").replaceWith("<%= j(render partial:  'experiments/age_ordered', locals: { experiments: @experiments }) %>");
-<% elsif params[:selectValue] == "2" %>
-  $(".index-wrapper").replaceWith("<%= j(render partial:  'experiments/time_ordered', locals: { experiments: @experiments }) %>");
-<% end %>
+$(".index-wrapper").replaceWith("<%= j(render partial:  'experiments/ordered_experiments', locals: { experiments: @experiments }) %>");
+initStars();