v1.7.01

SKuipers · SKuipers · commit 97dc2bcaa3bd · 2023-06-18T11:46:37.000+08:00
diff --git a/Data Admin/CHANGEDB.php b/Data Admin/CHANGEDB.php
@@ -156,3 +156,8 @@
 $count++;
 $sql[$count][0]="1.7.00" ;
 $sql[$count][1]="";
+
+//v1.7.01
+$count++;
+$sql[$count][0]="1.7.01" ;
+$sql[$count][1]="";
diff --git a/Data Admin/CHANGELOG.md b/Data Admin/CHANGELOG.md
@@ -1,5 +1,8 @@
 CHANGELOG
 =========
+## [1.7.01] 2023-06-18
+- Added Gibbon Person ID to the username finder
+
 ## [1.7.00] 2023-01-25
 - Fixed importer errors for missing PasswordPolicy class
 
diff --git a/Data Admin/manifest.php b/Data Admin/manifest.php
@@ -25,7 +25,7 @@
 $entryURL="import_manage.php" ; //The landing page for the unit, used in the main menu
 $type="Additional" ; //Do not change.
 $category="Admin" ; //The main menu area to place the module in
-$version="1.7.00" ; //Version number
+$version="1.7.01" ; //Version number
 $author="Sandra Kuipers" ; //Your name
 $url="https://github.com/SKuipers/" ; //Your URL
 
diff --git a/Data Admin/tools_findUsernamesProcess.php b/Data Admin/tools_findUsernamesProcess.php
@@ -59,22 +59,26 @@
     $lastColumn = $objWorksheet->getHighestDataColumn();
     $lastColumn++;
 
+    $lastColumnID = $lastColumn;
+    $lastColumnID++;
+
     $objWorksheet->setCellValue($lastColumn.'1', 'Username');
+    $objWorksheet->setCellValue($lastColumnID.'1', 'Gibbon ID');
 
     $studentCount = 0;
     $studentFoundCount = 0;
 
     // Grab the header & first row for Step 1
     foreach ($objWorksheet->getRowIterator(2) as $rowIndex => $row) {
-        $array = $objWorksheet->rangeToArray('A'.$rowIndex.':'.$lastColumn.$rowIndex, null, true, true, false);
+        $array = $objWorksheet->rangeToArray('A'.$rowIndex.':'.$lastColumnID.$rowIndex, null, true, true, false);
 
         $studentName = isset($array[0][$nameColumn])? $array[0][$nameColumn] : '';
         $yearGroup = isset($array[0][$yearGroupColumn])? $array[0][$yearGroupColumn] : '';
 
         if ($columnType == 'one') {
             // Parse the student name, then copy into variables based on the name format
             $matches = array();
-            $preferredName = $firstName = $surname1 = $surname2 = '';
+            $preferredName = $firstName = $surname1 = $surname2;
 
             switch ($nameFormat) {
                 case 'firstLast':       // Handle names with spaces: Alpha Beta + Gamma as well as Alpha + Beta Gamma
@@ -118,19 +122,20 @@
 
         if ($roleCategory == 'Student') {
             // Locate a student enrolment for the target year group with a matching student name
-            $data = ['gibbonSchoolYearID' => $session->get('gibbonSchoolYearID'), 'yearGroup' => $yearGroup, 'preferredName' => trim($preferredName), 'firstName' => trim($firstName), 'surname1' => trim($surname1), 'surname2' => trim($surname2) ];
-            $sql = "SELECT gibbonPerson.username
+            $data = ['gibbonSchoolYearID' => $session->get('gibbonSchoolYearID'), 'yearGroup' => $yearGroup, 'preferredName' => trim($preferredName), 'firstName' => trim($firstName), 'surname1' => trim($surname1), 'surname2' => trim($surname2), 'fullName' => $studentName ];
+            $sql = "SELECT gibbonPerson.username, gibbonPerson.gibbonPersonID
                     FROM gibbonPerson
                     JOIN gibbonStudentEnrolment ON (gibbonStudentEnrolment.gibbonPersonID=gibbonPerson.gibbonPersonID)
                     WHERE gibbonStudentEnrolment.gibbonSchoolYearID=:gibbonSchoolYearID
                     AND gibbonStudentEnrolment.gibbonYearGroupID=(SELECT gibbonYearGroupID FROM gibbonYearGroup WHERE nameShort=:yearGroup)
                     AND (
                         (gibbonPerson.surname = :surname1 AND gibbonPerson.preferredName = :preferredName)
                         OR (gibbonPerson.surname = :surname2 AND gibbonPerson.firstName = :firstName)
+                        OR (CONCAT(gibbonPerson.preferredName, ' ', gibbonPerson.surname) =:fullName )
                     )";
         } else {
             $data = ['preferredName' => trim($preferredName), 'firstName' => trim($firstName), 'surname1' => trim($surname1), 'surname2' => trim($surname2) ];
-            $sql = "SELECT gibbonPerson.username
+            $sql = "SELECT gibbonPerson.username, gibbonPerson.gibbonPersonID
                     FROM gibbonPerson
                     WHERE (gibbonPerson.status='Full' OR gibbonPerson.status='Expected')
                     AND (
@@ -142,14 +147,18 @@
         $result = $pdo->select($sql, $data);
 
         if ($result->rowCount() == 1) {
-            $foundValue = $result->fetchColumn();
+            $values = $result->fetch();
+            $foundUsername = $values['username'] ?? '';
+            $foundID = $values['gibbonPersonID'] ?? '';
             $studentFoundCount++;
         } else {
-            $foundValue = '';
+            $foundUsername = '';
+            $foundID = '';
         }
 
         // Write the ID to the last column
-        $objWorksheet->setCellValue($lastColumn.$rowIndex, $foundValue);
+        $objWorksheet->setCellValue($lastColumn.$rowIndex, $foundUsername);
+        $objWorksheet->setCellValue($lastColumnID.$rowIndex, $foundID);
 
         $studentCount++;
     }
diff --git a/Data Admin/version.php b/Data Admin/version.php
@@ -20,7 +20,7 @@
 /**
  * Sets version information
  */
-$moduleVersion="1.7.00" ;
+$moduleVersion="1.7.01" ;
 $coreVersion = '23.0.00';
 
 $gibbonVersionRequired="23.0.00";
