Staged: The main working branch of Team NapTime

.gitignore

@@ -2,6 +2,8 @@
 db/*.sqlite3
 log/*.log
 tmp/
+*.swp
+tmpdir/
 
 .gems
 20090827190915_mfse_add_people.rb
@@ -14,8 +16,6 @@ config/systems.cc.yml.yml
 config/systems.yml
 config/active_directory.yml
 
-*dump
-
 coverage/*
 nbproject/*
 .idea/*

.travis.yml

@@ -2,6 +2,12 @@ language: ruby
 
 rvm: 1.9.2
 
+branches:
+  only:
+    - master
+    - staged
+
+
 before_script:
   - "psql -c 'create database cmu_education_test;' -U postgres >/dev/null"
   - cp config/amazon_s3.default.yml config/amazon_s3.yml
@@ -24,8 +30,11 @@ env:
 notifications:
   email:
     recipients:
-      - [email protected]
-      - [email protected]
+      - [email protected]
+      - [email protected]
+      - [email protected]
+      - [email protected]
+      - [email protected]
     # on_success: [always|never|change] # default: change
     # on_failure: [always|never|change] # default: always
     on_success: change

Gemfile

@@ -54,7 +54,6 @@ gem 'vpim'  # user for exporting contacts to vCard and iCalendar support
 gem 'seedbank'
 gem 'spreadsheet'
 
-
 group :production do
   gem 'thin'
   gem "daemons", "~> 1.1.4" #this is used by heroku on 7/18/2011
@@ -85,6 +84,7 @@ group :development, :test do
   gem 'jasmine'
   gem 'launchy'
   gem 'ladle', '~> 0.2.0'
+  gem 'selenium-webdriver'
 
 #  gem 'morning_glory'
 
@@ -93,8 +93,18 @@ group :development, :test do
 #  gem 'autotest-growl' if RUBY_PLATFORM =~ /darwin/
 
 #  gem 'test-unit' #, '1.2.3' #Downgrading so that autotest, rspec will work
+
+
+  gem 'database_cleaner'
 end
 
 
 
 #gem 'gchartrb'
+
+
+
+gem 'strong_parameters'
+
+gem 'cocaine', '0.3.2'
+

Gemfile.lock

@@ -73,9 +73,10 @@ GEM
     ckeditor (3.6.3)
       mime-types (~> 1.16)
       orm_adapter (~> 0.0.5)
-    cocaine (0.2.0)
+    cocaine (0.3.2)
     columnize (0.3.6)
     daemons (1.1.9)
+    database_cleaner (1.2.0)
     delayed_job (2.1.4)
       activesupport (~> 3.0)
       daemons
@@ -242,6 +243,10 @@ GEM
       rack (>= 1.0)
     spreadsheet (0.8.3)
       ruby-ole (>= 1.0)
+    strong_parameters (0.2.1)
+      actionpack (~> 3.0)
+      activemodel (~> 3.0)
+      railties (~> 3.0)
     taps (0.3.24)
       rack (>= 1.0.1)
       rest-client (>= 1.4.0, < 1.7.0)
@@ -280,7 +285,9 @@ DEPENDENCIES
   cancan
   capybara (= 1.1.1)
   ckeditor (= 3.6.3)
+  cocaine (= 0.3.2)
   daemons (~> 1.1.4)
+  database_cleaner
   delayed_job (= 2.1.4)
   devise
   exception_notification
@@ -307,8 +314,10 @@ DEPENDENCIES
   ruby-debug-base19x
   ruby-debug-ide
   seedbank
+  selenium-webdriver
   shoulda
   spreadsheet
+  strong_parameters
   taps
   thin
   vestal_versions!

app/controllers/application_controller.rb

@@ -50,10 +50,12 @@ def current_person
   end
 
 ##  In development, if you want to pretend to be a different user, you can set it easily here
-#  def current_user
-#    User.find_by_id 725 #Cecile
-##    User.last
-#  end
+  #def current_user
+    #User.find_by_id 725 #Cecile
+    #User.last
+    #User.find_by_twiki_name("EdKatz")
+    #User.find_by_human_name "Todd Sedano"
+  #end
 
   def authenticate_user!
     if !current_user

app/controllers/courses_controller.rb

@@ -65,8 +65,9 @@ def index_for_semester
   # GET /courses/1.xml
   def show
     @course = Course.find(params[:id])
-    first_version_of_course = Course.first_offering_for_course_name(@course.name)
-    @whiteboard_curriculum_page = first_version_of_course.pages[0] if first_version_of_course.pages.present?
+    if @course.curriculum_url && @course.curriculum_url.include?("whiteboard.sv.cmu.edu/pages/")
+      @whiteboard_curriculum_page = Page.where(:url => @course.curriculum_url.split("/pages/")[1]).first
+    end
 
     teams = Team.where(:course_id => params[:id])
 

app/controllers/deliverables_controller.rb

@@ -17,6 +17,9 @@ def index
 
   def grading_queue_for_course
     @course = Course.find(params[:course_id])
+    team_array  = Array.new
+    individuals_array = Array.new
+    individual_attachments = Array.new
 
     if @course.grading_rule.nil?
       flash[:error] = I18n.t(:no_grading_rule_for_course)
@@ -27,7 +30,41 @@ def grading_queue_for_course
     end
 
     if (current_user.is_admin? || @course.faculty.include?(current_user))
-      @deliverables = Deliverable.where(:course_id => @course.id).all
+
+      # Get teams where current user is assigned as the Primary faculty
+      #
+      @my_teams = Team.where(:primary_faculty_id => current_user.id)
+      @my_teams.each do |team|
+        team_array << team[:id]
+      end
+
+      # Get the individual members of these teams
+      #
+      @my_individuals = TeamAssignment.where(:team_id => team_array)
+      @my_individuals.each do |ind|
+        individuals_array << ind[:user_id]
+      end
+      # Current user Admin or Faculty with no teams assigned
+      if (current_user.is_admin? ||
+          ((@course.faculty.include?(current_user) && team_array.empty?)))
+        @deliverables = Deliverable.where(:course_id => @course.id).all
+         @all_team_deliverables = Deliverable.where(:course_id=>@course.id).all
+      elsif (@course.faculty.include?(current_user) && !team_array.empty?)
+        # Get Team deliverables
+        @team_deliverables = Deliverable.where(:course_id => @course.id,
+                  :team_id => team_array)
+        # Get deliverables where attachments are submitted by individual members of the team
+        @ind_del_attachments = DeliverableAttachment.where(:submitter_id => individuals_array)
+        @ind_del_attachments.each do |ind_attach|
+          individual_attachments << ind_attach[:deliverable_id]
+          @all_team_deliverables = Deliverable.where(:course_id=>@course.id).all
+        end
+        # Get individual deliverables
+        @ind_deliverables = Deliverable.where(:course_id => @course.id,
+                            :id => individual_attachments, :team_id => nil)
+        # All
+        @deliverables = @team_deliverables + @ind_deliverables
+      end
     else
       has_permissions_or_redirect(:admin, root_path)
     end
@@ -293,9 +330,11 @@ def update_feedback
          flash[:error] = nil
          flash[:notice] = 'Feedback successfully saved.'
          format.html {redirect_to(course_deliverables_path(@deliverable.course))}
+         format.js { render :nothing => true, :status => 200 }
        else
          flash[:error] = flash[:error].join("<br>")
          format.html { redirect_to(@deliverable) }
+         format.js { render :json => flash[:error] }
        end
     end
   end
@@ -313,4 +352,11 @@ def get_assignments_for_student
     end
   end
 
-end
+  def dropdown
+    @deliverable = Deliverable.find(params[:id])
+    @course = @deliverable.course
+    @hostname_with_port = request.host_with_port
+    render 'dropdown', :layout => false
+  end
+
+  end

app/controllers/effort_log_line_items_controller.rb

@@ -50,7 +50,7 @@ def edit
   # POST /effort_log_line_items
   # POST /effort_log_line_items.xml
   def create
-    @effort_log_line_item = EffortLogLineItem.new(params[:effort_log_line_item])
+    @effort_log_line_item = EffortLogLineItem.new(elli_params)
 
     respond_to do |format|
       if @effort_log_line_item.save
@@ -70,7 +70,7 @@ def update
     @effort_log_line_item = EffortLogLineItem.find(params[:id])
 
     respond_to do |format|
-      if @effort_log_line_item.update_attributes(params[:effort_log_line_item])
+      if @effort_log_line_item.update_attributes(elli_params)
         flash[:notice] = 'EffortLogLineItem was successfully updated.'
         format.html { redirect_to(@effort_log_line_item) }
         format.xml { head :ok }
@@ -97,4 +97,10 @@ def destroy
   def redirect_to_effort_log_index
     redirect_to :controller => :effort_logs, :action => :index
   end
+
+  private
+  def elli_params
+    params.require(:effort_log_line_items).permit(:day1, :day2, :day3, :day4, :day5, :day6, :day7)
+  end
+
 end

app/controllers/effort_logs_controller.rb

@@ -310,7 +310,7 @@ def edit
   # POST /effort_logs
   # POST /effort_logs.xml
   def create
-    @effort_log = EffortLog.new(params[:effort_log])
+    @effort_log = EffortLog.new(effort_log_params)
 
     setup_required_datastructures(@effort_log.year, @effort_log.week_number)
 
@@ -349,7 +349,7 @@ def update
     setup_required_datastructures(@effort_log.year, @effort_log.week_number)
 
     respond_to do |format|
-      if @effort_log.update_attributes(params[:effort_log])
+      if @effort_log.update_attributes(effort_log_params)
         #check to see if user is logging effort for unregistered courses
         course_error_msg = @effort_log.validate_effort_against_registered_courses()
         flash[:notice] = 'EffortLog was successfully updated.'
@@ -424,5 +424,9 @@ def recent_foundations_or_course
     Course.order("id DESC").first
   end
 
+  private
+  def effort_log_params
+    params.require(:effort_log).permit(:user_id, :week_number, :year)
+  end
 
 end

app/controllers/jobs_controller.rb

@@ -27,8 +27,9 @@ def edit
   # POST /jobs
   def create
     authorize! :create, Job
-    params[:job][:supervisors_override] = params[:supervisors]
-    params[:job][:employees_override] = params[:students]
+    params[:job][:supervisors_override] = supervisors_params
+    params[:job][:employees_override] = []
+    params[:job][:employees_override] = students_params if params[:students]
     @job = Job.new(params[:job])
     @projects = SponsoredProject.current
 
@@ -44,8 +45,9 @@ def create
   # PUT /jobs/1
   # PUT /jobs/1.xml
   def update
-    params[:job][:supervisors_override] = params[:supervisors]
-    params[:job][:employees_override] = params[:students]
+    params[:job][:supervisors_override] = supervisors_params
+    params[:job][:employees_override] = []
+    params[:job][:employees_override] = students_params if params[:students]
     @job = Job.find(params[:id])
     authorize! :update, @job
     if  params[:job][:is_closed].present? && params[:job][:is_closed] == "true"
@@ -67,5 +69,22 @@ def assignments
     @jobs = Job.active
     @all_employees = Job.all_employees
   end
+
+  private
+    def supervisors_params
+      params.require(:supervisors)
+    end
+
+    def supervisor_params(supervisor)
+      supervisor.permit(:people_name)
+    end
+
+    def students_params
+      params.require(:students)
+    end
+
+    def student_params(student)
+      student.permit(:people_name)
+    end
 
 end

app/models/deliverable.rb

@@ -261,9 +261,17 @@ def update_feedback_and_notes (params)
   # To update the grade received by the student
   def update_grade (params, is_student_visible)
     error_msg = []
+
     if self.assignment.is_team_deliverable?
-      self.team.members.each do |user|
+      self.team.members.each_with_index do |user, i|
         score = params[:"#{user.id}"]
+
+        # begin
+        #   Grade.give_grade(self.course_id, self.assignment.id, user.id, score, is_student_visible)
+        # rescue Exception => e
+        #   raise Exception.new([e,self.course_id, self.assignment.id, user.id, score, is_student_visible].join(', '))
+        # end
+
         if Grade.give_grade(self.course_id, self.assignment.id, user.id, score, is_student_visible)==false
           error_msg << "Grade given to " + user.human_name + " is invalid!"
         end
@@ -312,7 +320,7 @@ def get_grade_status
 
   #Todo: rename get_status_for_every_individual to status_for_every_individual
   # To get the status of deliverable by student for is it graded or not.
-  def get_status_for_every_individual  (student_id)
+  def get_status_for_every_individual (student_id)
     return :unknonwn if self.assignment.nil? #(guard for old deliverables)
     grade = Grade.get_grade(self.course.id, self.assignment.id, student_id)
     if grade.nil?
@@ -334,4 +342,12 @@ def inaccurate_course_and_assignment_check
       end
     end
   end
+
+  def get_grading_date
+    if self.get_grade_status!=:graded
+      return nil
+    end
+    grade=Grade.get_grade(self.course.id, self.assignment.id, self.creator_id)
+    return grade.updated_at
+  end
 end

app/models/effort_log.rb

@@ -1,4 +1,6 @@
 class EffortLog < ActiveRecord::Base
+  include ActiveModel::ForbiddenAttributesProtection
+
   has_many :effort_log_line_items, :dependent => :destroy
   belongs_to :user
 

app/models/effort_log_line_item.rb

@@ -1,4 +1,5 @@
 class EffortLogLineItem < ActiveRecord::Base
+  include ActiveModel::ForbiddenAttributesProtection
   acts_as_list :scope => :effort_log
 
   belongs_to :effort_log