new branch for hw2 solution

daben · Jan 30, 2012 · a97d021 · a97d021
1 parent fcad7c2
commit a97d021
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 4 deletions.
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -48,6 +48,9 @@ table#movies th, table#movies td {
   padding: 4px;
   text-align: left;
 }
+table#movies th.hilite {
+  background-color: yellow;
+}
 #notice #warning {
   background: rosybrown;
   margin: 1em 0;

diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb
@@ -7,7 +7,14 @@ def show
   end
 
   def index
-    @movies = Movie.all
+    if params[:title_sort]
+      ordering,@title_header = {:order => :title}, 'hilite'
+    elsif params[:release_date_sort]
+      ordering,@date_header = {:order => :release_date}, 'hilite'
+    end
+    @all_ratings = Movie.all_ratings
+    @selected_ratings = (params[:ratings] ||= {}).keys
+    @movies = Movie.find_all_by_rating(@selected_ratings, ordering)
   end
 
   def new

diff --git a/app/models/movie.rb b/app/models/movie.rb
@@ -1,2 +1,5 @@
 class Movie < ActiveRecord::Base
+  def self.all_ratings
+    %w(G PG PG-13 NC-17 R)
+  end
 end
diff --git a/app/views/movies/index.html.haml b/app/views/movies/index.html.haml
@@ -1,12 +1,19 @@
 -#  This file is app/views/movies/index.html.haml
 %h1 All Movies
 
+= form_tag movies_path, :method => :get do
+  Include: 
+  - @all_ratings.each do |rating|
+    = rating
+    = check_box_tag "ratings[#{rating}]", 1, @selected_ratings.include?(rating)
+  = submit_tag 'Refresh'
+
 %table#movies
   %thead
     %tr
-      %th Movie Title
+      %th{:class => @title_header}= link_to 'Movie Title', movies_path(:title_sort => true)
       %th Rating
-      %th Release Date
+      %th{:class=>@date_header}= link_to 'Release Date', movies_path(:release_date_sort => true)
       %th More Info
   %tbody
     - @movies.each do |movie|

diff --git a/config/routes.rb b/config/routes.rb
@@ -13,7 +13,7 @@
   # Sample resource route (maps HTTP verbs to controller actions automatically):
   #   resources :products
   resources :movies
-
+  
   # Sample resource route with options:
   #   resources :products do
   #     member do

diff --git a/db/development.sqlite3 b/db/development.sqlite3