v3.1.07

GibbonEdu · Mar 18, 2022 · 59599af · 59599af
1 parent 7b028d9
commit 59599af
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 35 deletions.
diff --git a/Credentials/CHANGEDB.php b/Credentials/CHANGEDB.php
@@ -154,3 +154,8 @@
 ++$count;
 $sql[$count][0] = '3.1.06';
 $sql[$count][1] = "";
+
+//3.1.07
+++$count;
+$sql[$count][0] = '3.1.07';
+$sql[$count][1] = "";
diff --git a/Credentials/CHANGELOG.txt b/Credentials/CHANGELOG.txt
@@ -1,5 +1,9 @@
 CHANGELOG
 =========
+v3.1.07
+-------
+Refactoring of linkTop divs
+
 v3.1.06
 -------
 Removed deprecated function calls

diff --git a/Credentials/credentials_student.php b/Credentials/credentials_student.php
@@ -18,9 +18,10 @@
   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+use Gibbon\Http\Url;
+use Gibbon\Services\Format;
 use Gibbon\Tables\DataTable;
 use Gibbon\Module\Credentials\CredentialsCredentialGateway;
-use Gibbon\Services\Format;
 
 //Module includes
 include './modules/Credentials/moduleFunctions.php';
@@ -45,7 +46,7 @@
         $gibbonSchoolYearID = $session->get('gibbonSchoolYearID');
 
         $studentGateway = $container->get(CredentialsCredentialGateway::class);
-;
+
         $criteria = $studentGateway->newQueryCriteria();
         $students = $studentGateway->queryStudentBySchoolYear($criteria, $gibbonSchoolYearID, $gibbonPersonID);
 
@@ -64,12 +65,13 @@
             $page->breadcrumbs->add(Format::name('', $student['preferredName'], $student['surname'], 'Student'));
 
             if ($search != '' or $allStudents != '') {
-                echo "<div class='linkTop'>";
-                echo "<a href='".$session->get('absoluteURL')."/index.php?q=/modules/Credentials/credentials.php&search=$search&allStudents=$allStudents'>".__m('Back to Search Results').'</a>';
-                echo '</div>';
+                $params = [
+                    "search" => $search,
+                    "allStudents" => $allStudents
+                ];
+                $page->navigator->addSearchResultsAction(Url::fromModuleRoute('Credentials', 'credentials.php')->withQueryParams($params));
             }
 
-
             $studentCredentials = $studentGateway->queryViewCredentialsByPerson($criteria, $gibbonPersonID);
 
             // DATA TABLE

diff --git a/Credentials/credentials_student_add.php b/Credentials/credentials_student_add.php
@@ -63,11 +63,11 @@
                 'allStudents' => $allStudents,
             ]);
             $page->breadcrumbs->add(
-                    Format::name('', $student['preferredName'], $student['surname'], 'Student'), 'credentials_student.php', [
-                'gibbonPersonID' => $gibbonPersonID,
-                'search' => $search,
-                'allStudents' => $allStudents,
-                    ]
+                Format::name('', $student['preferredName'], $student['surname'], 'Student'), 'credentials_student.php', [
+                    'gibbonPersonID' => $gibbonPersonID,
+                    'search' => $search,
+                    'allStudents' => $allStudents,
+                ]
             );
             $page->breadcrumbs->add(__m('Add Credential'));
 
@@ -77,16 +77,21 @@
             }
             $page->return->setEditLink($editLink);
 
-            if ($search != '') {
-                echo "<div class='linkTop'>";
-                echo "<a href='".$session->get('absoluteURL')."/index.php?q=/modules/Credentials/credentials_student.php&gibbonPersonID=$gibbonPersonID&search=$search&allStudents=$allStudents'>".__m('Back').'</a>';
-                echo '</div>';
-            }
-
             $form = Form::create('action', $session->get('absoluteURL').'/modules/'.$session->get('module').'/credentials_student_addProcess.php?gibbonPersonID='.$gibbonPersonID.'&search='.$search.'&allStudents='.$allStudents);
 
             $form->addHiddenValue('address', $session->get('address'));
 
