fix order drop down, only orders by age or time, no tiebreaker based …

…on votes
AaronLindsayDaisy · Aug 9, 2015 · 1abf9a8 · 1abf9a8
1 parent 8728b4f
commit 1abf9a8
Show file tree

Hide file tree

Showing 6 changed files with 113 additions and 10 deletions.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -62,6 +62,8 @@ $(function() {
  });
 });
 
+// order function
+
 $(function() {
   $('.order').change(function(){
     var selectValue = $(this).val();

diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb
@@ -20,11 +20,22 @@ def index
   end
 
   def order_experiments
-    if params[:selectValue] == "1"
-      @sorted_experiments = Experiment.all.sort_by {|e| [e.age, -1*e.experiment_votes.count]}
-    elsif params[:selectValue] == "2"
-      @sorted_experiments = Experiment.all.sort_by {|e| [e.complete_time, -1*e.experiment_votes.count]}
-    end
+    @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
   end
 
   # end

diff --git a/app/views/experiments/_age_ordered.html.erb b/app/views/experiments/_age_ordered.html.erb
@@ -0,0 +1,44 @@
+<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/_experiments.html.erb b/app/views/experiments/_experiments.html.erb
@@ -17,7 +17,7 @@
   </div>
 
   <div class="index-wrapper">
-  <% @experiments.each do |experiment| %>
+    <% @experiments.each do |experiment| %>
 
       <div class="index-experiment-card">
         <% if experiment.uploaded_file.blank? %>
@@ -26,7 +26,6 @@
           <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>
@@ -58,6 +57,6 @@
           </div>
         </div>
       </div>
-  <% end %>
+    <% end %>
   </div>
 </div>
diff --git a/app/views/experiments/_time_ordered.html.erb b/app/views/experiments/_time_ordered.html.erb
@@ -0,0 +1,44 @@
+<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
@@ -1,2 +1,5 @@
-$(".index-wrapper").replaceWith("<%= j(render partial:  'experiments/order_experiments', locals: { experiments: @sorted_experiments }) %>");
-initStars();
+<% 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 %>