@@ -39,7 +39,7 @@
@@ -48,7 +48,7 @@
<% sub3.children.each do |sub4| %>
<% end if sub3.children.present? %>
diff --git a/app/controllers/concerns/jurisprudence_search.rb b/app/controllers/concerns/jurisprudence_search.rb
index e0ce97c..7f57ad6 100644
--- a/app/controllers/concerns/jurisprudence_search.rb
+++ b/app/controllers/concerns/jurisprudence_search.rb
@@ -13,8 +13,8 @@ module JurisprudenceSearch
with(:subject_ids).any_of(search_params[:subject_ids].split(",").map(&:strip).map(&:to_i)) if search_params[:subject_ids].present?
- order_by :doc_date
- order_by :year
+ order_by :doc_date, :desc
+ order_by :year, :desc
paginate page: search_params[:page] || 1, per_page: search_params[:per_page] || 20
end
diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb
index 958bd35..541a9c6 100644
--- a/app/controllers/documents_controller.rb
+++ b/app/controllers/documents_controller.rb
@@ -17,8 +17,17 @@ class DocumentsController < ApplicationController
@doctrines = @document.doctrines
end
+ def search
+ index
+
+ respond_to do |format|
+ format.html { render :search }
+ end
+ end
+
private
def search_params
- params.permit(:reference_number, :title, :short_title, :q, :page, :per_page)
+ params.permit(:reference_number, :title, :short_title, :q, :page, :per_page,
+ :subject_ids)
end
end
diff --git a/app/controllers/subject_indexes_controller.rb b/app/controllers/subject_indexes_controller.rb
index 8d2e948..4ef65c8 100644
--- a/app/controllers/subject_indexes_controller.rb
+++ b/app/controllers/subject_indexes_controller.rb
@@ -1,5 +1,7 @@
class SubjectIndexesController < ApplicationController
- load_and_authorize_resource :subject_index, class: "Cdao::Subject"
+ include JurisprudenceSearch
+
+ load_and_authorize_resource :subject_index, class: "Cdao::Subject", except: %i[search]
def index; end
diff --git a/app/views/documents/index.html.erb b/app/views/documents/index.html.erb
index 9176ad9..90890a7 100644
--- a/app/views/documents/index.html.erb
+++ b/app/views/documents/index.html.erb
@@ -3,9 +3,7 @@
<%= form_tag(documents_path, method: :get) do %>
-
- <%= text_field_tag :q, params[:q], class: "form-control" %>
-
+ <%= text_field_tag :q, params[:q], class: "form-control" %>
diff --git a/app/views/documents/search.html.erb b/app/views/documents/search.html.erb
new file mode 100644
index 0000000..038b260
--- /dev/null
+++ b/app/views/documents/search.html.erb
@@ -0,0 +1,19 @@
+
+ <% Cdao::Subject.where(id: params[:subject_ids].split(",").map(&:strip).map(&:to_i)).each do |subject| %>
+
+ <% end %>
+
+
+
+ | Reference No. |
+ Title |
+ Date |
+
+
+ <%= render(DocumentIndexTableComponent.with_collection(@jurisprudences, current_user: current_user)) %>
+
+
+
+
diff --git a/config/routes.rb b/config/routes.rb
index 772fc8f..52306f5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -15,7 +15,9 @@ Rails.application.routes.draw do
end
end
- resources :documents, only: %i[index show]
+ resources :documents, only: %i[index show] do
+ get :search, on: :collection
+ end
resources :decisions, only: %i[index show]
resources :subject_indexes