+            if ($search != '') {
+                $params = [
+                    "search" => $search,
+                    "allStudents" => $allStudents,
+                    "gibbonPersonID" => $gibbonPersonID
+                ];
+                $form->addHeaderAction('back', __('Back'))
+                    ->setURL('/modules/Credentials/credentials_student.php')
+                    ->addParams($params);
+            }
+
             $credentialsWebsiteGateway = $container->get(CredentialsWebsiteGateway::class);
 
             $criteria = $credentialsWebsiteGateway->newQueryCriteria()

diff --git a/Credentials/credentials_student_edit.php b/Credentials/credentials_student_edit.php
@@ -47,10 +47,10 @@
         $searchColumns = $studentGateway->getSearchableColumns();
 
         $criteria = $studentGateway->newQueryCriteria()
-                ->searchBy($searchColumns, $search)
-                ->sortBy(['surname', 'preferredName'])
-                ->filterBy('all', $allStudents)
-                ->fromPOST();
+            ->searchBy($searchColumns, $search)
+            ->sortBy(['surname', 'preferredName'])
+            ->filterBy('all', $allStudents)
+            ->fromPOST();
         $students = $studentGateway->queryStudentBySchoolYear($criteria, $gibbonSchoolYearID, $gibbonPersonID);
 
         if ($students->getResultCount() != 1) {
@@ -66,11 +66,11 @@
                 'allStudents' => $allStudents,
             ]);
             $page->breadcrumbs->add(
-                    Format::name('', $student['preferredName'], $student['surname'], 'Student'), 'credentials_student.php', [
-                'gibbonPersonID' => $gibbonPersonID,
-                'search' => $search,
-                'allStudents' => $allStudents,
-                    ]
+                Format::name('', $student['preferredName'], $student['surname'], 'Student'), 'credentials_student.php', [
+                    'gibbonPersonID' => $gibbonPersonID,
+                    'search' => $search,
+                    'allStudents' => $allStudents,
+                ]
             );
             $page->breadcrumbs->add(__m('Edit Credential'));
 
@@ -85,12 +85,6 @@
                 //Let's go!
                 $values = $studentGateway->getById($credentialsCredentialID);
 
-                if ($search != '') {
-                    echo "<div class='linkTop'>";
-                    echo "<a href='".$session->get('absoluteURL')."/index.php?q=/modules/Credentials/credentials_student.php&gibbonPersonID=$gibbonPersonID&search=$search&allStudents=$allStudents'>".__m('Back').'</a>';
-                    echo '</div>';
-                }
-
                 if ($values['password'] != '') {
                     //Decrypt
                     $values['password'] = getDecryptCredentialOpenssl($values['password']);
@@ -100,6 +94,17 @@
 
                 $form->addHiddenValue('address', $session->get('address'));
 
+                if ($search != '') {
+                    $params = [
+                        "search" => $search,
+                        "allStudents" => $allStudents,
+                        "gibbonPersonID" => $gibbonPersonID
+                    ];
+                    $form->addHeaderAction('back', __('Back'))
+                        ->setURL('/modules/Credentials/credentials_student.php')
+                        ->addParams($params);
+                }
+
                 $sql = "SELECT credentialsWebsiteID as value, title as name FROM credentialsWebsite WHERE active='Y' ORDER BY title";
                 $row = $form->addRow();
                 $row->addLabel('credentialsWebsiteID', __m('Website'));

diff --git a/Credentials/manifest.php b/Credentials/manifest.php
@@ -25,7 +25,7 @@
 $entryURL = 'credentials.php';
 $type = 'Additional';
 $category = 'Admin';
-$version = '3.1.06';
+$version = '3.1.07';
 $author = 'Ross Parker';
 $url = 'http://rossparker.org';
 

diff --git a/Credentials/version.php b/Credentials/version.php
@@ -20,5 +20,5 @@
 /**
  * Sets version information.
  */
-$moduleVersion = '3.1.06';
-$coreVersion = '22.0.00';
+$moduleVersion = '3.1.07';
+$coreVersion = '23.0.00';