From 51cb841600fd322d42b63ae10293a9773ce0fc7b Mon Sep 17 00:00:00 2001
From: Tom Barrett <tom@easyjethro.com.au>
Date: Thu, 5 Dec 2024 11:41:00 +1100
Subject: [PATCH] Resolves #1103

---
 views/view_10_admin__7_import.class.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/views/view_10_admin__7_import.class.php b/views/view_10_admin__7_import.class.php
index 321e4999..d9bd8627 100644
--- a/views/view_10_admin__7_import.class.php
+++ b/views/view_10_admin__7_import.class.php
@@ -154,14 +154,14 @@ private function _preparePreview()
 			case 'existing':
 				if (empty($_REQUEST['groupid'])) {
 					add_message(_("You must choose a group first"), 'error');
-					$this->stage = 'begin';
+					$this->_stage = 'begin';
 					return;
 				}
 				break;
 			case 'new':
 				if (!strlen(array_get($_REQUEST, 'new_group_name'))) {
 					add_message(_("You must enter a name for the new group"), 'error');
-					$this->stage = 'begin';
+					$this->_stage = 'begin';
 					return;
 				}
 				break;
@@ -305,7 +305,11 @@ private function _preparePreview()
 				continue;
 			}
 
-			$this->_captureErrors($i);
+			$ei = $i;
+			$name = array_get($row, 'first_name', '').' '.array_get($row, 'last_name', '');
+			if (strlen(trim($name))) $ei .= ' ('.$name.')';
+			$this->_captureErrors($ei);
+
 			if (!empty($row['congregation'])) {
 				$row['congregationid'] = Congregation::findByName($row['congregation']);
 			}
@@ -431,7 +435,7 @@ private function _preparePreview()
 		if (!empty($row_errors)) {
 			$msg = _('Your import file is not valid.  Please correct the following errors and try again:').'<ul>';
 			foreach ($row_errors as $line => $errors) {
-				$msg .= '<li>Row '.($line+1).': '.implode('; ', $errors).'</li>';
+				$msg .= '<li>Row '.($line).': '.implode('; ', $errors).'</li>';
 			}
 			$msg .= '</ul>';
 			add_message($msg, 'failure', true);