Skip to content

Commit

Permalink
use summarize_for_lesson_edit where possible
Browse files Browse the repository at this point in the history
  • Loading branch information
davidsbailey committed Nov 3, 2020
1 parent 4c45389 commit 6a22030
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions dashboard/app/models/activity_section.rb
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ def summarize_for_lesson_show
summary
end

def summarize_for_edit
def summarize_for_lesson_edit
summary = summarize
summary[:scriptLevels] = script_levels.map(&:summarize_for_edit)
summary[:scriptLevels] = script_levels.map(&:summarize_for_lesson_edit)
summary
end

Expand Down
2 changes: 1 addition & 1 deletion dashboard/app/models/lesson.rb
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ def summarize_for_lesson_edit
purpose: purpose,
preparation: preparation,
announcements: announcements,
activities: lesson_activities.map(&:summarize_for_edit),
activities: lesson_activities.map(&:summarize_for_lesson_edit),
resources: resources,
objectives: objectives.map(&:summarize_for_edit)
}
Expand Down
4 changes: 2 additions & 2 deletions dashboard/app/models/lesson_activity.rb
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ def summarize_for_lesson_show
summary
end

def summarize_for_edit
def summarize_for_lesson_edit
summary = summarize
summary[:activitySections] = activity_sections.map(&:summarize_for_edit)
summary[:activitySections] = activity_sections.map(&:summarize_for_lesson_edit)
summary
end

Expand Down
2 changes: 1 addition & 1 deletion dashboard/app/models/script_level.rb
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ def summarize_for_lesson_show
summary
end

def summarize_for_edit
def summarize_for_lesson_edit
summary = summarize(for_edit: true)
summary[:id] = id
summary[:activitySectionPosition] = activity_section_position
Expand Down
8 changes: 4 additions & 4 deletions dashboard/test/controllers/lessons_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ class LessonsControllerTest < ActionController::TestCase
assessment: true
)

existing_summary = existing_script_level.summarize_for_edit
existing_summary = existing_script_level.summarize_for_lesson_edit
assert_equal 1, existing_summary[:activitySectionPosition]
assert_equal existing_survey.id, existing_summary[:activeId]
existing_summary[:assessment] = false
Expand Down Expand Up @@ -624,7 +624,7 @@ class LessonsControllerTest < ActionController::TestCase
# sl 2
# activity 2
# section 2
activities_data = @lesson.lesson_activities.map(&:summarize_for_edit)
activities_data = @lesson.lesson_activities.map(&:summarize_for_lesson_edit)
assert_equal 2, activities_data.count
script_level_data = activities_data.last[:activitySections].first[:scriptLevels].pop
script_level_data[:activitySectionPosition] = 2
Expand Down Expand Up @@ -680,7 +680,7 @@ class LessonsControllerTest < ActionController::TestCase
# section 2
# sl 2
# sl 1
activities_data = @lesson.lesson_activities.map(&:summarize_for_edit)
activities_data = @lesson.lesson_activities.map(&:summarize_for_lesson_edit)
assert_equal 2, activities_data.count
script_level_data = activities_data.first[:activitySections].first[:scriptLevels].pop
script_level_data[:activitySectionPosition] = 2
Expand Down Expand Up @@ -723,7 +723,7 @@ class LessonsControllerTest < ActionController::TestCase
end
sl_ids = section.script_levels.map(&:id)

script_levels_data = section.script_levels.map(&:summarize_for_edit)
script_levels_data = section.script_levels.map(&:summarize_for_lesson_edit)
assert_equal 3, script_levels_data.count

@update_params['activities'] = [
Expand Down

0 comments on commit 6a22030

Please sign in to comment.