Merge pull request #520 from alphagov/laurent/dataset-count

Count datasets with at least one datafile instead of counting datasets marked as published

Author: Laurent Curau

app/controllers/home_controller.rb

@@ -12,9 +12,8 @@ def dashboard
     @datasets_count = Dataset.count
     @datafiles_count = Link.count
     @publishers_count = Organisation.count
-    @published_datasets_count = Dataset.published.count
-    @draft_datasets_count = Dataset.draft.count
-    @unpublished_datasets_count = Dataset.with_no_datafiles.count
+    @datasets_published_with_datafiles_count = Dataset.with_datafiles.distinct.count
+    @datasets_published_with_no_datafiles_count = Dataset.with_no_datafiles.count
     @datafiles_count_by_format = Datafile.group(:format).count.sort_by { |_k, value| value }.reverse
     @broken_links_count = Link.broken.count
   end

app/models/dataset.rb

@@ -39,6 +39,7 @@ class Dataset < ApplicationRecord
 
   scope :owned_by, ->(creator_id) { where(creator_id: creator_id) }
   scope :published, ->{ where(status: "published") }
+  scope :with_datafiles, ->{ joins(:datafiles) }
   scope :with_no_datafiles, ->{ left_outer_joins(:datafiles).where(links: { id: nil } ) }
   scope :draft, ->{ where(status: "draft") }
 

app/views/home/dashboard.html.erb

@@ -10,21 +10,21 @@
   <div class="column-one-third">
     <div class="data">
       <span class="data-item bold-xlarge"><%= number_with_delimiter(@datasets_count) %></span>
-      <span class="data-item bold-xsmall">datasets</span>
+      <span class="data-item bold-xsmall"><%= 'dataset'.pluralize(@datasets_count) %> in total</span>
     </div>
   </div>
 
   <div class="column-one-third">
     <div class="data">
-      <span class="data-item bold-xlarge"><%= number_with_delimiter(@published_datasets_count) %></span>
-      <span class="data-item bold-xsmall">published datasets</span>
+      <span class="data-item bold-xlarge"><%= number_with_delimiter(@datasets_published_with_datafiles_count) %></span>
+      <span class="data-item bold-xsmall"><%= 'dataset'.pluralize(@datasets_published_with_datafiles_count) %> published with datafiles</span>
     </div>
   </div>
 
   <div class="column-one-third">
     <div class="data">
-      <span class="data-item bold-xlarge"><%= number_with_delimiter(@unpublished_datasets_count) %></span>
-      <span class="data-item bold-xsmall">datasets with no datafiles</span>
+      <span class="data-item bold-xlarge"><%= number_with_delimiter(@datasets_published_with_no_datafiles_count) %></span>
+      <span class="data-item bold-xsmall"><%= 'dataset'.pluralize(@datasets_published_with_no_datafiles_count) %> published with no datafiles</span>
     </div>
   </div>
 </div>
@@ -33,21 +33,21 @@
   <div class="column-one-third">
     <div class="data">
       <span class="data-item bold-xlarge"><%= number_with_delimiter(@datafiles_count) %></span>
-      <span class="data-item bold-xsmall">datafiles</span>
+      <span class="data-item bold-xsmall"><%= 'datafile'.pluralize(@datafiles_count) %> in total</span>
     </div>
   </div>
 
   <div class="column-one-third">
     <div class="data">
       <span class="data-item bold-xlarge"><%= number_with_delimiter(@publishers_count) %></span>
-      <span class="data-item bold-xsmall">Publishers</span>
+      <span class="data-item bold-xsmall"><%= 'publisher'.pluralize(@publishers_count) %></span>
     </div>
   </div>
 
   <div class="column-one-third">
     <div class="data">
       <span class="data-item bold-xlarge"><%= number_with_delimiter(@broken_links_count) %></span>
-      <span class="data-item bold-xsmall">Broken links</span>
+      <span class="data-item bold-xsmall">broken <%= 'link'.pluralize(@broken_links_count) %></span>
     </div>
   </div>
 </div>
@@ -61,7 +61,7 @@
       <tbody>
         <% @datafiles_count_by_format.each do |format, format_count| %>
           <tr>
-            <th><%= format %></th>
+            <th><%= format.presence || "Not specified" %></th>
             <td><%= format_count %></td>
           </tr>
         <% end %>