#241 On the enrollments search screen, the course field was changed to avoid duplicate names

Author: Carlos-Eduardo-Cabral-da-Cunha

app/controllers/enrollments_controller.rb

@@ -175,8 +175,8 @@ def self.condition_for_course_class_year_semester_column(column, value, like_pat
        				         course_classes.id = class_enrollments.course_class_id " 
 
     if not value[:course].empty?
-      search_sql += " and course_classes.course_id = ? " 
-      result << value[:course]
+      search_sql += " and course_classes.course_id in (?) " 
+      result << Course.ids_de_disciplinas_com_nome_parecido(value[:course])
     end
 
     if not value[:year].empty?

app/helpers/class_enrollments_helper.rb

@@ -9,10 +9,21 @@ def grade_form_column(record, options)
 
   def course_class_year_semester_search_column(record, options)
 
+  	disciplinas_filtro = Course.all.collect{|c| [I18n.transliterate(c.name.squish.downcase), c.name, c.id]}
+  	disciplinas_filtro.sort_by!{ |elemento| elemento[0] }
+
+  	disciplinas_sem_nome_repetido = []
+  	ultimo_copiado = ""
+  	disciplinas_filtro.each do |elemento|
+  	  if elemento[0] != ultimo_copiado
+  	    disciplinas_sem_nome_repetido.push(elemento[1..2])
+  	    ultimo_copiado = elemento[0] 
+  	  end 
+  	end
 
   	html = select_tag(
   		"#{options[:name]}[course]", 
-  		options_for_select(Course.all.collect{|c| [c.name, c.id]}),
+  		options_for_select(disciplinas_sem_nome_repetido),
   		:prompt => as_(:_select_),
   		:id => "#{options[:id]}_course",
   		:class => "as_search_search_course_class_option"

app/models/course.rb

@@ -30,5 +30,18 @@ def workload_value
   def workload_text
     return I18n.translate('activerecord.attributes.course.empty_workload') if workload.nil?
     I18n.translate('activerecord.attributes.course.workload_time', :time => workload)
-  end  
+  end
+
+  def self.ids_de_disciplinas_com_nome_parecido(id_disciplina_selecionada)
+    ids = []
+    nome_disciplina_selecionada = I18n.transliterate(Course.find(id_disciplina_selecionada).name.squish.downcase)
+    disciplinas = Course.all.collect{|c| [c.name, c.id]}
+    disciplinas.each do |disciplina|
+      if nome_disciplina_selecionada == I18n.transliterate(disciplina[0].squish.downcase)  
+        ids.push(disciplina[1])
+      end
+    end
+    return ids
+  end
+
 end