v2.3.00

GibbonEdu · Dec 12, 2024 · 2c3be61 · 2c3be61
1 parent 9e303c3
commit 2c3be61
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 30 deletions.
diff --git a/Help Desk/CHANGEDB.php b/Help Desk/CHANGEDB.php
@@ -439,3 +439,8 @@
 ++$count;
 $sql[$count][0] = '2.2.01';
 $sql[$count][1] = "";
+
+//v2.3.00
+++$count;
+$sql[$count][0] = '2.3.00';
+$sql[$count][1] = "";
diff --git a/Help Desk/CHANGELOG.txt b/Help Desk/CHANGELOG.txt
@@ -1,5 +1,9 @@
 CHANGELOG
 =========
+v2.3.00
+-------
+Gibbon v28 support
+
 v2.2.01
 -------
 Fixed CSS bug introduced in last version

diff --git a/Help Desk/issues_discussView.php b/Help Desk/issues_discussView.php
@@ -119,11 +119,6 @@
                                 ->addParam('issueID', $issueID);
                     }
                 } else {
-                    $table->addHeaderAction('refresh', __('Refresh'))
-                            ->setIcon('refresh')
-                            ->setURL('/modules/' . $session->get('module') . '/issues_discussView.php')
-                            ->addParam('issueID', $issueID);
-
                     if (($techGroupGateway->getPermissionValue($gibbonPersonID, 'reassignIssue') && !$isPersonsIssue) || $hasFullAccess) {
                         $table->addHeaderAction('reassign', __('Reassign'))
                                 ->setIcon('attendance')
@@ -172,28 +167,24 @@
 
             if ($isTechnician && !$isPersonsIssue && $settingGateway->getSettingByScope('Help Desk', 'techNotes')) {
                 $form = Form::create('techNotes',  $session->get('absoluteURL') . '/modules/' . $session->get('module') . '/issues_discussNoteProccess.php', 'post');
+                $form->setAttribute('x-data', '{comments: false, invalid: false, submitting: false}');
                 $form->addHiddenValue('issueID', $issueID);
                 $form->addHiddenValue('address', $session->get('address'));
 
                 $row = $form->addRow();
                     $col = $row->addColumn();
                         $col->addHeading(__('Technician Notes'))->addClass('inline-block');
 
-                    $col->addWebLink('<img title="'.__('Add Technician Note').'" src="./themes/'.$session->get('gibbonThemeName').'/img/plus.png" />')
-                        ->addData('toggle', '.techNote')
-                        ->addClass('floatRight');
+                    $col->addButton(__('Add Technician Note'))->setIcon('add')->addClass('float-right')->setAttribute('@click', 'comments = !comments');
 
-                $row = $form->addRow()->setClass('techNote hidden flex flex-col sm:flex-row items-stretch sm:items-center');
+                $row = $form->addRow()->setClass('flex flex-col sm:flex-row items-stretch sm:items-center')->setAttribute('x-cloak')->setAttribute('x-show', 'comments');
                     $col = $row->addColumn();
                         $col->addLabel('techNote', __('Technician Note'));
                         $col->addEditor('techNote', $guid)
                             ->setRows(5)
                             ->showMedia()
                             ->required();
-
-                $row = $form->addRow()->setClass('techNote hidden flex flex-col sm:flex-row items-stretch sm:items-center');;
-                    $row->addFooter();
-                    $row->addSubmit();
+                        $col->addSubmit();
 
                 $issueNoteGateway = $container->get(IssueNoteGateway::class);
                 $notes = $issueNoteGateway->getIssueNotesByID($issueID)->fetchAll();
@@ -212,13 +203,14 @@
 
 
             $form = Form::create('issueDiscuss',  $session->get('absoluteURL') . '/modules/' . $session->get('module') . '/issues_discussPostProccess.php?issueID=' . $issueID, 'post');
+            $form->setAttribute('x-data', '{comments: false, invalid: false, submitting: false}');
             $form->addHiddenValue('address', $session->get('address'));
             $row = $form->addRow();
             $col = $row->addColumn();
                 $col->addHeading(__('Comments'))->addClass('inline-block');
 
             if ($issue['status'] == 'Pending' && ($isRelated || $hasFullAccess)) {
-                $col->addWebLink('<img title="'.__('Add Comment').'" src="./themes/'.$session->get('gibbonThemeName').'/img/plus.png" />')->addData('toggle', '.comment')->addClass('floatRight');
+                $col->addButton(__('Add Comment'))->setIcon('add')->addClass('float-right')->setAttribute('@click', 'comments = !comments');
 
                 if ($isTechnician) {
                     $replyTemplateGateway = $container->get(ReplyTemplateGateway::class);
@@ -232,25 +224,20 @@
                         $templates[$replyTemplate['helpDeskReplyTemplateID']] = $replyTemplate['body'];
                     }
                     if ($templates != NULL) {
-                        $row = $form->addRow()->setClass('comment hidden flex flex-col sm:flex-row items-stretch sm:items-center');
+                        $row = $form->addRow()->setClass('flex flex-col sm:flex-row items-stretch sm:items-center')->setAttribute('x-cloak')->setAttribute('x-show', 'comments');
                             $row->addLabel('replyTemplates', __('Reply Templates'));
                             $row->addSelect('replyTemplates')
                                 ->fromArray($templateNames)->placeholder('Select a Reply Template');
                     }
                 }
-                $row = $form->addRow()->setClass('comment hidden flex flex-col sm:flex-row items-stretch sm:items-center');
+                $row = $form->addRow()->setClass('flex flex-col sm:flex-row items-stretch sm:items-center')->setAttribute('x-cloak')->setAttribute('x-show', 'comments');
                     $column = $row->addColumn();
                     $column->addLabel('comment', __('Comment'));
                     $column->addEditor('comment', $guid)
                         ->setRows(5)
                         ->showMedia()
                         ->required();
-
-                $row = $form->addRow()->setClass('comment hidden flex flex-col sm:flex-row items-stretch sm:items-center');
-                    $row->addFooter();
-                    $row->addSubmit();
-
-
+                    $column->addSubmit();
 
             }
 

diff --git a/Help Desk/issues_view.php b/Help Desk/issues_view.php
@@ -105,7 +105,7 @@
     $form->addHiddenValue('q', '/modules/' . $moduleName . '/issues_view.php');
     $form->addHiddenValue('address', $session->get('address'));
 
-    $form->setClass('noIntBorder fullWidth standardForm');
+    $form->setClass('noIntBorder w-full standardForm');
     $form->setTitle(__('Search & Filter'));
 
     $row = $form->addRow();

diff --git a/Help Desk/js/module.js b/Help Desk/js/module.js
@@ -1,4 +1,4 @@
-Gibbon: the flexible, open school platform
+/* Gibbon: the flexible, open school platform
 Founded by Ross Parker at ICHK Secondary. Built by Ross Parker, Sandra Kuipers and the Gibbon community (https://gibbonedu.org/about/)
 Copyright © 2010, Gibbon Foundation
 Gibbon™, Gibbon Education Ltd. (Hong Kong)
@@ -15,4 +15,4 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+*/
diff --git a/Help Desk/manifest.php b/Help Desk/manifest.php
@@ -25,7 +25,7 @@
 $entryURL       = 'issues_view.php';
 $type           = 'Additional';
 $category       = 'Other';
-$version        = '2.2.01';
+$version        = '2.3.00';
 $author         = "Gibbon Foundation";
 $url            = "https://gibbonedu.org";
 

diff --git a/Help Desk/tests/_support/AcceptanceTester.php b/Help Desk/tests/_support/AcceptanceTester.php
@@ -314,7 +314,7 @@ public function deleteDepartment()
         $I = $this;
         $I->amOnModulePage('Help Desk', 'helpDesk_manageDepartments.php');
         $I->click("Delete", "//td[contains(text(),'Test Department')]//..");
-        $I->click('Yes');
+        $I->click('Delete');
         $I->seeSuccessMessage();
     }
 
@@ -330,7 +330,7 @@ public function deleteSubcategory($departmentID, $subcategoryID)
     {
         $I = $this;
         $I->click("Delete", "//td[contains(text(),'Test Subcategory')]//..");
-        $I->click('Yes');
+        $I->click('Delete');
         $I->seeSuccessMessage();
     }
 

diff --git a/Help Desk/version.php b/Help Desk/version.php
@@ -22,7 +22,7 @@
 /**
  * Sets version information
  */
-$moduleVersion='2.2.01';
-$coreVersion = '22.0.00';
+$moduleVersion='2.3.00';
+$coreVersion = '28.0.00';
 
 ?>