Fb 581 rbl diffs from freebmd_development

app/helpers/best_guess_helper.rb

@@ -55,6 +55,9 @@ def formatted_year quarter
   end
 
   def format_registered registered_date, quarter
+    if (registered_date.length == 4)
+      registered_date.insert(2, '.')
+    end
     registered = registered_date.split('.')
     year = formatted_year(quarter).to_s
     value = "#{QuarterDetails.month_hash[registered[0]]} #{year[0..1]}#{registered[1]}"

app/models/freebmd/best_guess.rb

@@ -390,6 +390,25 @@ def event_registration
     submissions.Registered if submissions.present?
   end
 
+  def event_entry_number
+    submissions = Submission.find_by(AccessionNumber: record_accessions, SequenceNumber: record_sequence_number)
+    submissions.Page if submissions.present?
+  end
+
+  def event_registration_number
+    if Submission.column_names.include?('RegistrationNumber')
+      submissions = Submission.find_by(AccessionNumber: record_accessions, SequenceNumber: record_sequence_number)
+      submissions.RegistrationNumber if submissions.present?
+    end
+  end
+
+  def register_entry_number_format
+    quarter = self[:QuarterNumber]
+    year = QuarterDetails.quarter_year(quarter)
+    event_type = self[:RecordTypeID]
+    new_format =  ((year == 1993) and (event_type < 3)) or (year >= 1994)
+    new_format
+  end
   def self.get_birth_unique_names birth_records
     entries = Hash.new
     all_entries = birth_records

app/views/best_guess/_entry_information_table.html.erb

@@ -10,16 +10,16 @@
         <%= "#{record_type}" %>
       </td>
     </tr>
-    <% if record.QuarterNumber <  Constant::EVENT_QUARTER_TO_YEAR %>
+    <%# if record.QuarterNumber <  Constant::EVENT_QUARTER_TO_YEAR %>
       <tr>
         <th scope="row">
           Date
         </th>
         <td>
-          <%= format_quarter(record.QuarterNumber) %>
+          <%= format_quarter_year(record.QuarterNumber) %>
         </td>
       </tr>
-    <% end %>
+    <%# end %>
     <tr>
       <th scope="row">
         District
@@ -76,6 +76,32 @@
 	      </td>
     	</tr>
     <% end %>
+    <% if record.register_entry_number_format %>
+    <tr>
+      <th scope="row">
+        Register number
+      </th>
+      <td >
+        <% event_register_number = record.event_registration_number %>
+        <% if event_register_number.present? %>
+          <%= event_register_number  %>
+        <% end %>
+      </td>
+    </tr>
+    <tr>
+      <th scope="row">
+        Entry number
+      </th>
+      <td>
+        <% event_entry_number = record.event_entry_number %>
+        <% if event_entry_number.present?  %>
+          <%= event_entry_number %>
+        <% else %>
+          <%= "#{ record.Page }" %>
+        <% end %>
+      </td>
+    </tr>
+    <% else %>
     <tr>
       <th scope="row">
         Volume
@@ -101,6 +127,7 @@
         <% end %>
       </td>
     </tr>
+    <% end %>
     <tr>
       <th scope="row">
         Transcriber

app/views/search_queries/_desktop_freebmd.html.erb

@@ -65,8 +65,16 @@
                      <% else %>
                        <%= search_record[:District] %>
                      <% end %>
-                      Volume <%= search_record[:Volume] %> Page <%= search_record[:Page] %>
-                    <% end %>
+                      <% if search_record.register_entry_number_format %>
+                        <% register_number = search_record.event_registration_number %>
+                        <% entry_number = search_record.event_registration %>
+                        <% if register_number.present? %> Reg. no. <%= register_number %><% end %>
+                        Entry no. <%# if entry_number.present? %> <%#= entry_number %> <%# else %> <%= search_record[:Page] %> <%# end %>
+                      <% else %>
+                        Volume <%= search_record[:Volume] %> Page <%= search_record[:Page] %>
+                      <% end %>
+
+                  <% end %>
                   </dt>
                   <dt>
                      <%#= render partial: 'best_guess/more_information' %>

app/views/search_queries/_search_result_form_freebmd.html.erb

@@ -1,5 +1,8 @@
 <div class='container push--bottom'>
   <div class="desk-wide-seven-tenths desk-seven-tenths lap-seven-tenths palm-one-whole">
+    <p class="weight--semibold">We found <%= pluralize(@result_count, ' result', ' results') %> for <%= @search_query[:first_name] %> <%= @search_query[:last_name] %></p>
+    <hr/>
+
     <%= form_tag search_query_path(@search_query), method: :get, id: 'filter_form' do %>
         <% if @search_query.bmd_record_type.count > 1 %>
           <% filter_hash = RecordType::FREEBMD_TYPES.select{|k, v| @search_query.bmd_record_type.include? v }%>

lib/constant.rb

@@ -34,4 +34,5 @@ module Constant
 
 	PRIVACY_POLICY_LINK = "https://drive.google.com/file/d/10r_c-5d9DDces-OUX7D4UJJKGNIhu8sV/view"
 	EVENT_QUARTER_TO_YEAR = 589
+  LAST_DATE_WITH_VOLUMES_AND_PAGES = 621
 end