v2.1.02

GibbonEdu · Sep 29, 2022 · 65663b3 · 65663b3
1 parent 3ac0ca9
commit 65663b3
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 9 deletions.
diff --git a/Help Desk/CHANGEDB.php b/Help Desk/CHANGEDB.php
@@ -409,3 +409,9 @@
 $sql[$count][0]="2.1.01";
 $sql[$count][1]="
 ";
+
+//v2.1.02
+$count++;
+$sql[$count][0]="2.1.02";
+$sql[$count][1]="
+";
diff --git a/Help Desk/CHANGELOG.txt b/Help Desk/CHANGELOG.txt
@@ -1,5 +1,10 @@
 CHANGELOG
 =========
+v2.1.02
+-------
+Added school-year date defaults to the Issues page
+Added an "Advanced Options" show/hide to the Issues page
+
 v2.1.01
 -------
 Fixed attachments not showing up in initial issue description

diff --git a/Help Desk/issues_view.php b/Help Desk/issues_view.php
@@ -23,6 +23,7 @@
 use Gibbon\Tables\DataTable;
 use Gibbon\Domain\User\UserGateway;
 use Gibbon\Domain\School\FacilityGateway;
+use Gibbon\Domain\School\SchoolYearGateway;
 use Gibbon\Module\HelpDesk\Domain\DepartmentGateway;
 use Gibbon\Module\HelpDesk\Domain\DepartmentPermissionsGateway;
 use Gibbon\Module\HelpDesk\Domain\GroupDepartmentGateway;
@@ -41,12 +42,12 @@
     //Acess denied
     $page->addError(__('You do not have access to this action.'));
 } else {
-
     $gibbonPersonID = $session->get('gibbonPersonID');
     $moduleName = $session->get('module');
-    $startDate = isset($_GET['startDate']) ? Format::dateConvert($_GET['startDate']) : NULL;
-    $endDate = isset($_GET['endDate']) ? Format::dateConvert($_GET['endDate']) : NULL;
-
+
+    $schoolYear = $container->get(SchoolYearGateway::class)->getByID($session->get('gibbonSchoolYearID'), ['firstDay', 'lastDay']);
+    $startDate = isset($_GET['startDate']) ? Format::dateConvert($_GET['startDate']) : ($schoolYear['firstDay'] ?? null);
+    $endDate = isset($_GET['endDate']) ? Format::dateConvert($_GET['endDate']) : ($schoolYear['lastDay'] ?? null);
 
     $relation = $_GET['relation'] ?? null;
 
@@ -112,28 +113,31 @@
             ->setValue($criteria->getSearchText());
 
     if (count($relations) > 1) {
-        $row = $form->addRow();
+        $row = $form->addRow()->addClass('advancedOptions hidden');
             $row->addLabel('relation', __('Relation'));
             $row->addSelect('relation')
                 ->fromArray($relations)
                 ->selected($relation);
     }
 
-    $row = $form->addRow();
+    $row = $form->addRow()->addClass('advancedOptions hidden');
         $row->addLabel('startDate', __('Start Date Filter'));
         $row->addDate('startDate')
             ->setDateFromValue($startDate)
             ->chainedTo('endDate')
             ->required();
 
-    $row = $form->addRow();
+    $row = $form->addRow()->addClass('advancedOptions hidden');
         $row->addLabel('endDate', __('End Date Filter'));
         $row->addDate('endDate')
             ->setDateFromValue($endDate)
             ->chainedFrom('startDate')
             ->required();
 
     $row = $form->addRow();
+        $row->addContent('<a class="button rounded-sm" onclick="false" data-toggle=".advancedOptions">'.__('Advanced Options').'</a>')
+                ->wrap('<span class="small">', '</span>')
+                ->setClass('left');
         $row->addSearchSubmit($session, __('Clear Filters'));
 
     echo $form->getOutput();

diff --git a/Help Desk/manifest.php b/Help Desk/manifest.php
@@ -23,7 +23,7 @@
 $entryURL       = 'issues_view.php';
 $type           = 'Additional';
 $category       = 'Other';
-$version        = '2.1.01';
+$version        = '2.1.02';
 $author         = 'Ray Clark, Ashton Power & Adrien Tremblay';
 $url            = 'https://github.com/GibbonEdu/module-helpDesk';
 

diff --git a/Help Desk/version.php b/Help Desk/version.php
@@ -20,7 +20,7 @@
 /**
  * Sets version information
  */
-$moduleVersion='2.1.01';
+$moduleVersion='2.1.02';
 $coreVersion = '22.0.00';
 
 ?>