Merge pull request #165 from ukparliament/development

Development merge
ukparliament · Aug 29, 2024 · c65e494 · c65e494
2 parents 81801ef + e28ba41
commit c65e494
Show file tree

Hide file tree

Showing 10 changed files with 155 additions and 10 deletions.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -102,8 +102,8 @@ def filter_field_name(field)
       subject_t: 'Subject',
       legislationTitle_t: 'Legislation',
       department_t: 'Department',
-      year: 'Year',
-      month: 'Month'
+      year: 'Date',
+      month: 'Date'
     }
 
     field_names[field.to_sym]

diff --git a/app/models/content_object.rb b/app/models/content_object.rb
@@ -448,7 +448,7 @@ def get_all_from(field_name)
   def self.content_object_class(type_id, subtype_ids)
     case type_id
     when 363376
-      'NotSupported'
+      'ResearchMaterial'
     when 90996
       'Edm'
     when 346697

diff --git a/app/models/research_material.rb b/app/models/research_material.rb
@@ -0,0 +1,14 @@
+class ResearchMaterial < ContentObject
+
+  def initialize(content_object_data)
+    super
+  end
+
+  def template
+    'search/objects/research_material'
+  end
+
+  def search_result_partial
+    'search/results/research_material'
+  end
+end
diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
@@ -82,7 +82,7 @@
             <section class="facet">
               <div>
                 <div>
-                  <strong>Month</strong>
+                  <strong>Date</strong>
                 </div>
                 <div class="facets">
                   <% @search_data.months.each_with_index do |month, index| %>
@@ -99,7 +99,7 @@
             <section class="facet">
               <div>
                 <div>
-                  <strong>Year</strong>
+                  <strong>Date</strong>
                 </div>
                 <div class="facets">
                   <% @search_data.years[0..4].each do |year_data| %>

diff --git a/app/views/search/results/_research_material.html.erb b/app/views/search/results/_research_material.html.erb
@@ -0,0 +1,131 @@
+<div class="result-item">
+  <div class="row" id="title">
+    <%= format_object_title(object.object_title, @ses_data) %>
+  </div>
+
+  <div class="row" id="content">
+    <%#= render 'search/results/item_details/description', description: object.abstract_text %>
+  </div>
+
+  <div class="row">
+    <div class="three-panel">
+      <div class="left" id="primary-person">
+        <%#= render 'search/results/item_details/member', member: object.member, member_party: object.member_party %>
+      </div>
+      <div class="centre" id="secondary-person">
+        <%#= render 'search/results/item_details/member', member: object.member, member_party: object.member_party %>
+      </div>
+      <div class="right" id="primary-group">
+        <%#= render 'search/results/item_details/departments', departments: object.departments, hide_label: false %>
+      </div>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="three-panel">
+      <div class="left" id="type">
+        <%= render 'search/results/item_details/type', type: object.object_name %>
+      </div>
+      <div class="centre" id="status">
+
+      </div>
+      <div class="right" id="secondary-group">
+      </div>
+    </div>
+  </div>
+
+  <div <%= 'hidden' unless params[:show_detailed] == "true" %> class="row" id="detailed-view" data-detailed-results-target="toggleHidden">
+
+    <div class="row">
+      <div class="two-panel">
+        <div class="left" id="legislative-stage">
+        </div>
+        <div class="right" id="procedure">
+        </div>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="four-panel">
+        <div class="left-outer" id="specific-date-1">
+        </div>
+        <div class="left-inner" id="specific-date-2">
+        </div>
+        <div class="right-inner" id="specific-date-3">
+
+        </div>
+        <div class="right-outer" id="specific-date-4">
+
+        </div>
+      </div>
+    </div>
+
+    <div class="row">
+      <div id="coming-into-force">
+
+      </div>
+    </div>
+
+    <div class="row">
+      <div id="supplementary-content">
+
+      </div>
+    </div>
+
+    <div class="row">
+      <div id="corrected">
+
+      </div>
+    </div>
+
+    <% unless object.amendments.blank? %>
+      <% object.amendments.each do |amendment| %>
+        <div class="row">
+          <div class="two-panel">
+            <div class="left" id="amending-member">
+              <%#= render 'search/results/item_details/amended_by', primary_sponsor: amendment.dig(:primary_sponsor, :value) unless amendment.dig(:primary_sponsor, :value).blank? %>
+            </div>
+            <div class="right" id="amendment-date">
+              <%#= render 'search/results/item_details/amended_on', date_tabled: amendment.dig(:date_tabled, :value) unless amendment.dig(:date_tabled, :value).blank? %>
+            </div>
+          </div>
+        </div>
+      <% end %>
+    <% end %>
+
+    <%#= render 'search/results/item_details/legislation', legislation: object.legislation unless object.legislation.blank? %>
+    <%#= render 'search/results/item_details/witnesses', witnesses: object.witnesses unless object.witnesses.blank? %>
+    <%#= render 'search/results/item_details/subjects', subjects: object.subjects unless object.subjects.blank? %>
+    <%#= render 'search/results/item_details/topics', topics: object.topics unless object.topics.blank? %>
+    <%#= render 'search/results/item_details/notes', notes: object.notes unless object.notes.blank? %>
+
+    <% unless object.commons_library_location.blank? && object.lords_library_location.blank? %>
+      <div class="row">
+        <div class="two-panel">
+          <div class="left" id="commons-library-location">
+            <%#= render 'search/results/item_details/commons_library_location', location: object.commons_library_location unless object.commons_library_location.blank? %>
+          </div>
+          <div class="right" id="lords-library-location">
+            <%#= render 'search/results/item_details/lords_library_location', location: object.lords_library_location unless object.lords_library_location.blank? %>
+          </div>
+        </div>
+      </div>
+    <% end %>
+
+  </div>
+
+  <div class="row">
+    <div class="three-panel">
+      <div class="left" id="significant-date">
+        <%= render 'search/results/item_details/date', date: object.standard_date %>
+      </div>
+      <div class="centre" id="reference">
+        <%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+      </div>
+      <div class="right" id="house">
+        <%= render 'search/results/item_details/legislature', legislature: object.legislature %>
+      </div>
+    </div>
+  </div>
+</div>
+<hr/>
diff --git a/app/views/search/results/item_details/_creators.html.erb b/app/views/search/results/item_details/_creators.html.erb
@@ -1,4 +1,4 @@
 <div class="item-details">
   <div class="item-details-label">By</div>
