completes #62 - merges live_coder_text into live_coder
This commit is contained in:
@ -36,37 +36,12 @@ class AnswerFormatValidator < ActiveModel::EachValidator
|
||||
record.errors[attribute] << (options[:message] || live_code_error_message(value))
|
||||
end
|
||||
|
||||
def live_code_text record, attribute, value
|
||||
return if value.present? && live_code_text_value_check(value)
|
||||
|
||||
record.errors[attribute] << (options[:message] || live_code_text_error_message(value))
|
||||
end
|
||||
|
||||
#################################
|
||||
|
||||
def live_code_text_error_message value
|
||||
return 'You must write code in one of the above textareas to progress.' if value.nil?
|
||||
|
||||
code_present = value.values_at(:html, :css, :js).join.present?
|
||||
reason_present = value[:text].present?
|
||||
later_present = value.keys.count == 1
|
||||
return 'Please check that you will come back to complete the code example.' if later_present
|
||||
return 'You must write code in one of the above textareas to progress.' unless code_present
|
||||
return 'You must provide an answer in the reason field.' unless reason_present
|
||||
end
|
||||
|
||||
def live_code_error_message value
|
||||
if value.present? && value.keys.count == 1
|
||||
return "Please check that you will come back to complete the code example."
|
||||
end
|
||||
"You must write code in one of the above textareas to progress."
|
||||
end
|
||||
|
||||
def live_code_text_value_check value
|
||||
later_present = value[:later].present? && value.keys.count == 1
|
||||
code_present = value.values_at(:html, :css, :js).join.present?
|
||||
reason_present = value[:text].present?
|
||||
|
||||
later_present || (code_present && reason_present)
|
||||
"You must write comments or code in one of the textareas to progress."
|
||||
end
|
||||
end
|
||||
|
Reference in New Issue
Block a user