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

114
modules/storm/stormtimetracking/stormtimetracking.admin.inc
View file

@ -11,46 +11,47 @@ function stormtimetracking_list() {
if (array_key_exists('organization_nid', $_GET)) {
if ($_SESSION['stormtimetracking_list_filter']['organization_nid'] != $_GET['organization_nid']) {
$_SESSION['stormtimetracking_list_filter']['organization_nid'] = $_GET['organization_nid'];
_storm_set_filter_param('timetracking', 'organization_nid', $_GET['organization_nid']);
}
unset($_SESSION['stormtimetracking_list_filter']['project_nid']);
unset($_SESSION['stormtimetracking_list_filter']['task_nid']);
unset($_SESSION['stormtimetracking_list_filter']['ticket_nid']);
_storm_set_filter_param('timetracking', 'project_nid');
_storm_set_filter_param('timetracking', 'task_nid');
_storm_set_filter_param('timetracking', 'ticket_nid');
}
if (array_key_exists('project_nid', $_GET)) {
if ($_SESSION['stormtimetracking_list_filter']['project_nid'] != $_GET['project_nid']) {
$_SESSION['stormtimetracking_list_filter']['project_nid'] = $_GET['project_nid'];
_storm_set_filter_param('timetracking', 'project_nid', $_GET['project_nid']);
}
$p = node_load($_GET['project_nid']);
$_SESSION['stormtimetracking_list_filter']['organization_nid'] = $p->organization_nid;
unset($_SESSION['stormtimetracking_list_filter']['task_nid']);
unset($_SESSION['stormtimetracking_list_filter']['ticket_nid']);
_storm_set_filter_param('timetracking', 'organization_nid', $p->organization_nid);
_storm_set_filter_param('timetracking', 'task_nid');
_storm_set_filter_param('timetracking', 'ticket_nid');
}
if (array_key_exists('task_nid', $_GET)) {
if ($_SESSION['stormtimetracking_list_filter']['task_nid'] != $_GET['task_nid']) {
$_SESSION['stormtimetracking_list_filter']['task_nid'] = $_GET['task_nid'];
_storm_set_filter_param('timetracking', 'task_nid', $_GET['task_nid']);
}
$t = node_load($_GET['task_nid']);
$_SESSION['stormtimetracking_list_filter']['organization_nid'] = $t->organization_nid;
$_SESSION['stormtimetracking_list_filter']['project_nid'] = $t->project_nid;
unset($_SESSION['stormtimetracking_list_filter']['ticket_nid']);
_storm_set_filter_param('timetracking', 'organization_nid', $t->organization_nid);
_storm_set_filter_param('timetracking', 'project_nid', $t->project_nid);
_storm_set_filter_param('timetracking', 'ticket_nid');
}
if (array_key_exists('ticket_nid', $_GET)) {
if ($_SESSION['stormtimetracking_list_filter']['ticket_nid'] != $_GET['ticket_nid']) {
$_SESSION['stormtimetracking_list_filter']['ticket_nid'] = $_GET['ticket_nid'];
_storm_set_filter_param('timetracking', 'ticket_nid', $_GET['ticket_nid']);
}
$ti = node_load($_GET['ticket_nid']);
$_SESSION['stormtimetracking_list_filter']['organization_nid'] = $ti->organization_nid;
$_SESSION['stormtimetracking_list_filter']['project_nid'] = $ti->project_nid;
$_SESSION['stormtimetracking_list_filter']['task_nid'] = $ti->task_nid;
_storm_set_filter_param('timetracking', 'organization_nid', $ti->organization_nid);
_storm_set_filter_param('timetracking', 'project_nid', $ti->project_nid);
_storm_set_filter_param('timetracking', 'task_nid', $ti->task_nid);
}
if (array_key_exists('view', $_GET) && $_GET['view'] == 'all') {
unset($_SESSION['stormtimetracking_list_filter']['datefrom']);
unset($_SESSION['stormtimetracking_list_filter']['dateto']);
_storm_set_filter_param('timetracking', 'datefrom');
_storm_set_filter_param('timetracking', 'dateto');
$_SESSION['stormtimetracking_list_filter']['user'] = '';
$_SESSION['stormtimetracking_list_filter']['billable'] = '-';
$_SESSION['stormtimetracking_list_filter']['billed'] = '-';
_storm_set_filter_param('timetracking', 'user', '');
_storm_set_filter_param('timetracking', 'billable', '-');
_storm_set_filter_param('timetracking', 'billed', '-');
}
$i = new stdClass();
@ -80,6 +81,10 @@ function stormtimetracking_list() {
),
);
$where = array();
$args = array();
$filterfields = array();
$s = "SELECT n.*, stt.*, nre.format FROM {node} n
INNER JOIN {stormtimetracking} stt ON n.vid=stt.vid
INNER JOIN {node_revisions} AS nre ON n.vid = nre.vid
@ -87,31 +92,28 @@ function stormtimetracking_list() {
$s_duration = "SELECT SUM(billing_duration) FROM {stormtimetracking} stt INNER JOIN {node} n ON n.vid=stt.vid WHERE n.status=1 AND n.type='stormtimetracking' ";
$where = array();
$args = array();
$filterfields = array();
if (isset($_SESSION['stormtimetracking_list_filter']['organization_nid']) && $_SESSION['stormtimetracking_list_filter']['organization_nid'] != 0) {
if (_storm_isset_filter_param('timetracking', 'organization_nid', 0)) {
$where[] = 'stt.organization_nid=%d';
$args[] = $_SESSION['stormtimetracking_list_filter']['organization_nid'];
$filterfields[] = t('Organization');
}
if (isset($_SESSION['stormtimetracking_list_filter']['project_nid']) && $_SESSION['stormtimetracking_list_filter']['project_nid'] != 0) {
if (_storm_isset_filter_param('timetracking', 'project_nid', 0)) {
$where[] = 'stt.project_nid=%d';
$args[] = $_SESSION['stormtimetracking_list_filter']['project_nid'];
$filterfields[] = t('Project');
}
if (isset($_SESSION['stormtimetracking_list_filter']['task_nid']) && $_SESSION['stormtimetracking_list_filter']['task_nid'] != 0) {
if (_storm_isset_filter_param('timetracking', 'task_nid', 0)) {
$where[] = 'stt.task_nid=%d';
$args[] = $_SESSION['stormtimetracking_list_filter']['task_nid'];
$filterfields[] = t('Task');
}
if (isset($_SESSION['stormtimetracking_list_filter']['ticket_nid']) && $_SESSION['stormtimetracking_list_filter']['ticket_nid'] != 0) {
if (_storm_isset_filter_param('timetracking', 'ticket_nid', 0)) {
$where[] = 'stt.ticket_nid=%d';
$args[] = $_SESSION['stormtimetracking_list_filter']['ticket_nid'];
$filterfields[] = t('Ticket');
}
if (isset($_SESSION['stormtimetracking_list_filter']['datefrom']) && $_SESSION['stormtimetracking_list_filter']['datefrom']['day'] != -1) {
if (_storm_isset_filter_param('timetracking', 'datefrom', NULL, -1)) {
$datefrom = $_SESSION['stormtimetracking_list_filter']['datefrom'];
$datefrom['hour'] = 0;
$datefrom['minute'] = 0;
@ -119,7 +121,7 @@ function stormtimetracking_list() {
$args[] = _storm_datetime_to_gmtimestamp($datefrom);
$filterfields[] = t('Date');
}
if (isset($_SESSION['stormtimetracking_list_filter']['dateto']) && $_SESSION['stormtimetracking_list_filter']['dateto']['day'] != -1) {
if (_storm_isset_filter_param('timetracking', 'dateto', NULL, -1)) {
$dateto = $_SESSION['stormtimetracking_list_filter']['dateto'];
$dateto['hour'] = 23;
$dateto['minute'] = 59;
@ -127,20 +129,8 @@ function stormtimetracking_list() {
$args[] = _storm_datetime_to_gmtimestamp($dateto);
$filterfields[] = t('Date');
}
if (isset($_SESSION['stormtimetracking_list_filter']['billable']) && $_SESSION['stormtimetracking_list_filter']['billable'] != '-') {
$where[] = 'stt.billable=%d';
$args[] = $_SESSION['stormtimetracking_list_filter']['billable'];
$filterfields[] = t('Billable');
}
if (isset($_SESSION['stormtimetracking_list_filter']['billed']) && $_SESSION['stormtimetracking_list_filter']['billed'] != '-') {
$where[] = 'stt.billed=%d';
$args[] = $_SESSION['stormtimetracking_list_filter']['billed'];
$filterfields[] = t('Billed');
}
$itemsperpage = isset($_SESSION['stormtimetracking_list_filter']['itemsperpage']) ? $_SESSION['stormtimetracking_list_filter']['itemsperpage'] : variable_get('storm_default_items_per_page', 10);
if (isset($_SESSION['stormtimetracking_list_filter']['user']) && $_SESSION['stormtimetracking_list_filter']['user'] != '') {
if (_storm_isset_filter_param('timetracking', 'user', '')) {
$trackinguser = user_load(array('name' => $_SESSION['stormtimetracking_list_filter']['user']));
if ($trackinguser === FALSE) $trackinguser->uid = -1;
$where[] = 'n.uid=%d';
@ -148,6 +138,19 @@ function stormtimetracking_list() {
$filterfields[] = t('User');
}
if (_storm_isset_filter_param('timetracking', 'billable', '-')) {
$where[] = 'stt.billable=%d';
$args[] = $_SESSION['stormtimetracking_list_filter']['billable'];
$filterfields[] = t('Billable');
}
if (_storm_isset_filter_param('timetracking', 'billed', '-')) {
$where[] = 'stt.billed=%d';
$args[] = $_SESSION['stormtimetracking_list_filter']['billed'];
$filterfields[] = t('Billed');
}
$itemsperpage = _storm_get_filter_param('timetracking', 'itemsperpage', variable_get('storm_default_items_per_page', 10));
if (count($filterfields) == 0) {
$filterdesc = t('Not filtered');
}
@ -183,18 +186,21 @@ function stormtimetracking_list() {
}
function stormtimetracking_list_filter(&$form_state, $filterdesc = 'Filter') {
$organization_nid = isset($_SESSION['stormtimetracking_list_filter']['organization_nid']) ? $_SESSION['stormtimetracking_list_filter']['organization_nid'] : 0;
$project_nid = isset($_SESSION['stormtimetracking_list_filter']['project_nid']) ? $_SESSION['stormtimetracking_list_filter']['project_nid'] : 0 ;
$task_nid = isset($_SESSION['stormtimetracking_list_filter']['task_nid']) ? $_SESSION['stormtimetracking_list_filter']['task_nid'] : 0;
$ticket_nid = isset($_SESSION['stormtimetracking_list_filter']['ticket_nid']) ? $_SESSION['stormtimetracking_list_filter']['ticket_nid'] : 0;
$itemsperpage = isset($_SESSION['stormtimetracking_list_filter']['itemsperpage']) ? $_SESSION['stormtimetracking_list_filter']['itemsperpage'] : variable_get('storm_default_items_per_page', 10);
$organization_nid = _storm_get_filter_param('timetracking', 'organization_nid', 0);
$project_nid = _storm_get_filter_param('timetracking', 'project_nid', 0);
$task_nid = _storm_get_filter_param('timetracking', 'task_nid', 0);
$ticket_nid = _storm_get_filter_param('timetracking', 'ticket_nid', 0);
$datefrom = isset($_SESSION['stormtimetracking_list_filter']['datefrom']) ? $_SESSION['stormtimetracking_list_filter']['datefrom'] : NULL;
$dateto = isset($_SESSION['stormtimetracking_list_filter']['dateto']) ? $_SESSION['stormtimetracking_list_filter']['dateto'] : NULL ;
$datefrom = _storm_get_filter_param('timetracking', 'datefrom');
$dateto = _storm_get_filter_param('timetracking', 'dateto');
$trackinguser = _storm_get_filter_param('timetracking', 'user', '');
$billable = _storm_get_filter_param('timetracking', 'billable', '-');
$billed = _storm_get_filter_param('timetracking', 'billed', '-');
$itemsperpage = _storm_get_filter_param('timetracking', 'itemsperpage', variable_get('storm_default_items_per_page', 10));
$trackinguser = isset($_SESSION['stormtimetracking_list_filter']['user']) ? $_SESSION['stormtimetracking_list_filter']['user'] : '';
$billable = isset($_SESSION['stormtimetracking_list_filter']['billable']) ? $_SESSION['stormtimetracking_list_filter']['billable'] : '-';
$billed = isset($_SESSION['stormtimetracking_list_filter']['billed']) ? $_SESSION['stormtimetracking_list_filter']['billed'] : '-';
$form = array();