Team Turing Whiteboard final version

.gitignore

@@ -38,3 +38,6 @@ push*.dat
 
 # Vagrant files
 .vagrant
+
+#postgres
+logfile

.travis.yml

@@ -2,6 +2,10 @@ language: ruby
 
 rvm: 1.9.2
 
+before_install:
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+
 before_script:
   - "psql -c 'create database cmu_education_test;' -U postgres >/dev/null"
   - cp config/amazon_s3.default.yml config/amazon_s3.yml
@@ -24,9 +28,14 @@ env:
 notifications:
   email:
     recipients:
-      - todd.sedano@sv.cmu.edu
-      - rofaida.abdelaal@sv.cmu.edu
+      - emilia.torino@west.cmu.edu
+      - mia.manalastas@sv.cmu.edu
+      - ira.jain@sv.cmu.edu
+      - david.lee@sv.cmu.edu
+      - isil.demir@sv.cmu.edu
+      #- todd.sedano@sv.cmu.edu
+      #- rofaida.abdelaal@sv.cmu.edu
     # on_success: [always|never|change] # default: change
     # on_failure: [always|never|change] # default: always
-    on_success: change
+    on_success: always
     on_failure: always

Gemfile

@@ -93,6 +93,9 @@ group :development, :test do
 #  gem 'autotest-growl' if RUBY_PLATFORM =~ /darwin/
 
 #  gem 'test-unit' #, '1.2.3' #Downgrading so that autotest, rspec will work
+
+# Team Turing: add this for static code analysis
+  gem 'rails_best_practices'
 end
 
 

Gemfile.lock

@@ -52,6 +52,7 @@ GEM
     addressable (2.3.4)
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
+    awesome_print (1.2.0)
     aws-sdk (1.8.5)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
@@ -74,6 +75,9 @@ GEM
       mime-types (~> 1.16)
       orm_adapter (~> 0.0.5)
     cocaine (0.2.0)
+    code_analyzer (0.4.3)
+      sexp_processor
+    colored (1.2)
     columnize (0.3.6)
     daemons (1.1.9)
     delayed_job (2.1.4)
@@ -182,6 +186,15 @@ GEM
       activesupport (= 3.0.20)
       bundler (~> 1.0)
       railties (= 3.0.20)
+    rails_best_practices (1.14.4)
+      activesupport
+      awesome_print
+      code_analyzer (>= 0.4.3)
+      colored
+      erubis
+      i18n
+      require_all
+      ruby-progressbar
     railties (3.0.20)
       actionpack (= 3.0.20)
       activesupport (= 3.0.20)
@@ -192,6 +205,7 @@ GEM
     rdoc (3.12.2)
       json (~> 1.4)
     recaptcha (0.3.5)
+    require_all (1.3.1)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rmagick (2.13.2)
@@ -221,6 +235,7 @@ GEM
     ruby-openid (2.2.3)
     ruby-openid-apps-discovery (1.2.0)
       ruby-openid (>= 2.1.7)
+    ruby-progressbar (1.2.0)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
     rubyzip (0.9.9)
@@ -231,6 +246,7 @@ GEM
       rubyzip
       websocket (~> 1.0.4)
     sequel (3.20.0)
+    sexp_processor (4.4.0)
     shoulda (3.4.0)
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (~> 1.0, >= 1.4.1)
@@ -299,6 +315,7 @@ DEPENDENCIES
   pg
   rack-google_analytics
   rails (= 3.0.20)
+  rails_best_practices
   rake (= 0.8.7)
   rdoc
   recaptcha

app/controllers/deliverables_controller.rb

@@ -16,6 +16,7 @@ def index
   end
 
   def grading_queue_for_course
+
     @course = Course.find(params[:course_id])
 
     if @course.grading_rule.nil?
@@ -26,12 +27,39 @@ def grading_queue_for_course
       flash.now[:error] = I18n.t(:default_grading_rule_for_course)
     end
 
-    if (current_user.is_admin? || @course.faculty.include?(current_user))
+    # Retrieving assignments names for the course to be able to filter by deliverable name later on.
+    @assignments = Assignment.where(:course_id => @course.id).all.sort_by(&:task_number)
+
+    if current_user.is_admin?
+
       @deliverables = Deliverable.where(:course_id => @course.id).all
+
+    elsif @course.faculty.include?(current_user)
+
+      # Get all deliverables for this team/student
+      @deliverables = Deliverable.get_deliverables(params[:course_id], current_user.id, {:is_my_team => 1})
+
+      # Select all that are ungraded or drafted
+      @deliverables = @deliverables.select { |deliverable| deliverable.get_grade_status == :ungraded ||
+          deliverable.get_grade_status == :drafted }
+
+      # Sort by task number
+      @deliverables = @deliverables.sort { |a, b| a.assignment.task_number <=> b.assignment.task_number }
+
     else
       has_permissions_or_redirect(:admin, root_path)
     end
+
+  end
+
+  # Beg Team Turing
+  def get_deliverables
+    @deliverables = filter_deliverables(params[:course_id], params[:filter_options])
+    respond_to do |format|
+      format.js
+    end
   end
