AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-02-28 02:44:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dedup More Pagination code you now only have to define Sortby column and its order, also fixed issue when searching by date it would close on the first query

Browse Source
This commit is contained in:
johnnyq
2023-02-24 20:22:57 -05:00
parent 704c8e409f
commit 6f0017d90b
42 changed files with 288 additions and 977 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
tickets.php
View File

@@ -1,40 +1,10 @@
<?php include("inc_all.php");
<?php
//Paging
if (isset($_GET['p'])) {
$p = intval($_GET['p']);
$record_from = (($p) - 1) * $_SESSION['records_per_page'];
$record_to = $_SESSION['records_per_page'];
} else {
$record_from = 0;
$record_to = $_SESSION['records_per_page'];
$p = 1;
}
// Default Column Sortby Filter
$sb = "ticket_number";
$o = "DESC";
if (isset($_GET['q'])) {
$q = sanitizeInput($_GET['q']);
} else {
$q = "";
}
if (!empty($_GET['sb'])) {
$sb = sanitizeInput($_GET['sb']);
} else {
$sb = "ticket_number";
}
if (isset($_GET['o'])) {
if ($_GET['o'] == 'ASC') {
$o = "ASC";
$disp = "DESC";
} else {
$o = "DESC";
$disp = "ASC";
}
} else {
$o = "DESC";
$disp = "ASC";
}
require_once("inc_all.php");
// Ticket status from GET
if (!isset($_GET['status'])) {
@@ -64,46 +34,6 @@ if (isset($_GET['assigned']) & !empty($_GET['assigned'])) {
$ticket_assigned_filter = '';
}
//Date Filter
if (empty($_GET['canned_date'])) {
//Prevents lots of undefined variable errors.
// $dtf and $dtt will be set by the below else to 0000-00-00 / 9999-00-00
$_GET['canned_date'] = 'custom';
}
if ($_GET['canned_date'] == "custom" && !empty($_GET['dtf'])) {
$dtf = sanitizeInput($_GET['dtf']);
$dtt = sanitizeInput($_GET['dtt']);
} elseif ($_GET['canned_date'] == "today") {
$dtf = date('Y-m-d');
$dtt = date('Y-m-d');
} elseif ($_GET['canned_date'] == "yesterday") {
$dtf = date('Y-m-d', strtotime("yesterday"));
$dtt = date('Y-m-d', strtotime("yesterday"));
} elseif ($_GET['canned_date'] == "thisweek") {
$dtf = date('Y-m-d', strtotime("monday this week"));
$dtt = date('Y-m-d');
} elseif ($_GET['canned_date'] == "lastweek") {
$dtf = date('Y-m-d', strtotime("monday last week"));
$dtt = date('Y-m-d', strtotime("sunday last week"));
} elseif ($_GET['canned_date'] == "thismonth") {
$dtf = date('Y-m-01');
$dtt = date('Y-m-d');
} elseif ($_GET['canned_date'] == "lastmonth") {
$dtf = date('Y-m-d', strtotime("first day of last month"));
$dtt = date('Y-m-d', strtotime("last day of last month"));
} elseif ($_GET['canned_date'] == "thisyear") {
$dtf = date('Y-01-01');
$dtt = date('Y-m-d');
} elseif ($_GET['canned_date'] == "lastyear") {
$dtf = date('Y-m-d', strtotime("first day of january last year"));
$dtt = date('Y-m-d', strtotime("last day of december last year"));
} else {
$dtf = "0000-00-00";
$dtt = "9999-00-00";
}
//Rebuild URL
$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o, 'status' => $status, 'assigned' => $ticket_assigned_filter)));
@@ -207,9 +137,7 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']);
</div>
</div>
<div class="collapse <?php if (!empty($_GET['dtf'])) {
echo "show";
} ?>" id="advancedFilter">
<div class="collapse <?php if (!empty($_GET['dtf']) || $_GET['canned_date'] !== "custom" ) { echo "show"; } ?>" id="advancedFilter">
<div class="row">
<div class="col-md-2">
<div class="form-group">