-  <%= render 'search/fragments/name_list', items: creators, terminator: "", singular: false %>
+  <%= render 'search/fragments/simple_list', items: creators, terminator: "", singular: false %>
 </div>
diff --git a/app/views/search/results/item_details/_legislative_stage.html.erb b/app/views/search/results/item_details/_legislative_stage.html.erb
@@ -2,7 +2,7 @@
   <div class="item-details">
     <div class="item-details-label">Legislative stage</div>
     <span>
-        <%= render 'search/fragments/name_list', items: legislative_stage, terminator: "", singular: false %>
+        <%= render 'search/fragments/simple_list', items: legislative_stage, terminator: "", singular: false %>
     </span>
   </div>
 <% end %>
diff --git a/app/views/search/results/item_details/_legislature.html.erb b/app/views/search/results/item_details/_legislature.html.erb
@@ -1,3 +1,3 @@
 <div class="item-details">
-  <%= render 'search/fragments/name_list', items: legislature, terminator: "", singular: false %>
+  <%= render 'search/fragments/simple_list', items: legislature, terminator: "", singular: false %>
 </div>
diff --git a/app/views/search/results/item_details/_object_name.html.erb b/app/views/search/results/item_details/_object_name.html.erb
@@ -1,3 +1,3 @@
 <div class="item-details">
-  <%= render 'search/fragments/name_list', items: object_name, terminator: "", singular: true %>
+  <%= render 'search/fragments/simple_list', items: object_name, terminator: "", singular: true %>
 </div>
diff --git a/app/views/search/results/item_details/_type.html.erb b/app/views/search/results/item_details/_type.html.erb
@@ -1,6 +1,6 @@
 <% unless type.blank? %>
   <% if type.is_a?(Array) %>
-    <%= render 'search/results/item_details/list', items: type, seperator: ';', terminator: '', singular: false %>
+    <%= render 'search/fragments/simple_list', items: type, seperator: ';', terminator: '', singular: false %>
   <% else %>
     <div class="item-details">
       <%= object_display_name(type, singular: true) %>