From 5eda462b95c0322ce63da277f947868687ca4f0e Mon Sep 17 00:00:00 2001
From: alexdbondoc17 <alexdbondoc17@gmail.com>
Date: Tue, 8 Feb 2022 01:45:56 +0000
Subject: [PATCH] Additional Fixes for UIs

---
 .../doctrine_index_table_component.html.erb            |  2 --
 app/components/document_doctrine_show_component.rb     |  2 +-
 .../document_doctrine_show_component.html.erb          |  2 +-
 .../subject_accordion_component.html.erb               |  8 ++++----
 app/components/subject_index_form_component.rb         |  2 +-
 .../subjects_sidenav_sub_menu_component.html.erb       | 10 +++++-----
 app/controllers/doctrine/annotations_controller.rb     |  5 ++---
 app/views/documents/index.html.erb                     |  4 ++--
 app/views/documents/show.html.erb                      |  2 +-
 app/views/subject_indexes/index.html.erb               |  2 +-
 10 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/app/components/doctrine_index_table_component/doctrine_index_table_component.html.erb b/app/components/doctrine_index_table_component/doctrine_index_table_component.html.erb
index 81af1cb..cff8648 100644
--- a/app/components/doctrine_index_table_component/doctrine_index_table_component.html.erb
+++ b/app/components/doctrine_index_table_component/doctrine_index_table_component.html.erb
@@ -3,7 +3,6 @@
     <th class="bg-light"> Reference Number </th>
     <th class="bg-light"> Title </th>
     <th class="bg-light"> Date </th>
-    <th class="bg-light"> PhilRep </th>
   </thead>
   
   <tbody>
@@ -12,7 +11,6 @@
         <td> <%= document_reference_number(search_result.document) %> </td>
         <td> <%= document_title(search_result.document) %> </td>
         <td> <%= date_or_year(search_result.document) %> </td>
-        <td> <%= search_result.annotations.map(&:phil_rep).join(", ") %> </td>
       </tr>
     <% end %>
   </tbody>
diff --git a/app/components/document_doctrine_show_component.rb b/app/components/document_doctrine_show_component.rb
index 010b971..4967499 100644
--- a/app/components/document_doctrine_show_component.rb
+++ b/app/components/document_doctrine_show_component.rb
@@ -34,7 +34,7 @@ class DocumentDoctrineShowComponent < BaseComponent
   end
 
   def all_subjects
-    Cdao::Subject.all
+    Cdao::Subject.all.order(name: :asc)
   end
 
   def date_or_year(annotation)
diff --git a/app/components/document_doctrine_show_component/document_doctrine_show_component.html.erb b/app/components/document_doctrine_show_component/document_doctrine_show_component.html.erb
index bb7ee09..1831b78 100644
--- a/app/components/document_doctrine_show_component/document_doctrine_show_component.html.erb
+++ b/app/components/document_doctrine_show_component/document_doctrine_show_component.html.erb
@@ -162,7 +162,7 @@
                   <% ad_date_or_year = annotated_document.docdate.present? ? annotated_document.docdate.strftime("%B %d, %Y") : annotated_document.year %>
                   <% annotated_documents_title << [" citing #{ad_title}", annotated_document.reference_number, ad_date_or_year].join(", ") %>
                 <% end %>
-                <%= raw [document_title, annotation.document.reference_number, date_or_year, annotation.phil_rep, annotated_documents_title].reject(&:blank?).join(', ').html_safe %>
+                <%= raw [document_title, annotation.document.reference_number, date_or_year, annotation.phil_rep].reject(&:blank?).join(', ').html_safe %>
               </p>
             </div>
 
diff --git a/app/components/subject_accordion_component/subject_accordion_component.html.erb b/app/components/subject_accordion_component/subject_accordion_component.html.erb
index e51103b..7a0011c 100644
--- a/app/components/subject_accordion_component/subject_accordion_component.html.erb
+++ b/app/components/subject_accordion_component/subject_accordion_component.html.erb
@@ -1,4 +1,4 @@
-<% parent.children.each do |sub1| %>
+<% parent.children.order(name: :asc).each do |sub1| %>
   <div class="accordion accordion-flush ps-20" id="#secondLevelPanel<%= sub1.id %>">
     <div class="accordion-item">
       <div class="accordion-header d-flex justify-content-between">
