v1.7.03

SKuipers · SKuipers · commit 64feeffdcfbe · 2024-04-12T13:09:09.000+08:00
diff --git a/Data Admin/CHANGEDB.php b/Data Admin/CHANGEDB.php
@@ -166,3 +166,8 @@
 $count++;
 $sql[$count][0]="1.7.02" ;
 $sql[$count][1]="";
+
+//v1.7.03
+$count++;
+$sql[$count][0]="1.7.03" ;
+$sql[$count][1]="";
diff --git a/Data Admin/CHANGELOG.md b/Data Admin/CHANGELOG.md
@@ -1,5 +1,8 @@
 CHANGELOG
 =========
+## [1.7.03] 2024-04-12
+- Added school year to Find Usernames tool
+
 ## [1.7.02] 2023-10-20
 - Fixed export option in Manage Records when fields have multiple relational keys
 
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.02" ; //Version number
+$version="1.7.03" ; //Version number
 $author="Sandra Kuipers" ; //Your name
 $url="https://github.com/SKuipers/" ; //Your URL
 
diff --git a/Data Admin/tools_findUsernames.php b/Data Admin/tools_findUsernames.php
@@ -18,6 +18,7 @@
 */
 
 use Gibbon\Forms\Form;
+use Gibbon\Forms\DatabaseFormFactory;
 
 // Module Bootstrap
 require __DIR__ . '/module.php';
@@ -59,7 +60,11 @@
 
     $form = Form::create('findUsernames', $session->get('absoluteURL').'/modules/Data Admin/tools_findUsernamesProcess.php');
     $form->addHiddenValue('address', $session->get('address'));
-    $form->setClass('fullWidth smallIntBorder');
+    $form->setFactory(DatabaseFormFactory::create($pdo));
+    
+    $row = $form->addRow();
+    $row->addLabel('gibbonSchoolYearID', __('School Year'));
+    $row->addSelectSchoolYear('gibbonSchoolYearID')->required()->selected($session->get('gibbonSchoolYearID'));
 
     $row = $form->addRow();
     $row->addLabel('file', __('Spreadsheet'));
diff --git a/Data Admin/tools_findUsernamesProcess.php b/Data Admin/tools_findUsernamesProcess.php
@@ -27,6 +27,7 @@
 require __DIR__ . '/module.php';
 
 $filePath = isset($_FILES['file']['tmp_name'])? $_FILES['file']['tmp_name'] : '';
+$gibbonSchoolYearID = $_POST['gibbonSchoolYearID'] ?? '';
 $roleCategory = $_POST['roleCategory'] ?? '';
 $columnType = $_POST['columnType'] ?? '';
 $nameType = $_POST['nameType'] ?? '';
@@ -42,7 +43,7 @@
     $URL .= '&return=error0';
     header("Location: {$URL}");
     exit;
-} elseif (empty($filePath)) {
+} elseif (empty($filePath) || empty($gibbonSchoolYearID)) {
     $URL .= '&return=error1';
     header("Location: {$URL}");
     exit;
@@ -122,7 +123,7 @@
 
         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), 'fullName' => $studentName ];
+            $data = ['gibbonSchoolYearID' => $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)
diff --git a/Data Admin/version.php b/Data Admin/version.php
@@ -20,7 +20,7 @@
 /**
  * Sets version information
  */
-$moduleVersion="1.7.02" ;
+$moduleVersion="1.7.03" ;
 $coreVersion = '23.0.00';
 
 $gibbonVersionRequired="23.0.00";
