diff options
| author | Mark Longair <mhl@pobox.com> | 2013-11-01 18:14:27 +0000 |
|---|---|---|
| committer | Mark Longair <mhl@pobox.com> | 2013-11-05 15:47:16 +0000 |
| commit | b16ed7188e0df7329da7c5d6c07ce16df2c0682d (patch) | |
| tree | bc152eda82d54d082728807f08fe6cdbfdd3d256 /app/models | |
| parent | 44e56189f93c93d56f19b71b6f76b7bbfc27a8cc (diff) | |
Add a info_requests_visible_classified_count column to PublicBody
This counts only those info requests that have prominence 'normal'
(i.e. are not hidden) and are not 'awaiting_description' (i.e. that
they have had some basic status classification).
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/info_request.rb | 4 | ||||
| -rw-r--r-- | app/models/public_body.rb | 42 |
2 files changed, 26 insertions, 20 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb index eba620f53..bb6a5eb1d 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -1190,6 +1190,10 @@ public self.public_body.info_requests_successful_count = InfoRequest.where( :public_body_id => self.public_body.id, :described_state => ['successful', 'partially_successful']).count + self.public_body.info_requests_visible_classified_count = InfoRequest.where( + :public_body_id => self.public_body_id, + :awaiting_description => false, + :prominence => 'normal').count self.public_body.without_revision do public_body.no_xapian_reindex = true public_body.save diff --git a/app/models/public_body.rb b/app/models/public_body.rb index 9e77eb181..7f8356dcf 100644 --- a/app/models/public_body.rb +++ b/app/models/public_body.rb @@ -3,26 +3,27 @@ # # Table name: public_bodies # -# id :integer not null, primary key -# name :text not null -# short_name :text not null -# request_email :text not null -# version :integer not null -# last_edit_editor :string(255) not null -# last_edit_comment :text not null -# created_at :datetime not null -# updated_at :datetime not null -# url_name :text not null -# home_page :text default(""), not null -# notes :text default(""), not null -# first_letter :string(255) not null -# publication_scheme :text default(""), not null -# api_key :string(255) not null -# info_requests_count :integer default(0), not null -# disclosure_log :text default(""), not null -# info_requests_successful_count :integer -# info_requests_not_held_count :integer -# info_requests_overdue_count :integer +# id :integer not null, primary key +# name :text not null +# short_name :text not null +# request_email :text not null +# version :integer not null +# last_edit_editor :string(255) not null +# last_edit_comment :text not null +# created_at :datetime not null +# updated_at :datetime not null +# url_name :text not null +# home_page :text default(""), not null +# notes :text default(""), not null +# first_letter :string(255) not null +# publication_scheme :text default(""), not null +# api_key :string(255) not null +# info_requests_count :integer default(0), not null +# disclosure_log :text default(""), not null +# info_requests_successful_count :integer +# info_requests_not_held_count :integer +# info_requests_overdue_count :integer +# info_requests_visible_classified_count :integer # require 'csv' @@ -193,6 +194,7 @@ class PublicBody < ActiveRecord::Base acts_as_versioned self.non_versioned_columns << 'created_at' << 'updated_at' << 'first_letter' << 'api_key' self.non_versioned_columns << 'info_requests_count' << 'info_requests_successful_count' + self.non_versioned_columns << 'info_requests_count' << 'info_requests_visible_classified_count' self.non_versioned_columns << 'info_requests_not_held_count' << 'info_requests_overdue' self.non_versioned_columns << 'info_requests_overdue_count' |