+  # End Team Turing
 
   #temporary for mel
   def team_index_for_course
@@ -96,8 +124,13 @@ def show
     end
 
     respond_to do |format|
-      format.html # show.html.erb
-      format.xml { render :xml => @deliverable }
+      if (current_user.is_admin? || @course.faculty.include?(current_user))
+        format.html { render layout: false }
+      else
+        format.html # show.html.erb
+        format.xml { render :xml => @deliverable }
+      end
+
     end
   end
 
@@ -279,20 +312,32 @@ def update_feedback
       is_student_visible=false
     end
 
-    flash[:error] = @deliverable.update_grade(params, is_student_visible)
+    # Beg chg Turing Ira
+    flash[:error] = @deliverable.update_grade(params, is_student_visible, current_user.id)
+    # End chg Turing Ira
+    # Begin Add Team Turing
+    other_email = nil
+    if params[:send_copy_to_myself] == "1"
+      other_email = current_user.email
+    end
+    # End Add Team Turing
     if @deliverable.update_feedback_and_notes(params[:deliverable])
-      if is_student_visible==true
-        @deliverable.send_deliverable_feedback_email(url_for(@deliverable))
+      if is_student_visible == true
+        @deliverable.send_deliverable_feedback_email(url_for(@deliverable), other_email)
       end
     else
       flash[:error] << 'Unable to save feedback'
     end
 
+    #Obtain current selected filters to update the queue accordingly
+    @selected_filter_options = JSON.parse(params[:deliverable][:current_filter_options])
+    @deliverables = filter_deliverables(@deliverable.course_id, @selected_filter_options)
+
     respond_to do |format|
        if flash[:error].blank?
          flash[:error] = nil
          flash[:notice] = 'Feedback successfully saved.'
-         format.html {redirect_to(course_deliverables_path(@deliverable.course))}
+         format.js
        else
          flash[:error] = flash[:error].join("<br>")
          format.html { redirect_to(@deliverable) }
@@ -313,4 +358,53 @@ def get_assignments_for_student
     end
   end
 
+
+  # Beg Team Turing
+  private
+  def filter_deliverables (course_id, filter_options)
+    @course = Course.find_by_id(course_id)
+
+    # Prepare filter options according to what users select on the page
+    options = {}
+    if filter_options[:search_box] != ""
+      options[:search_string] = filter_options[:search_box]
+    end
+
+    if filter_options['is_my_teams'] == 'yes'
+      options[:is_my_team] = 1
+    else
+      options[:is_my_team] = 0
+    end
+
+
+    # Filter in the model by course, professor, my teams and search input
+    @deliverables = []
+    @faculty_deliverables = Deliverable.get_deliverables(course_id, current_user.id, options)
+
+    # Filter once again according to the selected grading options. If no filter options are selected,
+    # display every deliverable
+    @selected_options = []
+    filter_options.collect do |filter_option|
+      @selected_options << filter_option[0].to_sym if filter_option[1] == "1"
+    end
+    if @selected_options.size == 0
+      @deliverables = @faculty_deliverables
+    else
+      @selected_options.each do  |option|
+        @deliverables.concat(@faculty_deliverables.select { |deliverable| deliverable.get_grade_status == option })
+      end
+    end
+
+    # Filter by assignment names in drop down menu
+    unless filter_options["assignment_id"] == '-1'
+      @deliverables = @deliverables.select{ |deliverable| deliverable.assignment_id == filter_options[
+          "assignment_id"].to_i }
+    end
+
+    # Sort by task number, ascending
+    @deliverables = @deliverables.sort { |a, b| a.assignment.task_number <=> b.assignment.task_number }
+  end
+  # End Team Turing
+
 end
+

app/controllers/grades_controller.rb

@@ -74,19 +74,36 @@ def student_deliverables_and_grades_for_course
 
   def post_drafted_and_send #and send email
     grades = params["grades"]
-    Grade.mail_drafted_grade(@course.id, request.host_with_port )
+    # Begin Add Team Turing
+    other_email = nil
+    if params[:send_copy_to_myself] == "1"
+      other_email = current_user.email
+    end
+    Grade.mail_drafted_grade(@course.id, request.host_with_port, other_email)
+    # End Add Team Turing
+    #Grade.mail_drafted_grade(@course.id, request.host_with_port ) # Delete Team Turing
     render :json => ({"message"=>"true"})
   end
 
   def save
     grades = params["grades"]
-    Grade.give_grades(grades)
+    #Beg add Turing
+    #Grade.give_grades(grades)
+    Grade.give_grades(grades,current_user.id)
+    # End add Turing
     render :json => ({"message"=>"true"})
   end
 
   def send_final_grade
     grades = params["grades"]
-    Grade.mail_final_grade(@course.id, request.host_with_port)
+    # Begin Add Team Turing
+    other_email = nil
+    if params[:send_copy_to_myself] == "1"
+      other_email = current_user.email
+    end
+    Grade.mail_final_grade(@course.id, request.host_with_port, other_email)
+    # End Add Team Turing
+    #Grade.mail_final_grade(@course.id, request.host_with_port)  # Delete Team Turing
     render :json => ({"message"=>"true"})
   end