Skip to content

Commit

Permalink
Merge 2d07f57 into 9860352
Browse files Browse the repository at this point in the history
  • Loading branch information
rahuja910 committed Oct 31, 2015
2 parents 9860352 + 2d07f57 commit 1ecc1c0
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 247 deletions.
13 changes: 1 addition & 12 deletions app/controllers/review_mapping_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class ReviewMappingController < ApplicationController
autocomplete :user, :name
#use_google_charts
require 'gchart'
helper :dynamic_review_assignment
#helper :dynamic_review_assignment
helper :submitted_content

def action_allowed?
Expand Down Expand Up @@ -73,17 +73,6 @@ def add_reviewer
redirect_to :action => 'list_mappings', :id => assignment.id, :msg => msg
end

# Get all the available submissions
def show_available_submissions
assignment = Assignment.find(params[:assignment_id])
reviewer = AssignmentParticipant.where(user_id: params[:reviewer_id], parent_id: assignment.id).first
requested_topic_id = params[:topic_id]
@available_submissions = Hash.new
@available_submissions = DynamicReviewAssignmentHelper::review_assignment(assignment.id ,
reviewer.id,
requested_topic_id ,
Assignment::RS_STUDENT_SELECTED)
end
def add_quiz_response_map
if ResponseMap.where(reviewed_object_id: params[:questionnaire_id], reviewer_id: params[:participant_id]).first
flash[:error] = "You have already taken that quiz"
Expand Down
114 changes: 0 additions & 114 deletions app/helpers/dynamic_quiz_assignment_helper.rb

This file was deleted.

121 changes: 0 additions & 121 deletions app/helpers/dynamic_review_assignment_helper.rb

This file was deleted.

0 comments on commit 1ecc1c0

Please sign in to comment.