From 782b8f35274bc9db9de84d75449c017608f3cc4a Mon Sep 17 00:00:00 2001
From: Ali Alam <aalam@ichk.edu.hk>
Date: Thu, 23 Apr 2026 09:53:35 +0800
Subject: [PATCH 1/2] Improved checking for error in add journey record page

---
 Mastery Transcript/CHANGEDB.php           |  5 +++++
 Mastery Transcript/CHANGELOG.txt          |  4 ++++
 Mastery Transcript/journey_record_add.php | 10 +++++++---
 Mastery Transcript/manifest.php           |  2 +-
 Mastery Transcript/version.php            |  2 +-
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/Mastery Transcript/CHANGEDB.php b/Mastery Transcript/CHANGEDB.php
index b19067f..b47393f 100644
--- a/Mastery Transcript/CHANGEDB.php	
+++ b/Mastery Transcript/CHANGEDB.php	
@@ -219,3 +219,8 @@
 ++$count;
 $sql[$count][0] = '1.6.00';
 $sql[$count][1] = "";
+
+//v1.6.02
+++$count;
+$sql[$count][0] = '1.6.02';
+$sql[$count][1] = "";
\ No newline at end of file
diff --git a/Mastery Transcript/CHANGELOG.txt b/Mastery Transcript/CHANGELOG.txt
index 819dbe8..1bdd154 100644
--- a/Mastery Transcript/CHANGELOG.txt	
+++ b/Mastery Transcript/CHANGELOG.txt	
@@ -1,5 +1,9 @@
 CHANGELOG
 =========
+v1.6.02
+-------
+Improved checking for error in add journey record page
+
 v1.6.00
 -------
 Gibbon v28 Compatibility
diff --git a/Mastery Transcript/journey_record_add.php b/Mastery Transcript/journey_record_add.php
index d56a8fc..08bb8fb 100644
--- a/Mastery Transcript/journey_record_add.php	
+++ b/Mastery Transcript/journey_record_add.php	
@@ -21,7 +21,6 @@
 
 use Gibbon\Http\Url;
 use Gibbon\Forms\Form;
-use Gibbon\FileUploader;
 use Gibbon\Forms\DatabaseFormFactory;
 use Gibbon\Domain\Students\StudentGateway;
 
@@ -80,8 +79,13 @@
     $form->toggleVisibilityByClass('opportunity')->onSelect('type')->when('Opportunity');
 
     $studentGateway = $container->get(StudentGateway::class);
-    $student = $studentGateway->selectActiveStudentByPerson($session->get('gibbonSchoolYearID'), $session->get('gibbonPersonID'));
-    $data = array('gibbonYearGroupID' => '%'.$student->fetch()['gibbonYearGroupID'].'%');
+    $student = $studentGateway->selectActiveStudentByPerson($session->get('gibbonSchoolYearID'), $session->get('gibbonPersonID'))->fetch();
+    if (empty($student['gibbonYearGroupID'])) {
+        $page->addError(__('The selected record does not exist, or you do not have access to it.'));
+        return;
+    }
+
+    $data = array('gibbonYearGroupID' => '%'.$student['gibbonYearGroupID'].'%');
     $sql = "SELECT masteryTranscriptOpportunityID AS value, masteryTranscriptOpportunity.name FROM masteryTranscriptOpportunity WHERE masteryTranscriptOpportunity.active='Y' AND gibbonYearGroupIDList LIKE :gibbonYearGroupID ORDER BY masteryTranscriptOpportunity.name";
     $row = $form->addRow()->addClass('opportunity');
         $row->addLabel('masteryTranscriptOpportunityID', __m('Available Opportunities'))->description(__m('Which opportunity do you want to apply for?'));
diff --git a/Mastery Transcript/manifest.php b/Mastery Transcript/manifest.php
index e176300..843e4bb 100644
--- a/Mastery Transcript/manifest.php	
+++ b/Mastery Transcript/manifest.php	
@@ -27,7 +27,7 @@
 $entryURL = 'index.php';
 $type = 'Additional';
 $category = 'Assess';
-$version = '1.6.00';
+$version = '1.6.02';
 $author = "Gibbon Foundation";
 $url = "https://gibbonedu.org";
 
diff --git a/Mastery Transcript/version.php b/Mastery Transcript/version.php
index bbfeea1..5f51da2 100644
--- a/Mastery Transcript/version.php	
+++ b/Mastery Transcript/version.php	
@@ -22,5 +22,5 @@
 /**
  * Sets version information.
  */
-$moduleVersion = '1.6.00';
+$moduleVersion = '1.6.02';
 $coreVersion = '28.0.00';

From 2fd6d514ec242e16557cfa7a5093465b520a3ead Mon Sep 17 00:00:00 2001
From: Ali Alam <aalam@ichk.edu.hk>
Date: Mon, 27 Apr 2026 15:04:37 +0800
Subject: [PATCH 2/2] Updated the version number

---
 Mastery Transcript/CHANGEDB.php  | 4 ++--
 Mastery Transcript/CHANGELOG.txt | 2 +-
 Mastery Transcript/manifest.php  | 2 +-
 Mastery Transcript/version.php   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Mastery Transcript/CHANGEDB.php b/Mastery Transcript/CHANGEDB.php
index b47393f..315abdc 100644
--- a/Mastery Transcript/CHANGEDB.php	
+++ b/Mastery Transcript/CHANGEDB.php	
@@ -220,7 +220,7 @@
 $sql[$count][0] = '1.6.00';
 $sql[$count][1] = "";
 
-//v1.6.02
+//v1.6.01
 ++$count;
-$sql[$count][0] = '1.6.02';
+$sql[$count][0] = '1.6.01';
 $sql[$count][1] = "";
\ No newline at end of file
diff --git a/Mastery Transcript/CHANGELOG.txt b/Mastery Transcript/CHANGELOG.txt
index 1bdd154..ef6f183 100644
--- a/Mastery Transcript/CHANGELOG.txt	
+++ b/Mastery Transcript/CHANGELOG.txt	
@@ -1,6 +1,6 @@
 CHANGELOG
 =========
-v1.6.02
+v1.6.01
 -------
 Improved checking for error in add journey record page
 
diff --git a/Mastery Transcript/manifest.php b/Mastery Transcript/manifest.php
index 843e4bb..899e3ed 100644
--- a/Mastery Transcript/manifest.php	
+++ b/Mastery Transcript/manifest.php	
@@ -27,7 +27,7 @@
 $entryURL = 'index.php';
 $type = 'Additional';
 $category = 'Assess';
-$version = '1.6.02';
+$version = '1.6.01';
 $author = "Gibbon Foundation";
 $url = "https://gibbonedu.org";
 
diff --git a/Mastery Transcript/version.php b/Mastery Transcript/version.php
index 5f51da2..e61551f 100644
--- a/Mastery Transcript/version.php	
+++ b/Mastery Transcript/version.php	
@@ -22,5 +22,5 @@
 /**
  * Sets version information.
  */
-$moduleVersion = '1.6.02';
+$moduleVersion = '1.6.01';
 $coreVersion = '28.0.00';