Skip to content

Commit

Permalink
Merge pull request #19945 from code-dot-org/include-can-pay
Browse files Browse the repository at this point in the history
include 'can pay fee'  from principal approval in detail view
  • Loading branch information
Hamms committed Jan 12, 2018
2 parents 2d2c654 + 9107f2c commit b9840e6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ def on_successful_create
diversity_recruitment: principal_response.values_at(:committed_to_diversity, :committed_to_diversity_other).compact.join(" "),
free_lunch_percent: principal_response[:free_lunch_percent],
underrepresented_minority_percent: @application.underrepresented_minority_percent.to_s,
wont_replace_existing_course: principal_response.values_at(:replace_course, :replace_course_other).compact.join(" ")
wont_replace_existing_course: principal_response.values_at(:replace_course, :replace_course_other).compact.join(" "),
can_pay_fee: principal_response[:pay_fee]
}
)
teacher_application.save
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ class PrincipalApprovalApplicationsControllerTest < ::ActionController::TestCase
diversity_recruitment: 'Yes',
free_lunch_percent: '50%',
underrepresented_minority_percent: '52.0',
wont_replace_existing_course: Pd::Application::PrincipalApproval1819Application.options[:replace_course][1]
wont_replace_existing_course: Pd::Application::PrincipalApproval1819Application.options[:replace_course][1],
can_pay_fee: 'Yes, my school or my teacher will be able to pay the full summer workshop program fee.'
}
actual_principal_fields = @teacher_application.sanitize_form_data_hash.select do |k, _|
expected_principal_fields.keys.include? k
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,8 @@ def self.clean_multiline(string)
wont_replace_existing_course: 'Will this replace an existing CS course?',
diversity_recruitment: 'Principal has committed to recruiting diverse students',
free_lunch_percent: 'Percent of students that receive free/reduced lunch',
underrepresented_minority_percent: 'Percent of students that are underrepresented minorities'
underrepresented_minority_percent: 'Percent of students that are underrepresented minorities',
can_pay_fee: 'Can the school or teacher pay the summer workshop program fee?'
}
}.freeze

Expand Down

0 comments on commit b9840e6

Please sign in to comment.