manuelcillero/suitedesk
manuelcillero/suitedesk
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

New way to initialize and modify filter parameters

Browse source
This commit is contained in:
Manuel Cillero 2017-09-18 03:00:12 +02:00
parent ce5f89b38f
commit 6b9f1ad9d5
14 changed files with 541 additions and 526 deletions
Download patch file Download diff file Expand all files Collapse all files

139
modules/storm/stormticket/stormticket.admin.inc
View file

@ -5,7 +5,6 @@
*/
function stormticket_list() {
global $user;
$breadcrumb = array();
@ -14,40 +13,41 @@ function stormticket_list() {
if (array_key_exists('organization_nid', $_GET)) {
if ($_SESSION['stormticket_list_filter']['organization_nid'] != $_GET['organization_nid']) {
$_SESSION['stormticket_list_filter']['organization_nid'] = $_GET['organization_nid'];
_storm_set_filter_param('ticket', 'organization_nid', $_GET['organization_nid']);
}
unset($_SESSION['stormticket_list_filter']['project_nid']);
unset($_SESSION['stormticket_list_filter']['task_nid']);
_storm_set_filter_param('ticket', 'project_nid');
_storm_set_filter_param('ticket', 'task_nid');
}
if (array_key_exists('project_nid', $_GET)) {
if ($_SESSION['stormticket_list_filter']['project_nid'] != $_GET['project_nid']) {
$_SESSION['stormticket_list_filter']['project_nid'] = $_GET['project_nid'];
_storm_set_filter_param('ticket', 'project_nid', $_GET['project_nid']);
}
$p = node_load($_GET['project_nid']);
$_SESSION['stormticket_list_filter']['organization_nid'] = $p->organization_nid;
unset($_SESSION['stormticket_list_filter']['task_nid']);
_storm_set_filter_param('ticket', 'organization_nid', $p->organization_nid);
_storm_set_filter_param('ticket', 'task_nid');
}
if (array_key_exists('task_nid', $_GET)) {
if ($_SESSION['stormticket_list_filter']['task_nid'] != $_GET['task_nid']) {
$_SESSION['stormticket_list_filter']['task_nid'] = $_GET['task_nid'];
_storm_set_filter_param('ticket', 'task_nid', $_GET['task_nid']);
}
$t = node_load($_GET['task_nid']);
$_SESSION['stormticket_list_filter']['organization_nid'] = $t->organization_nid;
$_SESSION['stormticket_list_filter']['project_nid'] = $t->project_nid;
_storm_set_filter_param('ticket', 'organization_nid', $t->organization_nid);
_storm_set_filter_param('ticket', 'project_nid', $t->project_nid);
}
if (array_key_exists('view', $_GET) && $_GET['view'] == 'all') {
$_SESSION['stormticket_list_filter']['ticketcategory'] = '-';
$_SESSION['stormticket_list_filter']['ticketstatus'] = '-';
$_SESSION['stormticket_list_filter']['ticketpriority'] = '-';
_storm_set_filter_param('ticket', 'ticketcategory', '-');
_storm_set_filter_param('ticket', 'ticketstatus', '-');
_storm_set_filter_param('ticket', 'ticketpriority', '-');
unset($_SESSION['stormticket_list_filter']['datebeginfrom']);
unset($_SESSION['stormticket_list_filter']['datebeginto']);
unset($_SESSION['stormticket_list_filter']['dateendfrom']);
unset($_SESSION['stormticket_list_filter']['dateendto']);
unset($_SESSION['stormticket_list_filter']['assigned_to']);
_storm_set_filter_param('ticket', 'datebeginfrom');
_storm_set_filter_param('ticket', 'datebeginto');
_storm_set_filter_param('ticket', 'dateendfrom');
_storm_set_filter_param('ticket', 'dateendto');
$_SESSION['stormticket_list_filter']['billable'] = '-';
$_SESSION['stormticket_list_filter']['billed'] = '-';
_storm_set_filter_param('ticket', 'assigned_to');
_storm_set_filter_param('ticket', 'billable', '-');
_storm_set_filter_param('ticket', 'billed', '-');
}
$i = new stdClass();
@ -99,28 +99,25 @@ function stormticket_list() {
LEFT JOIN {node_comment_statistics} AS ncs ON n.nid = ncs.nid
WHERE n.status=1 AND n.type='stormticket' ";
if (isset($_SESSION['stormticket_list_filter']['organization_nid']) && ($_SESSION['stormticket_list_filter']['organization_nid'] != 0)) {
if (_storm_isset_filter_param('ticket', 'organization_nid', 0)) {
$where[] = 'sti.organization_nid=%d';
$args[] = $_SESSION['stormticket_list_filter']['organization_nid'];
$filterfields[] = t('Organization');
}
if (isset($_SESSION['stormticket_list_filter']['project_nid']) && ($_SESSION['stormticket_list_filter']['project_nid'] != 0)) {
if (_storm_isset_filter_param('ticket', 'project_nid', 0)) {
$where[] = 'sti.project_nid=%d';
$args[] = $_SESSION['stormticket_list_filter']['project_nid'];
$filterfields[] = t('Project');
}
if (isset($_SESSION['stormticket_list_filter']['task_nid']) && ($_SESSION['stormticket_list_filter']['task_nid'] != 0)) {
if (_storm_isset_filter_param('ticket', 'task_nid', 0)) {
$where[] = 'sti.task_nid=%d';
$args[] = $_SESSION['stormticket_list_filter']['task_nid'];
$filterfields[] = t('Task');
}
$category_list = storm_attributes_bydomain('ticket category search');
$ticketcategory = isset($_SESSION['stormticket_list_filter']['ticketcategory']) ? $_SESSION['stormticket_list_filter']['ticketcategory'] : $category_list['default'];
$_SESSION['stormticket_list_filter']['ticketcategory'] = $ticketcategory;
if ($ticketcategory != '-') {
$category = split(',', $ticketcategory);
$category_list = storm_attributes_bydomain('Ticket category search');
if (_storm_isset_filter_param('ticket', 'ticketcategory', $category_list['default'], '-')) {
$category = split(',', $_SESSION['stormticket_list_filter']['ticketcategory']);
$v = array();
foreach ($category as $item) $v[] = '%s';
$where[] = "sti.ticketcategory IN ('". implode("','", $v) ."')";
@ -129,13 +126,9 @@ function stormticket_list() {
}
$filterfields[] = t('Category');
}
$status_list = storm_attributes_bydomain('ticket status search');
$ticketstatus = isset($_SESSION['stormticket_list_filter']['ticketstatus']) ? $_SESSION['stormticket_list_filter']['ticketstatus'] : $status_list['default'];
$_SESSION['stormticket_list_filter']['ticketstatus'] = $ticketstatus;
if ($ticketstatus != '-') {
$status = split(',', $ticketstatus);
$status_list = storm_attributes_bydomain('Ticket status search');
if (_storm_isset_filter_param('ticket', 'ticketstatus', $status_list['default'], '-')) {
$status = split(',', $_SESSION['stormticket_list_filter']['ticketstatus']);
$v = array();
foreach ($status as $item) $v[] = '%s';
$where[] = "sti.ticketstatus IN ('". implode("','", $v) ."')";
@ -144,13 +137,9 @@ function stormticket_list() {
}
$filterfields[] = t('Status');
}
$priority_list = storm_attributes_bydomain('ticket priority search');
$ticketpriority = isset($_SESSION['stormticket_list_filter']['ticketpriority']) ? $_SESSION['stormticket_list_filter']['ticketpriority'] : $priority_list['default'];
$_SESSION['stormticket_list_filter']['ticketpriority'] = $ticketpriority;
if ($ticketpriority != '-') {
$priority = split(',', $ticketpriority);
$priority_list = storm_attributes_bydomain('Ticket priority search');
if (_storm_isset_filter_param('ticket', 'ticketpriority', $priority_list['default'], '-')) {
$priority = split(',', $_SESSION['stormticket_list_filter']['ticketpriority']);
$v = array();
foreach ($priority as $item) $v[] = '%s';
$where[] = "sti.ticketpriority IN ('". implode("','", $v) ."')";
@ -160,7 +149,7 @@ function stormticket_list() {
$filterfields[] = t('Priority');
}
if (isset($_SESSION['stormticket_list_filter']['datebeginfrom'])) {
if (_storm_isset_filter_param('ticket', 'datebeginfrom')) {
$datebeginfrom = $_SESSION['stormticket_list_filter']['datebeginfrom'];
$datebeginfrom['hour'] = 0;
$datebeginfrom['minute'] = 0;
@ -171,8 +160,7 @@ function stormticket_list() {
$filterfields[] = t('Date');
}
}
if (isset($_SESSION['stormticket_list_filter']['datebeginto'])) {
if (_storm_isset_filter_param('ticket', 'datebeginto')) {
$datebeginto = $_SESSION['stormticket_list_filter']['datebeginto'];
$datebeginto['hour'] = 23;
$datebeginto['minute'] = 59;
@ -183,8 +171,7 @@ function stormticket_list() {
$filterfields[] = t('Date');
}
}
if (isset($_SESSION['stormticket_list_filter']['dateendfrom'])) {
if (_storm_isset_filter_param('ticket', 'dateendfrom')) {
$dateendfrom = $_SESSION['stormticket_list_filter']['dateendfrom'];
$dateendfrom['hour'] = 0;
$dateendfrom['minute'] = 0;
@ -195,8 +182,7 @@ function stormticket_list() {
$filterfields[] = t('Date');
}
}
if (isset($_SESSION['stormticket_list_filter']['dateendto'])) {
if (_storm_isset_filter_param('ticket', 'dateendto')) {
$dateendto = $_SESSION['stormticket_list_filter']['dateendto'];
$dateendto['hour'] = 23;
$dateendto['minute'] = 59;
@ -208,21 +194,25 @@ function stormticket_list() {
}
}
if (isset($_SESSION['stormticket_list_filter']['assigned_to'])) {
if (_storm_isset_filter_param('ticket', 'assigned_to')) {
if (!is_numeric($_SESSION['stormticket_list_filter']['assigned_to'])) {
switch ($_SESSION['stormticket_list_filter']['assigned_to']) {
case 'all':
// NO FILTER
break;
case 'mine':
// CURRENT USER
if (!empty($user->stormperson_nid) && is_numeric($user->stormperson_nid)) {
$assigned_to_nid = $user->stormperson_nid;
}
break;
case 'none':
$where[] = '(sti.assigned_nid IS NULL OR sti.assigned_nid = 0) ';
break;
}
}
else {
@ -235,20 +225,18 @@ function stormticket_list() {
}
}
if (isset($_SESSION['stormticket_list_filter']['billable']) && $_SESSION['stormticket_list_filter']['billable'] != '-') {
if (_storm_isset_filter_param('ticket', 'billable', '-')) {
$where[] = 'sti.billable=%d';
$args[] = $_SESSION['stormticket_list_filter']['billable'];
$filterfields[] = t('Billable');
}
if (isset($_SESSION['stormticket_list_filter']['billed']) && $_SESSION['stormticket_list_filter']['billed'] != '-') {
if (_storm_isset_filter_param('ticket', 'billed', '-')) {
$where[] = 'sti.billed=%d';
$args[] = $_SESSION['stormticket_list_filter']['billed'];
$filterfields[] = t('Billed');
}
$itemsperpage = isset($_SESSION['stormticket_list_filter']['itemsperpage']) ? $_SESSION['stormticket_list_filter']['itemsperpage'] : variable_get('storm_default_items_per_page', 10);
$_SESSION['stormticket_list_filter']['itemsperpage'] = $itemsperpage;
$itemsperpage = _storm_get_filter_param('ticket', 'itemsperpage', variable_get('storm_default_items_per_page', 10));
if (count($filterfields)==0) {
$filterdesc = t('Not filtered');
@ -277,28 +265,31 @@ function stormticket_list() {
}
function stormticket_list_filter(&$form_state, $filterdesc='Filter') {
$organization_nid = isset($_SESSION['stormticket_list_filter']['organization_nid']) ? $_SESSION['stormticket_list_filter']['organization_nid'] : 0;
$project_nid = isset($_SESSION['stormticket_list_filter']['project_nid']) ? $_SESSION['stormticket_list_filter']['project_nid'] : 0;
$task_nid = isset($_SESSION['stormticket_list_filter']['task_nid']) ? $_SESSION['stormticket_list_filter']['task_nid'] : 0;
$organization_nid = _storm_get_filter_param('ticket', 'organization_nid', 0);
$project_nid = _storm_get_filter_param('ticket', 'project_nid', 0);
$task_nid = _storm_get_filter_param('ticket', 'task_nid', 0);
$category_list = storm_attributes_bydomain('ticket category search');
$ticketcategory = isset($_SESSION['stormticket_list_filter']['ticketcategory']) ? $_SESSION['stormticket_list_filter']['ticketcategory'] : $category_list['default'];
$category_list = storm_attributes_bydomain('Ticket category search');
$ticketcategory = _storm_get_filter_param('ticket', 'ticketcategory', $category_list['default']);
$status_list = storm_attributes_bydomain('ticket status search');
$ticketstatus = isset($_SESSION['stormticket_list_filter']['ticketstatus']) ? $_SESSION['stormticket_list_filter']['ticketstatus'] : $status_list['default'];
$status_list = storm_attributes_bydomain('Ticket status search');
$ticketstatus = _storm_get_filter_param('ticket', 'ticketstatus', $status_list['default']);
$priority_list = storm_attributes_bydomain('ticket priority search');
$ticketpriority = isset($_SESSION['stormticket_list_filter']['ticketpriority']) ? $_SESSION['stormticket_list_filter']['ticketpriority'] : $priority_list['default'];
$priority_list = storm_attributes_bydomain('Ticket priority search');
$ticketpriority = _storm_get_filter_param('ticket', 'ticketpriority', $priority_list['default']);
$itemsperpage = isset($_SESSION['stormticket_list_filter']['itemsperpage']) ? $_SESSION['stormticket_list_filter']['itemsperpage'] : variable_get('storm_default_items_per_page', 10);
$_SESSION['stormticket_list_filter']['itemsperpage'] = $itemsperpage;
$datebeginfrom = _storm_get_filter_param('ticket', 'datebeginfrom');
$datebeginto = _storm_get_filter_param('ticket', 'datebeginto');
$dateendfrom = _storm_get_filter_param('ticket', 'dateendfrom');
$dateendto = _storm_get_filter_param('ticket', 'dateendto');
$datebeginfrom = isset($_SESSION['stormticket_list_filter']['datebeginfrom']) ? $_SESSION['stormticket_list_filter']['datebeginfrom'] : NULL;
$datebeginto = isset($_SESSION['stormticket_list_filter']['datebeginto']) ? $_SESSION['stormticket_list_filter']['datebeginto'] : NULL;
$dateendfrom = isset($_SESSION['stormticket_list_filter']['dateendfrom']) ? $_SESSION['stormticket_list_filter']['dateendfrom'] : NULL;
$dateendto = isset($_SESSION['stormticket_list_filter']['dateendto']) ? $_SESSION['stormticket_list_filter']['dateendto'] : NULL;
$assigned_to = _storm_get_filter_param('ticket', 'assigned_to');
$billable = _storm_get_filter_param('ticket', 'billable', '-');
$billed = _storm_get_filter_param('ticket', 'billed', '-');
$itemsperpage = _storm_get_filter_param('ticket', 'itemsperpage', variable_get('storm_default_items_per_page', 10));
$assigned_to = isset($_SESSION['stormticket_list_filter']['assigned_to']) ? $_SESSION['stormticket_list_filter']['assigned_to'] : NULL;
$form = array();
@ -450,14 +441,14 @@ function stormticket_list_filter(&$form_state, $filterdesc='Filter') {
'#type' => 'select',
'#title' => t('Billable'),
'#options' => array('-' => t('all'), '1' => t('billable'), '0' => t('not billable')),
'#default_value' => isset($_SESSION['stormticket_list_filter']['billable']) ? $_SESSION['stormticket_list_filter']['billable'] : '-',
'#default_value' => $billable,
);
$form['filter']['group4_1']['billed'] = array(
'#type' => 'select',
'#title' => t('Billed'),
'#options' => array('-' => t('all'), '1' => t('billed'), '0' => t('not billed')),
'#default_value' => isset($_SESSION['stormticket_list_filter']['billed']) ? $_SESSION['stormticket_list_filter']['billed'] : '-',
'#default_value' => $billed,
);
$form['filter']['group5'] = array(