');
+
+ $(".expand-search-options").click(function (e) {
+ e.preventDefault();
+ $(".expandable").toggle('slow', 'swing', function () {
+ if ($('.expandable').css('display') == 'block') {
+ $(".expand-search-options").text("Hide advanced search")
+ } else {
+ $(".expand-search-options").text("Show advanced search")
+ }
+ });
+ });
});
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 15afb792..6913f0b7 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -37,6 +37,7 @@
*= require home.scss
*= require static.scss
*= require menu.scss
+ *= require course_reviews.scss
*
* Global styles defined in this file
*= require_self
@@ -261,6 +262,14 @@ a {
color: white !important;
}
+.has-brightness {
+ filter: brightness(1.25);
+}
+
+.results-heading {
+ margin: 20px auto 10px 0;
+}
+
.campus_KS {
background-color: #391858 !important;
color: white !important;
diff --git a/app/assets/stylesheets/course_review.scss b/app/assets/stylesheets/course_reviews.scss
similarity index 100%
rename from app/assets/stylesheets/course_review.scss
rename to app/assets/stylesheets/course_reviews.scss
diff --git a/app/controllers/course_review_controller.rb b/app/controllers/course_review_controller.rb
deleted file mode 100644
index f9f95699..00000000
--- a/app/controllers/course_review_controller.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class CourseReviewController < ApplicationController
- def show
- @course_review = CourseReview.find_by(:id => params[:id])
- end
-
- def create
- end
-end
diff --git a/app/controllers/course_reviews_controller.rb b/app/controllers/course_reviews_controller.rb
new file mode 100644
index 00000000..5d1009de
--- /dev/null
+++ b/app/controllers/course_reviews_controller.rb
@@ -0,0 +1,154 @@
+class CourseReviewsController < ApplicationController
+ before_action :authenticate_user!
+
+ # GET /reviews/:id
+ def show
+ @course_review = CourseReview.find_by(:id => params[:id])
+ end
+
+ # GET /reviews/course/:id/new
+ def new
+ course_id = params[:course_id]
+ @course = Course.find_by(:id => course_id)
+
+ @course_review = CourseReview.new
+ end
+
+ # DELETE /reviews/course/:course_id/:
+ def destroy
+ course_review = CourseReview.find_by(:id => params[:id])
+ if current_user.id == course_review.user_id
+ course_review.destroy
+ end
+
+ redirect_to course_path(course_review.course), notice: "Course review was successfully deleted."
+ end
+
+ def show_course_reviews
+ @academic_terms = AcademicTerm.current_academic_year
+ @departments = Department.all
+ end
+
+ def show_instructor_reviews
+ @departments = Department.all
+ end
+
+ def create
+ @course_review = CourseReview.new(
+ :overall_rating => review_params[:overall_rating],
+ :inclusivity_rating => review_params[:inclusivity_rating],
+ :challenge_rating => review_params[:challenge_rating],
+ :work_per_week => review_params[:work_per_week],
+ :comments => review_params[:comments],
+ :course_id => review_params[:course_id],
+ :instructor_id => review_params[:instructor_id],
+ :user_id => current_user.id,
+ )
+
+ @course = @course_review.course #Course.find_by(:id => course_id)
+
+ respond_to do |format|
+ if @course_review.save
+ format.html { redirect_to @course_review.course, notice: 'Your course review has been submitted successfully.' }
+ format.json { render json: @course_review, status: :ok }
+ else
+ format.html { render :new }
+ format.json { render json: @course_review.errors, status: :unprocessable_entity }
+ end
+ end
+ end
+
+ def search_course_reviews
+ # param initialization
+ department_code = Department.find_by(:name => params[:department]).code unless params[:department].empty?
+ number = params[:number].to_i rescue nil unless params[:number].empty?
+ keywords = params[:keywords].split rescue nil unless params[:keywords].empty?
+ schools = {
+ :pomona => params[:pomona] || false,
+ :claremont_mckenna => params[:claremont_mckenna] || false,
+ :harvey_mudd => params[:harvey_mudd] || false,
+ :scripps => params[:scripps] || false,
+ :pitzer => params[:pitzer] || false
+ }
+ schools.select! {|k,v| v}
+ if schools.length > 0
+ schools = schools.keys
+ else
+ schools = CourseMeetingDetail.campus.keys.map(&:to_sym)
+ end
+
+ # database queries
+ matches_query = Course.joins(:departments)
+ if (department_code)
+ matches_query = matches_query
+ .where(:departments => {:code => department_code})
+ end
+
+ if (number)
+ matches_query = matches_query
+ .where(:number => number)
+ end
+
+ matches = matches_query.order("number").all
+
+ # database response filtering
+ if (schools)
+ matches = matches.select {|course| schools.any? {|school| course.schools.any? {|s| s == school}}}
+ end
+
+ if (keywords)
+ matches = matches.select {|course| keywords.any? {|keyword| course.name.downcase.include? keyword.downcase}}
+ matches = matches.sort_by {|course| get_keyword_relevance(course, keywords)}
+ end
+
+ matches = matches.uniq
+
+ # server response
+ @courses = matches
+ respond_to do |format|
+ format.html {render :json => matches.to_json, :status => :ok}
+ format.json {render :json => matches.to_json, :status => :ok}
+ format.js
+ end
+ end
+
+ def search_instructor_reviews
+ instructor_name = params[:instructor].strip unless params[:instructor].empty?
+
+ matches_query = Instructor
+
+ matches = matches_query.order("id").all
+
+ if (instructor_name)
+ matches = matches.select {|instructor| instructor.name.downcase.include? instructor_name.downcase}
+ end
+
+ matches = matches.uniq
+
+ @instructors = matches
+ respond_to do |format|
+ format.html {render :json => matches.to_json, :status => :ok}
+ format.json {render :json => matches.to_json, :status => :ok}
+ format.js
+ end
+ end
+
+ private
+
+ # Never trust parameters from the scary internet, only allow the white list through.
+ def review_params
+ params
+ .require(:course_review)
+ .permit(:overall_rating, :challenge_rating, :inclusivity_rating, :work_per_week, :comments,
+ :course_id, :instructor_id, :id)
+ end
+
+ def get_keyword_relevance(course, keywords)
+ occurences = 0
+ keywords.each do |keyword|
+ occurences += course.name.downcase.scan(/(?=#{keyword})/).count
+ end
+ logger.info "#{course.name.downcase}, #{keywords}, #{occurences}"
+ return 1.0/occurences
+ end
+end
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index a7213b5d..2ae90aca 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -122,6 +122,8 @@ def save_course_sections_to_schedule
end
end
+# TODO: Refactor this - break it up into manageable components
+# Possibly separate search into a separate module entirely (as it is used similarly in course reviews)
def search_course_sections
if params[:academic_term].nil? || params[:academic_term].empty?
return render :json => {error: "No academic term specified"}, :status => :bad_request
@@ -132,13 +134,15 @@ def search_course_sections
instructor_name = params[:instructor].strip unless params[:instructor].empty?
number = params[:number].to_i rescue nil unless params[:number].empty?
keywords = params[:keywords].split rescue nil unless params[:keywords].empty?
- # Remove time filter
+
+
+ # Remove time filter TODO: re-enable
# start_hour = params["start_time(4i)"].to_i rescue nil unless params["start_time(4i)"].empty?
# start_minute = params["start_time(5i)"].to_i rescue nil unless params["start_time(5i)"].empty?
# end_hour = params["end_time(4i)"].to_i rescue nil unless params["end_time(4i)"].empty?
# end_minute = params["end_time(5i)"].to_i rescue nil unless params["end_time(5i)"].empty?
- # Remove time filter
+ # Remove time filter TODO: re-enable
# consider_time = false
# if not start_hour.nil? # if user specifies start time
# start_time = Time.new(1970, 1, 1, start_hour, start_minute)
@@ -161,10 +165,6 @@ def search_course_sections
# start_time = ActiveSupport::TimeZone.new('America/Los_Angeles').utc_to_local(start_time) if start_time
# end_time = ActiveSupport::TimeZone.new('America/Los_Angeles').utc_to_local(end_time) if end_time
- Rails.logger.debug params.inspect
- # Rails.logger.debug (params[:schools].include?("Pomona") || false)
- # Test disabled since params for schools and days have been reverted to separate checkboxes
-
# Gets results from individual checkboxes with corresponding symbols
schools = {
:pomona => params[:pomona] || false,
@@ -201,7 +201,7 @@ def search_course_sections
.where(:course_meeting_details => days)
end
- # Remove time filter
+ # Remove time filter TODO: re-enable
# if (consider_time)
# matches_query = matches_query
# .joins(:course_meeting_details)
diff --git a/app/controllers/instructors_controller.rb b/app/controllers/instructors_controller.rb
index 385675c6..9371974f 100644
--- a/app/controllers/instructors_controller.rb
+++ b/app/controllers/instructors_controller.rb
@@ -1,5 +1,11 @@
class InstructorsController < ApplicationController
+ before_action :authenticate_user!
+
def show
@instructor = Instructor.find(params[:id])
end
-end
+
+ def add_instructor_review
+ @instructor = Instructor.find(params[:id])
+ end
+end
\ No newline at end of file
diff --git a/app/models/course.rb b/app/models/course.rb
index 2439df4c..1b11de05 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -20,4 +20,21 @@ def challenge_rating
def work_per_week
self.course_reviews&.average(:work_per_week)&.round(2, :truncate) || 0
end
+
+ # collect all instructors that have ever taught a section of this course
+ def instructors
+ self.course_sections
+ &.collect{ |section| section.instructors }
+ .reduce(:+)
+ .uniq
+ end
+
+ # collect all the schools that this course is taught at
+ def schools
+ # matches = matches.select {|section| schools.any? {|campus| section.course_meeting_details.any? {|detail| detail.campus == campus.to_s}}}
+ self.course_sections
+ &.collect{ |section| section.schools }
+ .reduce(:+)
+ .uniq
+ end
end
diff --git a/app/models/course_review.rb b/app/models/course_review.rb
index 80f367cd..f813714e 100644
--- a/app/models/course_review.rb
+++ b/app/models/course_review.rb
@@ -3,6 +3,13 @@ class CourseReview < ApplicationRecord
belongs_to :course
belongs_to :instructor
+ belongs_to :user, :optional => true
+
+ validates :course, :presence => true
+ validates :overall_rating, :presence => true
+ validates :inclusivity_rating, :presence => true
+ validates :challenge_rating, :presence => true
+ validates :work_per_week, :presence => true
accepts_nested_attributes_for :course
accepts_nested_attributes_for :instructor
diff --git a/app/models/course_section.rb b/app/models/course_section.rb
index bd6cb057..e808682b 100644
--- a/app/models/course_section.rb
+++ b/app/models/course_section.rb
@@ -10,4 +10,10 @@ class CourseSection < ApplicationRecord
def has_meeting_time?(course_meeting_detail)
return self.course_meeting_details.any? { | detail | course_meeting_detail == detail }
end
+
+ def schools
+ self.course_meeting_details
+ &.collect{ |detail| detail.campus.to_sym }
+ .uniq
+ end
end
diff --git a/app/models/housing_review.rb b/app/models/housing_review.rb
index 5025b480..0216c600 100644
--- a/app/models/housing_review.rb
+++ b/app/models/housing_review.rb
@@ -3,4 +3,8 @@ class HousingReview < ApplicationRecord
belongs_to :user, :optional => true
validates :housing_room, presence: true
+
+ def written_at
+ self.created_at.strftime("%B %Y")
+ end
end
diff --git a/app/models/instructor.rb b/app/models/instructor.rb
index 39eb19c3..ccf376d4 100644
--- a/app/models/instructor.rb
+++ b/app/models/instructor.rb
@@ -1,5 +1,6 @@
class Instructor < ApplicationRecord
has_many :course_reviews
+ has_and_belongs_to_many :course_sections
def overall_rating
self.course_reviews&.average(:overall_rating)&.round(2, :truncate) || 0
@@ -16,4 +17,17 @@ def challenge_rating
def work_per_week
self.course_reviews&.average(:work_per_week)&.round(2, :truncate) || 0
end
+
+ def school
+ self.course_sections
+ &.first
+ &.schools
+ &.first
+ end
+
+ def courses
+ self.course_sections
+ &.collect{| section| section.course }
+ &.uniq
+ end
end
diff --git a/app/views/components/_application_header.html.erb b/app/views/components/_application_header.html.erb
index 0417d238..90bf96e2 100644
--- a/app/views/components/_application_header.html.erb
+++ b/app/views/components/_application_header.html.erb
@@ -62,20 +62,26 @@
<%= link_to "Menus", :menus, :class => "navbar-item" %>
-
- <%= link_to "Courses", :courses, :class => "navbar-item" %>
+
+ <%= link_to "Housing", :housing_rooms, :class => "navbar-item" %>
-
+
- Courses
+ Courses
- <%= link_to "Course Planner", :courses, :class => "navbar-item" %>
+
+ <%= link_to "Course Planner", :course_planner, :class => "navbar-item" %>
+
+
+ <%= link_to "Course Reviews", :course_reviews, :class => "navbar-item" %>
+
+
+ <%= link_to "Instructor Reviews", :instructor_reviews, :class => "navbar-item" %>
+
-
-->
-
-
- <%= link_to "Housing", :housing_rooms, :class => "navbar-item" %>
+
diff --git a/app/views/components/_star_review_input.erb b/app/views/components/_star_review_input.erb
index 261786fa..dd5d7ece 100644
--- a/app/views/components/_star_review_input.erb
+++ b/app/views/components/_star_review_input.erb
@@ -2,25 +2,25 @@
-
\ No newline at end of file
diff --git a/app/views/course_review/create.html.erb b/app/views/course_review/create.html.erb
deleted file mode 100644
index 53115d03..00000000
--- a/app/views/course_review/create.html.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-
CourseReview#create
-
Find me in app/views/course_review/create.html.erb
diff --git a/app/views/course_reviews/new.html.erb b/app/views/course_reviews/new.html.erb
new file mode 100644
index 00000000..bfcc1216
--- /dev/null
+++ b/app/views/course_reviews/new.html.erb
@@ -0,0 +1,67 @@
+<% content_for :header do %>
+ <%= render 'components/page_header', :title => "Submit Course Review", :subtitle => "Leave feedback for #{@course.code}: #{@course.name}" %>
+<% end %>
+
+<%= form_with(model: @course_review, local: true) do |form| %>
+ <% if @course_review.errors.any? %>
+
+
The following errors prohibited this review from being submitted:
+
+ <% @course_review.errors.full_messages.each do |message| %>
+
+ <% end %>
+
+ <% end %>
+
+
+ <%= form.label :instructor_id %>
+
+
+ <%= form.select :instructor_id,
+ options_for_select(@course.instructors.collect(&:name).zip @course.instructors.collect(&:id)),
+ :class => "input is-rounded" %>
+
+
+
+
+
+ <%= form.label :overall_rating %>
+
+ <%= render 'components/star_review_input', :id => "course_review[overall_rating]", tag_classes: 'is-medium' %>
+
+
+
+
+ <%= form.label :challenge_rating %>
+
+ <%= render 'components/star_review_input', :id => "course_review[challenge_rating]", tag_classes: 'is-medium' %>
+
+
+
+ <%= form.label :inclusivity_rating %>
+
+ <%= render 'components/star_review_input', :id => "course_review[inclusivity_rating]", tag_classes: 'is-medium' %>
+
+
+
+ <%= form.label :work_per_week %>
+
+
+ <%= form.select :work_per_week, options_for_select((0..20)) %>
+
hours
+
+
+
+ <%= form.label :comments %>
+
+ <%= form.text_area :comments, :class => "textarea", :placeholder => "Your thoughts about the course", :rows => 6 %>
+
+
+ <%= form.hidden_field :course_id, :value => @course.id %>
+ <%= form.submit "Submit", :class => "button is-link margin-bottom-0" %>
+