Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SRCT
schedules
Commits
73ca4513
Commit
73ca4513
authored
Oct 02, 2018
by
Zach Perkins
Browse files
Added semester filtering
parent
68417818
Changes
2
Hide whitespace changes
Inline
Side-by-side
schedules/app/controllers/search_controller.rb
View file @
73ca4513
class
SearchController
<
ApplicationController
def
index
@results
=
SearchHelper
::
GenericItem
.
fetchall
(
query_string:
params
[
:query
],
semester:
@semester
)
@results
=
SearchHelper
::
GenericItem
.
fetchall
(
params
[
:query
],
semester:
@semester
)
end
end
schedules/app/helpers/search_helper.rb
View file @
73ca4513
...
...
@@ -20,7 +20,7 @@ module SearchHelper
@data
=
data
end
def
self
.
fetchall
(
search_string
,
sort_mode
=
:auto
,
semester
=
:fall2018
)
def
self
.
fetchall
(
search_string
,
sort_mode
:
:auto
,
semester
:
:fall2018
)
query_data
=
GenericQueryData
.
new
(
search_string
,
sort_mode
,
semester
)
models
=
[]
models
+=
fetch_instructors
query_data
...
...
@@ -29,12 +29,7 @@ module SearchHelper
end
def
self
.
fetch_instructors
(
query_data
)
Instructor
.
from_name
(
Instructor
.
select
(
"instructors.*, COUNT(course_sections.id) AS section_count"
),
query_data
.
search_string
)
.
left_outer_joins
(
:course_sections
)
.
group
(
"instructors.id"
)
.
where
(
"course_sections.semester = ?"
,
query_data
.
semester
)
.
having
(
"section_count > 0"
)
.
all
Instructor
.
from_name
(
Instructor
.
select
(
"instructors.*"
),
query_data
.
search_string
)
end
def
self
.
fetch_courses
(
query_data
)
...
...
@@ -44,7 +39,7 @@ module SearchHelper
base_query
=
Course
.
select
(
"courses.*, count(course_sections.id) AS section_count"
)
.
left_outer_joins
(
:course_sections
)
.
having
(
"section_count > 0"
)
.
where
(
"course
_section
s.semester = ?"
,
query_data
.
semester
)
.
where
(
"courses.semester
_id
= ?"
,
query_data
.
semester
)
.
group
(
"courses.id"
)
subj
=
nil
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment