From cc3f0f8c777cf8f100f9d540eb097f07a98d9051 Mon Sep 17 00:00:00 2001
From: Louis Knapp <louisknapp@gmail.com>
Date: Fri, 18 Sep 2015 16:53:46 -0500
Subject: [PATCH] lk | paginates bikes & orders by log # desc

---
 .gitignore                             |  1 +
 Gemfile                                |  1 +
 Gemfile.lock                           |  2 ++
 app/controllers/bikes_controller.rb    | 10 ++++------
 app/views/bikes/index.html.haml        |  2 +-
 app/views/bikes/print_select.html.haml |  8 +++++---
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index bcf596d..2a9f607 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ dump.rdb
 .DS_Store
 
 /config/secrets.yml
+/ignored/
 
 *.swp
 /.vagrant/*
diff --git a/Gemfile b/Gemfile
index c5c67d1..8c8abd8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,6 +9,7 @@ gem 'oauth2', '1.0.0'
 gem 'dotenv-rails'
 gem 'sidekiq'
 gem 'sinatra', :require => nil
+gem 'will_paginate', '~> 3.0.6'
 
 #SCSS & Bootstrap
 gem 'bootstrap-sass', '2.3.2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5c0a8b2..5397d8c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -237,6 +237,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
     websocket (1.0.7)
+    will_paginate (3.0.7)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -278,6 +279,7 @@ DEPENDENCIES
   turbolinks (= 1.1.1)
   uglifier (= 2.1.1)
   webmock (= 1.21.0)
+  will_paginate (~> 3.0.6)
 
 BUNDLED WITH
    1.10.6
diff --git a/app/controllers/bikes_controller.rb b/app/controllers/bikes_controller.rb
index 433a8b9..3296802 100644
--- a/app/controllers/bikes_controller.rb
+++ b/app/controllers/bikes_controller.rb
@@ -3,26 +3,24 @@ class BikesController < ApplicationController
   before_action :authenticate_user!
 
   def index
-    @bikes = Bike.all.order(:log_number).reverse_order
+    @bikes = Bike.all.order(:log_number).reverse_order.paginate(:page => params[:page], :per_page => 30)
     @unsold_bikes = @bikes.select{ |bike|
       !bike.date_sold &&
       (bike.purpose == "Sale")
     }
   end
 
-  def show
-  end
+  def show; end
 
   def new
     @bike = Bike.new
     @log_number = Bike.order(:log_number).last.log_number + 1
   end
 
-  def edit
-  end
+  def edit; end
 
   def print_select
-    @bikes = Bike.all
+    @bikes = Bike.order(:log_number).reverse_order.paginate(:page => params[:page], :per_page => 30)
   end
 
   def print_labels
diff --git a/app/views/bikes/index.html.haml b/app/views/bikes/index.html.haml
index a22092e..3213177 100644
--- a/app/views/bikes/index.html.haml
+++ b/app/views/bikes/index.html.haml
@@ -34,4 +34,4 @@
           %td= bike.model
           %td= link_to 'Show', bike
           %td= link_to 'Edit', edit_bike_path(bike)
-
+  =will_paginate @bikes
diff --git a/app/views/bikes/print_select.html.haml b/app/views/bikes/print_select.html.haml
index 632a037..48807b0 100644
--- a/app/views/bikes/print_select.html.haml
+++ b/app/views/bikes/print_select.html.haml
@@ -5,10 +5,12 @@
     %table.table.table-striped.table-bordered.table-hover
       %thead
         %tr
-          %th Bike 
+          %th Bike
           %th Select
         -@bikes.each do |bike|
           %tr
             %td= bike.name
-            %td= check_box("print_bikes", bike.id) 
-    =submit_tag 'Generate Labels', class: "btn btn-default" 
+            %td= check_box("print_bikes", bike.id)
+    =will_paginate @bikes
+    %br
+    =submit_tag 'Generate Labels', class: "btn btn-default"