Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "use script id to find teacher feedback script level" #38855

Merged
merged 1 commit into from
Feb 2, 2021
Merged

Revert "use script id to find teacher feedback script level" #38855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 2 additions & 11 deletions dashboard/app/controllers/teacher_feedbacks_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,14 @@ class TeacherFeedbacksController < ApplicationController
# Feedback from any verified teacher who has provided feedback to the current
# student on any level
def index
scope = {
level: {
script_levels: {
lesson: :script
}
}
}
@feedbacks_as_student = @teacher_feedbacks.order(created_at: :desc).includes(scope).select do |feedback|
@feedbacks_as_student = @teacher_feedbacks.order(created_at: :desc).includes(script_level: {lesson: :script}).select do |feedback|
UserPermission.where(
user_id: feedback.teacher_id,
permission: 'authorized_teacher'
)
end

@feedbacks_as_student_with_level_info = @feedbacks_as_student.map do |feedback|
feedback.attributes.merge(feedback&.get_script_level&.summary_for_feedback)
end
@feedbacks_as_student_with_level_info = @feedbacks_as_student.map {|feedback| feedback.attributes.merge(feedback&.script_level&.summary_for_feedback)}
end

def set_seen_on_feedback_page_at
Expand Down
6 changes: 0 additions & 6 deletions dashboard/app/models/teacher_feedback.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,6 @@ def validate_script_and_script_level
end
end

# Finds the script level associated with this object, using script id and
# level id.
def get_script_level
level.script_levels.find {|sl| sl.script_id == script_id}
end

def self.get_student_level_feedback(student_id, level_id, teacher_id)
where(
student_id: student_id,
Expand Down
31 changes: 0 additions & 31 deletions dashboard/test/controllers/teacher_feedbacks_controller_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ class TeacherFeedbacksControllerTest < ActionController::TestCase
sign_in student
get :index
assert_response :success

all_feedback_data = get_all_response_feedback_data
assert_equal 0, all_feedback_data.count
end

test 'index: returns success if signed in user - feedback' do
Expand All @@ -24,33 +21,5 @@ class TeacherFeedbacksControllerTest < ActionController::TestCase
sign_in feedback.student
get :index
assert_response :success

all_feedback_data = get_all_response_feedback_data
assert_equal 1, all_feedback_data.count
assert_equal feedback.student.id, all_feedback_data.first['student_id']
end

test 'index returns many feedbacks' do
student = create :student
5.times do
create :teacher_feedback, student: student
end
assert_equal TeacherFeedback.all.count, 5
sign_in student
assert_queries 20 do
get :index
assert_response :success
end

all_feedback_data = get_all_response_feedback_data
assert_equal 5, all_feedback_data.count
end

private

def get_all_response_feedback_data
assert_select 'script[data-feedback]', 1
feedback_data = JSON.parse(css_select('script[data-feedback]').first.attribute('data-feedback').to_s)
feedback_data['all_feedback']
end
end