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

80
modules/storm/storminvoice/storminvoice.admin.inc
View file

@ -11,22 +11,22 @@ function storminvoice_list() {
if (array_key_exists('organization_nid', $_GET)) {
if ($_SESSION['storminvoice_list_filter']['organization_nid'] != $_GET['organization_nid']) {
$_SESSION['storminvoice_list_filter']['organization_nid'] = $_GET['organization_nid'];
_storm_set_filter_param('invoice', 'organization_nid', $_GET['organization_nid']);
}
unset($_SESSION['storminvoice_list_filter']['project_nid']);
_storm_set_filter_param('invoice', 'project_nid');
}
if (array_key_exists('project_nid', $_GET)) {
if ($_SESSION['storminvoice_list_filter']['project_nid'] != $_GET['project_nid']) {
$_SESSION['storminvoice_list_filter']['project_nid'] = $_GET['project_nid'];
_storm_set_filter_param('invoice', 'project_nid', $_GET['project_nid']);
}
$p = node_load($_GET['project_nid']);
$_SESSION['storminvoice_list_filter']['organization_nid'] = $p->organization_nid;
_storm_set_filter_param('invoice', 'organization_nid', $p->organization_nid);
}
if (array_key_exists('view', $_GET) && $_GET['view'] == 'all') {
unset($_SESSION['storminvoice_list_filter']['reqdatefrom']);
unset($_SESSION['storminvoice_list_filter']['reqdateto']);
_storm_set_filter_param('invoice', 'reqdatefrom');
_storm_set_filter_param('invoice', 'reqdateto');
$_SESSION['storminvoice_list_filter']['status'] = '';
_storm_set_filter_param('invoice', 'status', '');
}
$i = new stdClass();
@ -60,7 +60,11 @@ function storminvoice_list() {
),
);
$s = "SELECT n.title, n.type, n.uid, sin.*, nre.format FROM {node} AS n
$where = array();
$args = array();
$filterfields = array();
$s = "SELECT n.title, n.type, n.uid, sin.*, nre.format FROM {node} AS n
INNER JOIN {storminvoice} AS sin ON n.vid=sin.vid
INNER JOIN {node_revisions} AS nre ON n.vid = nre.vid
WHERE n.status=1 AND n.type='storminvoice' ";
@ -74,58 +78,44 @@ function storminvoice_list() {
$s_totals = "SELECT SUM(amount) amount, SUM(tax1) tax1, SUM(tax2) tax2, SUM(total) total FROM {storminvoice} sin
INNER JOIN {node} n ON n.vid=sin.vid WHERE n.status=1 AND n.type='storminvoice'";
$where = array();
$args = array();
$filterfields = array();
if (isset($_SESSION['storminvoice_list_filter']['organization_nid']) && $_SESSION['storminvoice_list_filter']['organization_nid'] != 0) {
if (_storm_isset_filter_param('invoice', 'organization_nid', 0)) {
$where[] = 'sin.organization_nid=%d';
$args[] = $_SESSION['storminvoice_list_filter']['organization_nid'];
$filterfields[] = t('Organization');
}
if (isset($_SESSION['storminvoice_list_filter']['project_nid']) && $_SESSION['storminvoice_list_filter']['project_nid'] != 0) {
if (_storm_isset_filter_param('invoice', 'project_nid', 0)) {
$where[] = 'sin.project_nid=%d';
$args[] = $_SESSION['storminvoice_list_filter']['project_nid'];
$filterfields[] = t('Project');
}
if (isset($_SESSION['storminvoice_list_filter']['reqdatefrom'])) {
if (_storm_isset_filter_param('invoice', 'reqdatefrom')) {
$reqdatefrom = $_SESSION['storminvoice_list_filter']['reqdatefrom'];
$where[] = 'sin.requestdate>=%d';
$args[] = _storm_date_to_gmtimestamp($reqdatefrom);
$filterfields[] = t('Request date');
}
if (isset($_SESSION['storminvoice_list_filter']['reqdateto']) && $_SESSION['storminvoice_list_filter']['reqdateto']['day'] != -1) {
if (_storm_isset_filter_param('invoice', 'reqdateto')) {
$reqdateto = $_SESSION['storminvoice_list_filter']['reqdateto'];
$where[] = 'sin.requestdate<=%d';
$args[] = _storm_date_to_gmtimestamp($reqdateto);
$filterfields[] = t('Request date');
}
$status = isset($_SESSION['storminvoice_list_filter']['status']) ? $_SESSION['storminvoice_list_filter']['status'] : '-';
if ($status != '-') {
if ($status == 'to pay') {
if (_storm_isset_filter_param('invoice', 'status', '', '-')) {
if ($_SESSION['storminvoice_list_filter']['status'] == 'to pay') {
$where[] = "sin.paymentdate=0";
}
if ($status == 'paid') {
if ($_SESSION['storminvoice_list_filter']['status'] == 'paid') {
$where[] = "sin.paymentdate<>0";
}
if ($status == 'overdue') {
if ($_SESSION['storminvoice_list_filter']['status'] == 'overdue') {
$where[] = "sin.paymentdate=0 AND sin.duedate<". time();
}
$filterfields[] = t('Status');
}
$itemsperpage = isset($_SESSION['storminvoice_list_filter']['itemsperpage']) ? $_SESSION['storminvoice_list_filter']['itemsperpage'] : variable_get('storm_default_items_per_page', 10);
$_SESSION['storminvoice_list_filter']['itemsperpage'] = $itemsperpage;
$tablesort = tablesort_sql($header);
if ($tablesort == " ORDER BY sin.number ASC") {
$tablesort = " ORDER BY LPAD(sin.number, 10, '0') ASC";
}
elseif ($tablesort == " ORDER BY sin.number DESC") {
$tablesort = " ORDER BY LPAD(sin.number, 10, '0') DESC";
}
$itemsperpage = _storm_get_filter_param('invoice', 'itemsperpage', variable_get('storm_default_items_per_page', 10));
if (count($filterfields) == 0) {
$filterdesc = t('Not filtered');
@ -139,7 +129,17 @@ function storminvoice_list() {
$s = storminvoice_access_sql($s, $where);
$s = db_rewrite_sql($s);
$tablesort = tablesort_sql($header);
if ($tablesort == " ORDER BY sin.number ASC") {
$tablesort = " ORDER BY LPAD(sin.number, 10, '0') ASC";
}
elseif ($tablesort == " ORDER BY sin.number DESC") {
$tablesort = " ORDER BY LPAD(sin.number, 10, '0') DESC";
}
$r = pager_query($s . $tablesort, $itemsperpage, 0, NULL, $args);
$invoices = array();
while ($invoice = db_fetch_object($r)) {
$invoices[] = $invoice;
@ -165,14 +165,16 @@ function storminvoice_list() {
}
function storminvoice_list_filter(&$form_state, $filterdesc = 'Filter') {
$organization_nid = isset($_SESSION['storminvoice_list_filter']['organization_nid']) ? $_SESSION['storminvoice_list_filter']['organization_nid'] : 0;
$project_nid = isset($_SESSION['storminvoice_list_filter']['project_nid']) ? $_SESSION['storminvoice_list_filter']['project_nid'] : 0;
$status = isset($_SESSION['storminvoice_list_filter']['status']) ? $_SESSION['storminvoice_list_filter']['status'] : '';
$itemsperpage = isset($_SESSION['storminvoice_list_filter']['itemsperpage']) ? $_SESSION['storminvoice_list_filter']['itemsperpage'] : variable_get('storm_default_items_per_page', 10);
$_SESSION['storminvoice_list_filter']['itemsperpage'] = $itemsperpage;
$organization_nid = _storm_get_filter_param('invoice', 'organization_nid', 0);
$project_nid = _storm_get_filter_param('invoice', 'project_nid', 0);
$reqdatefrom = _storm_get_filter_param('invoice', 'reqdatefrom');
$reqdateto = _storm_get_filter_param('invoice', 'reqdateto');
$status = _storm_get_filter_param('invoice', 'status', '');
$itemsperpage = _storm_get_filter_param('invoice', 'itemsperpage', variable_get('storm_default_items_per_page', 10));
$reqdatefrom = isset($_SESSION['storminvoice_list_filter']['reqdatefrom']) ? $_SESSION['storminvoice_list_filter']['reqdatefrom'] : NULL;
$reqdateto = isset($_SESSION['storminvoice_list_filter']['reqdateto']) ? $_SESSION['storminvoice_list_filter']['reqdateto'] : NULL;
$form = array();