Merge pull request #6020 from nhsuk/mike/fix-nr-records-count

Fix record count for national reporting uploads with blank lines

Author: mikejamesthompson

app/components/app_import_statistics_component.rb

@@ -2,7 +2,7 @@
 
 class AppImportStatisticsComponent < ViewComponent::Base
   erb_template <<-ERB
-    <p><strong>Out of <%= pluralize(@import.rows_count, "record") %> found in the file:</strong></p>
+    <p><strong>Out of <%= pluralize(@import.records_count, "record") %> found in the file:</strong></p>
     <ul>
       <li><%= pluralize(@import.new_record_count, "new record") %> imported</li>
       <li><%= pluralize(@import.exact_duplicate_record_count, "duplicate") %> not imported</li>

app/models/immunisation_import.rb

@@ -57,7 +57,11 @@ def show_cancelled_reviewer?
   end
 
   def records_count
-    vaccination_records.count
+    if national_reporting?
+      vaccination_records.count + (ignored_record_count || 0)
+    else
+      vaccination_records.count
+    end
   end
 
   private

spec/fixtures/immunisation_import/national_reporting/valid_mixed_flu_hpv.csv

@@ -2,3 +2,4 @@
 RYG,100000,Hogwarts,9449308357,Harry,Potter,20010101,male,AA11 1AA,Y,20251109,AstraZeneca Fluenz LAIV,ABC123,20251030,Left Upper Arm,Albus,Dumbledore,,,Parental Consent,1234,ABCD,
 RYG,100000,,9999075320,Ron,Weasley,20010102,not knOWn,S1 1AA,,20251109,Gardasil,ABC123,20251030,nasal,,,,1,,1235,ABCE,community setting
 RYG,100000,,9990000018,Hermione,Granger,20010103,Female,S2 1AA,N,20251109,"","","","",,,,"",,1235,ABCE,""
+,,,,,,,,,,,,,,,,,,,,,,