@@ -15,7 +15,7 @@
 
       <div class="accordion-collapse collapse" id="<%= ["secondLevel", sub1.id].join %>" data-bs-parent="#secondLevelPanel<%= sub1.id %>">
         <div class="accordion-body pt-1">
-          <% sub1.children.each do |sub2| %>
+          <% sub1.children.order(name: :asc).each do |sub2| %>
             <div class="accordion accordion-flush ps-20" id="thirdLevelPanel<%= sub2.id %>">
               <div class="accordion-item">
                 <div class="accordion-header d-flex justify-content-between">
@@ -32,7 +32,7 @@
 
                 <div class="accordion-collapse collapse" id="<%= ["thirdLevel", sub2.id].join %>" data-bs-parent="#thirdLevelPanel<%= sub2.id %>">
                   <div class="accordion-body pt-1">
-                    <% sub2.children.each do |sub3| %>
+                    <% sub2.children.order(name: :asc).each do |sub3| %>
                       <div class="accordion accordion-flush ps-20" id="fourthLevelPanel<%= sub3.id %>">
                         <div class="accordion-item">
                           <div class="accordion-header d-flex justify-content-between">
@@ -49,7 +49,7 @@
 
                           <div class="accordion-collapse collapse" id="<%= ["fourthLevel", sub3.id].join %>" data-bs-parent="#fourthLevelPanel<%= sub3.id %>">
                             <div class="accordion-body pt-1">
-                              <% sub3.children.each do |sub4| %>
+                              <% sub3.children.order(name: :asc).each do |sub4| %>
                                 <div class="accordion accordion-flush ps-20">
                                   <div class="accordion-item d-flex justify-content-between">
                                     <div> 
diff --git a/app/components/subject_index_form_component.rb b/app/components/subject_index_form_component.rb
index 2270174..1089cbf 100644
--- a/app/components/subject_index_form_component.rb
+++ b/app/components/subject_index_form_component.rb
@@ -8,7 +8,7 @@ class SubjectIndexFormComponent < BaseComponent
 	end
 
 	def all_subjects
-		Cdao::Subject.all
+		Cdao::Subject.all.order(name: :asc)
 	end
 
 	def current_library
diff --git a/app/components/subjects_sidenav_sub_menu_component/subjects_sidenav_sub_menu_component.html.erb b/app/components/subjects_sidenav_sub_menu_component/subjects_sidenav_sub_menu_component.html.erb
index 6846e7b..bdc14a0 100644
--- a/app/components/subjects_sidenav_sub_menu_component/subjects_sidenav_sub_menu_component.html.erb
+++ b/app/components/subjects_sidenav_sub_menu_component/subjects_sidenav_sub_menu_component.html.erb
@@ -1,6 +1,6 @@
 <div class="accordion-collapse collapse" id="<%= opts[:main_sub_menu] %>" data-bs-parent="#sidenav">
   <div class="accordion-body pb-0 pe-0 pt-0">
-    <% Cdao::Subject.roots.each do |root| %>
+    <% Cdao::Subject.roots.order(name: :asc).each do |root| %>
       <div class="accordion accordion-flush ps-20" id="firstLevelSubMenu">
         <div class="accordion-item bg-transparent">
           <div class="accordion-header bg-transparent">
@@ -13,7 +13,7 @@
             <% end %>
           </div>
 
-          <% if root.children.present? %>
+          <% if root.children.order(name: :asc).present? %>
             <div class="accordion-collapse collapse" id="<%= [opts[:second_sub_menu], root.id].join %>" data-bs-parent="#firstLevelSubMenu">
               <div class="accordion-body pb-0 pe-0 pt-0">
                 <% root.children.each do |sub1| %>
@@ -31,7 +31,7 @@
 
                       <div class="accordion-collapse collapse" id="<%= [opts[:third_sub_menu], sub1.id].join %>" data-bs-parent="#secondLevelSubMenu">
                         <div class="accordion-body pb-0 pe-0 pt-0">
-                          <% sub1.children.each do |sub2| %>
+                          <% sub1.children.order(name: :asc).each do |sub2| %>
                             <div class="accordion accordion-flush" id="thirdLevelSubMenu">
                               <div class="accordion-item bg-transparent">
                                 <div class="accordion-header bg-transparent">
