Merge pull request #143 from ukparliament/populate-constituency-group-sets

populate constituency group sets

Author: fantasticlife

Gemfile.lock

@@ -293,7 +293,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.7.4)
+    zeitwerk (2.7.5)
 
 PLATFORMS
   aarch64-linux

app/controllers/election_controller.rb

@@ -93,8 +93,8 @@ def show
       # If the election forms part of a general election ...
       if @general_election
 
-        # ... and if the general election does not have full results ...
-        if @general_election.publication_state < 3
+        # ... and if the general election does not have full results and the election is not verified ...
+        if @general_election.publication_state < 3 and @election.is_verified == false
 
           # ... we order the candidacies by family name, then given name.
           @candidacies
@@ -114,8 +114,8 @@ def show
           # ... we render the candidates only template.
           render :template => 'election/show_candidates_only'
 
-        # If the general election has winners ...
-        elsif @general_election.publication_state == 2
+        # If the general election has winners and the election is not verified ...
+        elsif @general_election.publication_state == 2 and @election.is_verified == false
 
             # ... we order the candidacies by result position, then family name, then given name.
             @candidacies
@@ -179,6 +179,7 @@ def get_election( election_id )
         ( cast(e.majority as decimal) / e.valid_vote_count ) AS majority_percentage,
         constituency_group.name AS constituency_group_name,
         constituency_area.constituency_area_id AS constituency_area_id,
+        constituency_area.geographic_code AS constituency_area_geographic_code,
         winning_candidacy.candidate_given_name AS winning_candidate_given_name,
         winning_candidacy.candidate_family_name AS winning_candidate_family_name,
         electorate.population_count AS electorate_population_count,
@@ -203,7 +204,7 @@ def get_election( election_id )
       ON constituency_group.id = e.constituency_group_id
       
       LEFT JOIN (
-        SELECT cg.id AS constituency_group_id, ca.id AS constituency_area_id
+        SELECT cg.id AS constituency_group_id, ca.id AS constituency_area_id, ca.geographic_code AS geographic_code
         FROM constituency_groups cg, constituency_areas ca
         WHERE cg.constituency_area_id = ca.id
       ) constituency_area

app/helpers/election_helper.rb

@@ -25,4 +25,16 @@ def election_constituency_area_name_with_boundary_set_dates( election, boundary_
     end
     name
   end
+  
+  def bbc_election_link( election )
+    bbc_election_link = "https://www.bbc.co.uk/news/election/"
+    bbc_election_link += election.polling_on.strftime( '%Y' )
+    bbc_election_link += "/uk/constituencies/"
+    bbc_election_link += election.constituency_area_geographic_code
+  end
+  
+  def bbc_election_link_title( election )
+    bbc_election_link = election.constituency_group_name
+    bbc_election_link += " results from the BBC."
+  end
 end

app/models/boundary_set.rb

@@ -23,6 +23,7 @@ class BoundarySet < ApplicationRecord
   attr_accessor :child_boundary_sets
 
   belongs_to :country
+  has_many :boundary_set_legislation_items
 
   def display_title
     display_title = self.country_name

app/models/election.rb

@@ -6,6 +6,7 @@
 #  declaration_at        :datetime
 #  invalid_vote_count    :integer
 #  is_notional           :boolean          default(FALSE)
+#  is_verified           :boolean          default(TRUE)
 #  majority              :integer
 #  polling_on            :date             not null
 #  valid_vote_count      :integer

app/views/election/show_winners_only.html.erb

@@ -29,4 +29,7 @@
 
 <%= render :partial => 'vote_change_disclaimer' %>
 
-<%= render :partial => 'notional_based_change_disclaimer', :object => @boundary_set_having_first_general_election, :locals => {:election => @election} if @boundary_set_having_first_general_election %>
+<%= render :partial => 'notional_based_change_disclaimer', :object => @boundary_set_having_first_general_election, :locals => {:election => @election} if @boundary_set_having_first_general_election %>
+
+
+<%= content_tag( 'p', "The House of Commons Library are currently contacting local authorities to verify vote figures. In the meantime, #{link_to( 'unverified vote numbers for this constituency are available from the BBC', bbc_election_link( @election ), :title => bbc_election_link_title( @election ) )}.".html_safe ) %>

config/database.yml

@@ -6,6 +6,7 @@ development: &development
   #database: psephology_dissolution
   #database: psephology_candidacies
   #database: psephology_winners
+  #database: psephology_part_verified
   #database: psephology_numbers
   host: localhost
   pool: 5