diff --git a/ruby/lib/jam_ruby/models/teacher_experience.rb b/ruby/lib/jam_ruby/models/teacher_experience.rb index e544b9ea2..1b311886a 100644 --- a/ruby/lib/jam_ruby/models/teacher_experience.rb +++ b/ruby/lib/jam_ruby/models/teacher_experience.rb @@ -3,7 +3,8 @@ module JamRuby include HtmlSanitize html_sanitize strict: [:name, :organization] belongs_to :teacher, :class_name => "JamRuby::Teacher" - + attr_accessible :name, :experience_type, :organization, :start_year, :end_year + scope :teaching, where(experience_type: 'teaching') scope :education, where(experience_type: 'education') scope :awards, where(experience_type: 'award') diff --git a/web/app/assets/javascripts/react-components/TeacherExperienceEditableList.js.jsx.coffee b/web/app/assets/javascripts/react-components/TeacherExperienceEditableList.js.jsx.coffee index 091b440af..650f79e89 100644 --- a/web/app/assets/javascripts/react-components/TeacherExperienceEditableList.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/TeacherExperienceEditableList.js.jsx.coffee @@ -25,7 +25,6 @@ logger = context.JK.logger e.preventDefault() logger.debug("addExperience", this.props.listItems, this.props) $form = e.target - formValues = $(":input", $form).formToObject() this.props.listItems.push { name: $("[name='title_input']", $form).val() organization: $("[name='organization_input']", $form).val() diff --git a/web/app/assets/javascripts/react-components/TeacherSetupExperience.js.jsx.coffee b/web/app/assets/javascripts/react-components/TeacherSetupExperience.js.jsx.coffee index 72e39587c..51800cf6c 100644 --- a/web/app/assets/javascripts/react-components/TeacherSetupExperience.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/TeacherSetupExperience.js.jsx.coffee @@ -22,9 +22,9 @@ rest = window.JK.Rest() teacher = changes.teacher this.setState({ #validate_basics: true, - experience_teaching: teacher.experience_teaching - experience_education: teacher.experience_education - experience_award: teacher.experience_award + experiences_teaching: teacher.experiences_teaching + experiences_education: teacher.experiences_education + experiences_award: teacher.experiences_award }) captureFormState: (changes) -> @@ -54,7 +54,7 @@ rest = window.JK.Rest() handleListChange: (listName, listObjects)-> logger.debug("EXPERIENCE handleListChange:", listName, listObjects) this.setState({ - "experience_#{listName}": listObjects + "experiences_#{listName}": listObjects }) #this.forceUpdate() @@ -66,17 +66,17 @@ rest = window.JK.Rest() `
- +
- +
- +
diff --git a/web/app/assets/javascripts/react-components/YearSelect.js.jsx.coffee b/web/app/assets/javascripts/react-components/YearSelect.js.jsx.coffee index 3b48034f1..3cd223d16 100644 --- a/web/app/assets/javascripts/react-components/YearSelect.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/YearSelect.js.jsx.coffee @@ -18,7 +18,7 @@ logger = context.JK.logger for yr in [1901..now] options.push `` - ` {options} ` }) \ No newline at end of file diff --git a/web/app/views/api_teachers/detail.rabl b/web/app/views/api_teachers/detail.rabl index 57cd5ce70..69c14b81e 100644 --- a/web/app/views/api_teachers/detail.rabl +++ b/web/app/views/api_teachers/detail.rabl @@ -48,7 +48,7 @@ node :languages do @teacher.languages.collect{|o|o.id} end -node :experience_teaching do +node :experiences_teaching do @teacher.experiences_teaching.collect do |o| { name: o.name, @@ -60,7 +60,7 @@ node :experience_teaching do end # collect end -node :experience_education do +node :experiences_education do @teacher.experiences_education.collect do |o| { name: o.name, @@ -72,7 +72,7 @@ node :experience_education do end # collect end -node :experience_award do +node :experiences_award do @teacher.experiences_award.collect do |o| { name: o.name,