X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=dimensions%2Finquiry%2Fsearch_dimensions.php;h=ccf72adaa055717e005ec5e30ff49c31f42eb085;hb=a9e2c0e710a5431ce3c31ef89d4c94bf69538238;hp=a263905c4b94cc257a5902e171c5ea38591b382c;hpb=c09be0dad6b05131e240349a375af7a4b7bf3444;p=fa-stable.git diff --git a/dimensions/inquiry/search_dimensions.php b/dimensions/inquiry/search_dimensions.php index a263905c..ccf72ada 100644 --- a/dimensions/inquiry/search_dimensions.php +++ b/dimensions/inquiry/search_dimensions.php @@ -1,8 +1,18 @@ . +***********************************************************************/ +$page_security = 'SA_DIMTRANSVIEW'; $path_to_root="../.."; +include($path_to_root . "/includes/db_pager.inc"); include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/includes/date_functions.inc"); @@ -16,20 +26,20 @@ if ($use_date_picker) if (isset($_GET['outstanding_only']) && $_GET['outstanding_only']) { $outstanding_only = 1; - page(_("Search Outstanding Dimensions"), false, false, "", $js); + page(_($help_context = "Search Outstanding Dimensions"), false, false, "", $js); } else { $outstanding_only = 0; - page(_("Search Dimensions"), false, false, "", $js); + page(_($help_context = "Search Dimensions"), false, false, "", $js); } //----------------------------------------------------------------------------------- // Ajax updates // -if (get_post('SearchOrders')) +if (get_post('SearchOrders')) { $Ajax->activate('dim_table'); -} elseif (get_post('_OrderNumber_changed')) +} elseif (get_post('_OrderNumber_changed')) { $disable = get_post('OrderNumber') !== ''; @@ -43,7 +53,6 @@ if (get_post('SearchOrders')) // $Ajax->addFocus(true, 'OrderNumber'); set_focus('OrderNumber'); } else -// $Ajax->addFocus(true, 'StockLocation'); set_focus('type_'); $Ajax->activate('dim_table'); @@ -56,14 +65,14 @@ if (isset($_GET["stock_id"])) //-------------------------------------------------------------------------------------- -start_form(false, true, $_SERVER['PHP_SELF'] ."?outstanding_only=" . $outstanding_only . SID); +start_form(false, false, $_SERVER['PHP_SELF'] ."?outstanding_only=$outstanding_only"); -start_table("class='tablestyle_noborder'"); +start_table(TABLESTYLE_NOBORDER); start_row(); ref_cells(_("Reference:"), 'OrderNumber', '',null, '', true); -number_list_cells(_("Type"), 'type_', null, 0, 2); +number_list_cells(_("Type"), 'type_', null, 1, 2, _("All")); date_cells(_("From:"), 'FromDate', '', null, 0, 0, -5); date_cells(_("To:"), 'ToDate'); @@ -76,119 +85,68 @@ if (!$outstanding_only) else $_POST['OpenOnly'] = 1; -submit_cells('SearchOrders', _("Search"), '', '', true); +submit_cells('SearchOrders', _("Search"), '', '', 'default'); end_row(); end_table(); -end_form(); - $dim = get_company_pref('use_dimension'); -$sql = "SELECT * FROM ".TB_PREF."dimensions WHERE id > 0"; - -if (isset($_POST['OrderNumber']) && $_POST['OrderNumber'] != "") +function view_link($row) { - $sql .= " AND reference LIKE '%". $_POST['OrderNumber'] . "%'"; -} else { - - if ($dim == 1) - $sql .= " AND type_=1"; - - if (isset($_POST['OpenOnly'])) - { - $sql .= " AND closed=0"; - } - - if (isset($_POST['type_']) && ($_POST['type_'] > 0)) - { - $sql .= " AND type_=" . $_POST['type_']; - } + return get_dimensions_trans_view_str(ST_DIMENSION, $row["id"]); +} - if (isset($_POST['OverdueOnly'])) - { - $today = date2sql(Today()); +function sum_dimension($row) +{ + return get_dimension_balance($row['id'], $_POST['FromDate'], $_POST['ToDate']); +} - $sql .= " AND due_date < '$today' "; - } +function is_closed($row) +{ + return $row['closed'] ? _('Yes') : _('No'); +} - $sql .= " AND date_ >= '" . date2sql($_POST['FromDate']) . "' - AND date_ <= '" . date2sql($_POST['ToDate']) . "'"; +function is_overdue($row) +{ + return date_diff2(Today(), sql2date($row["due_date"]), "d") > 0; } -$sql .= " ORDER BY due_date"; -$result = db_query($sql,"could not query dimensions"); +function edit_link($row) +{ + //return $row["closed"] ? '' : + // pager_link(_("Edit"), + // "/dimensions/dimension_entry.php?trans_no=" . $row["id"], ICON_EDIT); + return pager_link(_("Edit"), + "/dimensions/dimension_entry.php?trans_no=" . $row["id"], ICON_EDIT); +} -div_start('dim_table'); -start_table("$table_style width=80%"); +$sql = get_sql_for_search_dimensions($dim); + +$cols = array( + _("#") => array('fun'=>'view_link'), + _("Reference"), + _("Name"), + _("Type"), + _("Date") =>'date', + _("Due Date") => array('name'=>'due_date', 'type'=>'date', 'ord'=>'asc'), + _("Closed") => array('fun'=>'is_closed'), + _("Balance") => array('type'=>'amount', 'insert'=>true, 'fun'=>'sum_dimension'), + array('insert'=>true, 'fun'=>'edit_link') +); + +if ($outstanding_only) { + $cols[_("Closed")] = 'skip'; +} -if (!$outstanding_only) - $th = array(_("#"), _("Reference"), _("Name"), _("Type"), _("Date"), - _("Due Date"), _("Closed"), _("Balance")); -else - $th = array(_("#"), _("Reference"), _("Name"), _("Type"), _("Date"), - _("Due Date"), _("Balance")); -table_header($th); -$j = 1; -$k = 0; +$table =& new_db_pager('dim_tbl', $sql, $cols); +$table->set_marker('is_overdue', _("Marked dimensions are overdue.")); -while ($myrow = db_fetch($result)) -{ - $sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans WHERE tran_date >= '" . - date2sql($_POST['FromDate']) . "' AND - tran_date <= '" . date2sql($_POST['ToDate']) . "' AND dimension_id = " . - $myrow['id']; - $res = db_query($sql, "Transactions could not be calculated"); - $row = db_fetch_row($res); - - if ($k == 1) - { - $row_text = "class='oddrow'"; - $k = 0; - } - else - { - $row_text = "class='evenrow'"; - $k++; - } - - // check if it's an overdue work order - if (date_diff(Today(), sql2date($myrow["due_date"]), "d") > 0) - { - $row_text = "class='overduebg'"; - } - - start_row($row_text); - - $mpage = $path_to_root . "/dimensions/dimension_entry.php?" . SID . "trans_no=" . $myrow["id"]; - - label_cell(get_dimensions_trans_view_str(systypes::dimension(), $myrow["id"])); - label_cell(get_dimensions_trans_view_str(systypes::dimension(), $myrow["id"], $myrow["reference"])); - label_cell($myrow["name"]); - label_cell($myrow["type_"]); - label_cell(sql2date($myrow["date_"])); - label_cell(sql2date($myrow["due_date"])); - if (!$outstanding_only) - label_cell(($myrow["closed"] ? _("Yes") : _("No"))); - amount_cell($row[0]); - - label_cell($myrow["closed"] == 0 ? ("" . _("Edit") . "") :''); - end_row(); - - $j++; - If ($j == 12) - { - $j = 1; - table_header($th); - } - //end of page full new headings if -} -//end of while loop +$table->width = "80%"; -end_table(1); -div_end(); -//--------------------------------------------------------------------------------- +display_db_pager($table); +end_form(); end_page(); ?>