@@ -46,7 +46,7 @@
 
                                 <div class="accordion-collapse collapse" id="<%= [opts[:fourth_sub_menu], sub2.id].join %>" data-bs-parent="#thirdLevelSubMenu">
                                   <div class="accordion-body pb-0 pe-0 pt-0">
-                                    <% sub2.children.each do |sub3| %>
+                                    <% sub2.children.order(name: :asc).each do |sub3| %>
                                       <div class="accordion accordion-flush ps-20" id="fourthLevelSubMenu">
                                         <div class="accordion-item bg-transparent">
                                           <div class="accordion-header">
@@ -61,7 +61,7 @@
 
                                           <div class="accordion-collapse collapse" id="<%= [opts[:fifth_sub_menu], sub3.id].join %>" data-bs-parent="#fourthLevelSubMenu">
                                             <div class="accordion-body pb-0 pe-0 pt-0">
-                                              <% sub3.children.each do |sub4| %>
+                                              <% sub3.children.order(name: :asc).each do |sub4| %>
                                                 <div class="accordion-item bg-transparent">
                                                   <div class="accordion-header">
                                                     <%= link_to sub4.name, index_url(sub4.id), class: "accordion-link text-white text-decoration-none text-dark d-block sub5 clickable-link" %>
diff --git a/app/controllers/doctrine/annotations_controller.rb b/app/controllers/doctrine/annotations_controller.rb
index cd1ad5b..f62e0c9 100644
--- a/app/controllers/doctrine/annotations_controller.rb
+++ b/app/controllers/doctrine/annotations_controller.rb
@@ -19,9 +19,8 @@ class Doctrine::AnnotationsController < ApplicationController
 
     respond_to do |format|
       if @annotation.save
-        @documents.each do |document|
-          @annotation.add_document(document)
-        end
+        @documents.each { |document| @annotation.add_document(document) } if @documents.present?
+
         format.html { redirect_to document_doctrine_path(@doctrine.document, @doctrine), 
                       notice: "Doctrine Annotation was successfully created." }
       else
diff --git a/app/views/documents/index.html.erb b/app/views/documents/index.html.erb
index c655c2b..18ba62a 100644
--- a/app/views/documents/index.html.erb
+++ b/app/views/documents/index.html.erb
@@ -21,8 +21,8 @@
 
                   <div class="modal-body">
                     <div class="row">
-                      <div class="col-sm-6 p-2">
-                        <%= text_field_tag :citation_finder, params[:citation_finder], class: "form-control", placeholder: "Citation Finder" %>
+                      <div class="col-sm-12 p-2">
+                        <%= text_field_tag :citation_finder, params[:citation_finder], class: "form-control", placeholder: "PHILREP/SCRA" %>
                       </div>
                     </div>
 
diff --git a/app/views/documents/show.html.erb b/app/views/documents/show.html.erb
index dc37939..74e6838 100644
--- a/app/views/documents/show.html.erb
+++ b/app/views/documents/show.html.erb
@@ -38,7 +38,7 @@
           </div>
 
           <div class="container-sm row-flex col-sm-12 mt-2">
-            <%= render(DoctrineModalFormComponent.new(current_user: current_user, doctrine: @document.doctrines.new, subjects: @subjects, opts: { form_url: jurisprudence_doctrines_path(jurisprudence_id: @document.id), form_method: :post })) %>
+            <%= render(DoctrineModalFormComponent.new(current_user: current_user, doctrine: @document.doctrines.new, subjects: @subjects.order(name: :asc), opts: { form_url: jurisprudence_doctrines_path(jurisprudence_id: @document.id), form_method: :post })) %>
           </div>
         </div>
 
diff --git a/app/views/subject_indexes/index.html.erb b/app/views/subject_indexes/index.html.erb
index 238cbd8..ca94fee 100644
--- a/app/views/subject_indexes/index.html.erb
+++ b/app/views/subject_indexes/index.html.erb
@@ -4,7 +4,7 @@
 			<div class="card-header"> <h2> Subjects </h2> </div>
 
 			<div class="card-body">
-				<% Cdao::Subject.roots.all.each do |root| %>
+				<% Cdao::Subject.roots.order(name: :asc).each do |root| %>
 					<div class="accordion accordion-flash" id="mainPanel<%= root.id %>">
 						<div class="accordion-item">
 							<div class="accordion-header d-flex justify-content-between">