diff --git a/Mastery Transcript/CHANGEDB.php b/Mastery Transcript/CHANGEDB.php index b19067f..315abdc 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.01 +++$count; +$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 819dbe8..ef6f183 100644 --- a/Mastery Transcript/CHANGELOG.txt +++ b/Mastery Transcript/CHANGELOG.txt @@ -1,5 +1,9 @@ CHANGELOG ========= +v1.6.01 +------- +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..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.00'; +$version = '1.6.01'; $author = "Gibbon Foundation"; $url = "https://gibbonedu.org"; diff --git a/Mastery Transcript/version.php b/Mastery Transcript/version.php index bbfeea1..e61551f 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.01'; $coreVersion = '28.0.00';