Merge pull request #598 from cedarcode/search-by-code

Search by code

Author: frankete333

app/controllers/subjects_controller.rb

@@ -18,6 +18,7 @@ def all
         Subject
           .where("lower(unaccent(name)) LIKE lower(unaccent(?))", "%#{params[:search].strip}%")
           .or(Subject.where("lower(unaccent(short_name)) LIKE lower(unaccent(?))", "%#{params[:search].strip}%"))
+          .or(Subject.where("lower(code) LIKE lower(?)", "%#{params[:search].strip}%"))
       end
 
     @subjects = TreePreloader.new(subjects).preload

app/javascript/controllers/search_controller.js

@@ -5,6 +5,7 @@ export default class extends Controller {
 
   toggle() {
     this.appBarTarget.classList.toggle("d-none")
+    this.searchInputTarget.value = ""
     this.searchbarTarget.classList.toggle("d-none")
     if (!this.searchbarTarget.classList.contains("d-none")) {
       this.searchInputTarget.focus()

app/views/layouts/application.html.erb

@@ -74,7 +74,7 @@
           <%= form_with(url: all_subjects_path, method: :get, local: true) do |f| %>
             <div class="mdc-text-field mdc-text-field--filled mdc-text-field--label-floating mdc-text-field--no-label mdc-text-field--with-trailing-icon">
               <span class="mdc-text-field__ripple"></span>
-              <%= f.text_field :search, value: params[:search], class: "mdc-text-field__input", placeholder: "Buscar", autofocus: true, data: { 'search-target': "searchInput" } %>
+              <%= f.text_field :search, value: params[:search], class: "mdc-text-field__input", placeholder: "Buscar por nombre o código de la materia", autofocus: true, data: { 'search-target': "searchInput" } %>
               <i class="material-icons mdc-text-field__icon mdc-text-field__icon--trailing" data-action="click->search#toggle" tabindex="0" role="button">close</i>
               <span class="mdc-line-ripple"></span>
             </div>

test/system/subjects_test.rb

@@ -5,13 +5,13 @@ class SubjectsTest < ApplicationSystemTestCase
     gal1 = create :subject, :with_exam, name: "GAL 1", credits: 9, code: "1030"
     create :subject_prerequisite, approvable: gal1.exam, approvable_needed: gal1.course
 
-    gal2 = create :subject, :with_exam, name: "GAL 2", credits: 10
+    gal2 = create :subject, :with_exam, name: "GAL 2", credits: 10, code: "1031"
     create :and_prerequisite, approvable: gal2.course, operands_prerequisites: [
       create(:subject_prerequisite, approvable_needed: gal1.course),
       create(:subject_prerequisite, approvable_needed: gal1.exam),
     ]
 
-    create :subject, name: "Taller 1", short_name: 'T1', credits: 11
+    create :subject, name: "Taller 1", short_name: 'T1', credits: 11, code: "1040"
 
     visit all_subjects_path
 
@@ -44,6 +44,18 @@ class SubjectsTest < ApplicationSystemTestCase
     assert_no_text "GAL 2"
     assert_text "T1"
 
+    fill_in 'search', with: "1030\n"
+
+    assert_text "GAL 1"
+    assert_no_text "GAL 2"
+    assert_no_text "T1"
+
+    fill_in 'search', with: "103\n"
+
+    assert_text "GAL 1"
+    assert_text "GAL 2"
+    assert_no_text "T1"
+
     fill_in 'search', with: "This subject does not exist\n"
 
     assert_no_text "GAL 1"