Pagination for exercise thumbnails

On the gym index page and search page

Author: ayaankazerouni

app/models/exercise.rb

@@ -87,7 +87,7 @@ class Exercise < ActiveRecord::Base
   # validates :current_version, presence: true
 
   #~ Pagination ...............................................................
-  max_paginates_per 50 
+  max_paginates_per 40
 
   Q_MC     = 1
   Q_CODING = 2
@@ -130,19 +130,16 @@ def self.search(terms, user = nil)
     end
     if user
       visible = Exercise.visible_to_user(user)
-      result = visible.tagged_with(terms, any: true, wild: true, on: :tags) +
-        visible.tagged_with(terms, any: true, wild: true, on: :languages) +
-        visible.tagged_with(terms, any: true, wild: true, on: :styles) +
-        visible.where('(name regexp (?)) or (exercises.id in (?))', r, ids)
-      return result.uniq
     else
       visible = Exercise.publicly_visible
-      result = visible.tagged_with(terms, any: true, wild: true, on: :tags) +
-        visible.tagged_with(terms, any: true, wild: true, on: :languages) +
-        visible.tagged_with(terms, any: true, wild: true, on: :styles) +
-        visible.where('(name regexp (?)) or (exercises.id in (?))', r, ids)
-      return result.uniq
     end
+    
+    result = visible.tagged_with(terms, any: true, wild: true, on: :tags)
+      .union(visible.tagged_with(terms, any: true, wild: true, on: :languages))
+      .union(visible.tagged_with(terms, any: true, wild: true, on: :styles)) 
+      .union(visible.where('(name regexp (?)) or (exercises.id in (?))', r, ids))
+      .distinct
+    return result
   end
 
 

app/views/exercises/_exercise.html.haml

@@ -122,11 +122,9 @@
       = difficulty_image(exercise.experience.to_i)
       .taglist
         - exercise.languages.each do |lang|
-          = link_to lang.name, exercises_search_path(search: lang.name),
-            method: :post, class: 'tag lang'
+          = link_to lang.name, exercises_search_path(search: lang.name), class: 'tag lang'
         - exercise.tags.each do |tag|
-          = link_to tag.name, exercises_search_path(search: tag.name),
-            method: :post, class: 'tag'
+          = link_to tag.name, exercises_search_path(search: tag.name), class: 'tag'
       -#
         - attempt = nil
         - uid = 0

app/views/exercises/_find_exercises_to_add.html.haml

@@ -1,6 +1,6 @@
 %h2 Search for exercises
 .row.search-area
-  = form_tag exercises_search_path(params[:search]), remote: true do
+  = form_tag exercises_search_path(params[:search]), method: :get, remote: true do
     .col-xs-8
       = text_field_tag :search, nil, placeholder: 'e.g. recursion', class: 'form-control input-sm', id: 'search-terms'
     .col-xs-3

app/views/exercises/search.html.haml

@@ -2,7 +2,7 @@
 %p
   Searching for:
   - @terms.each do |t|
-    = link_to t, exercises_search_path(search: t), method: :post, class: 'tag'
+    = link_to t, exercises_search_path(search: t), class: 'tag'
 
 - uid = user_signed_in? ? current_user.id : 0
 - if not(@msg.empty?)
@@ -15,7 +15,9 @@
     .clearfix
 
 - if not(@exs.empty?)
+  - @exs = @exs.page params[:page]
   %h2 Individual Exercises
   - @exs.in_groups_of(2, false) do |row|
     = render row, user: current_user
     .clearfix
+  = paginate @exs

app/views/users/calc_performance.html.haml

@@ -13,8 +13,7 @@
       - @tag_scores.each do |t|
         %tr
           %td
-            =link_to t[:tag_name], exercises_search_path(:search => t[:tag_name]),
-              method: :post, class: 'tag'
+            =link_to t[:tag_name], exercises_search_path(:search => t[:tag_name]), class: 'tag'
           %td
             - earned = rand(500)
             - possible = rand(500)

app/views/workouts/_workout.html.haml

@@ -113,8 +113,7 @@
     = difficulty_image(workout.highest_difficulty.to_i)
     .taglist
       - workout.tags.each do |t|
-        = link_to t.name, exercises_search_path(search: t.name),
-          method: :post, class: 'tag'
+        = link_to t.name, exercises_search_path(search: t.name), class: 'tag'
 
 -#.well.well-sm.col-md-5
   .row

app/views/workouts/review.html.haml

@@ -9,7 +9,7 @@
   %p
     Tags:
     - @workout.tags.each do |t|
-      =link_to t.name, exercises_search_path(search: t.name), method: :post, class: 'tag'
+      =link_to t.name, exercises_search_path(search: t.name), class: 'tag'
 
 - if course_offering && course_offering.is_staff?(review_user)
   %table.table.table-striped{ style: 'width: auto' }

app/views/workouts/show.html.haml

@@ -13,7 +13,7 @@
   %p
     Tags:
     - @workout.tags.each do |t|
-      =link_to t.name, exercises_search_path(search: t.name), method: :post, class: 'tag'
+      =link_to t.name, exercises_search_path(search: t.name), class: 'tag'
 
 - if course_offering && course_offering.is_staff?(current_user)
   %table.table.table-striped{ style: 'width: auto' }

config/routes.rb

@@ -61,7 +61,7 @@
     patch 'exercises/:id/practice' => 'exercises#evaluate',
       as: :exercise_evaluate
 		get 'exercises/:id/embed' => 'exercises#embed', as: :exercise_embed
-    post 'exercises/search' => 'exercises#search', as: :exercises_search
+    get 'exercises/search' => 'exercises#search', as: :exercises_search
     get 'exercises/query_data' => 'exercises#query_data',
       as: :exercises_query_data
     get 'exercises/:id/download_attempt_data' =>

lib/tasks/sample_data.rake

@@ -76,7 +76,11 @@ namespace :db do
 
     # Create a workout with one exercise, and a second exercise
     w = FactoryBot.create :workout_with_exercises
-    FactoryBot.create :coding_exercise, name: 'Factorial 3'
+
+    50.times do |i|
+      FactoryBot.create :coding_exercise, name: "Factorial #{i}"
+      FactoryBot.create :mc_exercise, name: "MCQ #{i}"
+    end
 
     user_group = FactoryBot.create :user_group
     user_group.users << [ instructor, instructor2 ]