remove field from teacher recommendation

jmabry111 · Jan 19, 2016 · a4000b3 · a4000b3
1 parent ed24930
commit a4000b3
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/app/models/teacher_recommendation.rb b/app/models/teacher_recommendation.rb
@@ -13,16 +13,14 @@ class TeacherRecommendation < ActiveRecord::Base
   validates :recommendation, presence:true
   validates :self_discipline, presence:true
   validates :study_skills, presence:true
-  validates :teamwork, presence:true
+#  validates :teamwork, presence:true
   validates :time_management, presence:true
   validates :work_ethic, presence:true
 
 
   def total_score
       if self.aptitude != nil
-      total_score = aptitude + dedication + desire + inquiry_skills + interaction + persistence + 
-                  problem_solving + recommendation + self_discipline + study_skills + teamwork + 
-                  time_management + work_ethic
+      total_score = aptitude + dedication + desire + inquiry_skills + interaction + persistence + problem_solving + recommendation + self_discipline + study_skills + time_management + work_ethic
       end
   end
 

diff --git a/app/views/coordinator/teacher_recommendations/new.html.erb b/app/views/coordinator/teacher_recommendations/new.html.erb
@@ -22,7 +22,9 @@
 				<%= f.input :inquiry_skills, :collection => ["1","2","3","4","5"], :as => :radio_buttons, :item_wrapper_class => :inline %>
 				<%= f.input :study_skills, :collection => ["1","2","3","4","5"], :as => :radio_buttons, :item_wrapper_class => :inline %>
 				<%= f.input :time_management, :collection => ["1","2","3","4","5"], :as => :radio_buttons, :item_wrapper_class => :inline %>
+        <!-- remove teamwork
 				<%= f.input :teamwork, :collection => ["1","2","3","4","5"], :as => :radio_buttons, :item_wrapper_class => :inline %>
+        -->
 				<%= f.input :dedication, :collection => ["1","2","3","4","5"], :as => :radio_buttons, :item_wrapper_class => :inline %>
 				<%= f.input :work_ethic, :collection => ["1","2","3","4","5"], :as => :radio_buttons, :item_wrapper_class => :inline %>
 				<hr />

diff --git a/app/views/coordinator/teacher_recommendations/show.html.erb b/app/views/coordinator/teacher_recommendations/show.html.erb
@@ -110,6 +110,7 @@
 					<%= @teacher_recommendation.time_management %>
 				</td>
 			</tr>
+      <!-- remove teamwork
 			<tr>
 				<td>
 					10. Demonstrates effective teamwork skills: 
@@ -118,6 +119,7 @@
 					<%= @teacher_recommendation.teamwork %>
 				</td>
 			</tr>
+      -->
 			<tr>
 				<td>
 					11. Shows strong dedication: 

diff --git a/app/views/teacher_recommendations/edit.html.erb b/app/views/teacher_recommendations/edit.html.erb
@@ -83,12 +83,14 @@
 				 	:input_html => {:value => @teacher_recommendation.time_management},
 					:label => "Possesses excellent time management skills"
 				%>
+        <!-- remove teamwork
 				<%= 
 					f.input :teamwork, :collection => ["1","2","3","4","5"], :as => :radio_buttons, 
 					:item_wrapper_class => :inline,
 				 	:input_html => {:value => @teacher_recommendation.teamwork},
 					:label => "Demonstrates effective teamwork skills"
 				%>
+        -->
 				<%= 
 					f.input :dedication, :collection => ["1","2","3","4","5"], :as => :radio_buttons, 
 					:item_wrapper_class => :inline,

diff --git a/app/views/teacher_recommendations/new.html.erb b/app/views/teacher_recommendations/new.html.erb
@@ -59,11 +59,13 @@
 					:item_wrapper_class => :inline,
 					:label => "Possesses excellent time management skills"
 				%>
+        <!-- remove teamwork 
 				<%= 
 					f.input :teamwork, :collection => ["1","2","3","4","5"], :as => :radio_buttons, 
 					:item_wrapper_class => :inline,
 					:label => "Demonstrates effective teamwork skills"
 				%>
+        -->
 				<%= 
 					f.input :dedication, :collection => ["1","2","3","4","5"], :as => :radio_buttons, 
 					:item_wrapper_class => :inline,