X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fui%2Fui_input.inc;h=aa57475ccd8d474ec2d602140e285a6b259c283e;hb=9a1b3abd5371ad7f6315db1d56f8356587444314;hp=d9140d51d53655b10e6237ba3c884cad79cad676;hpb=0c760ea65c8c6f0a45ea8328abab53be649f2105;p=fa-stable.git
diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index d9140d51..aa57475c 100644
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -37,6 +37,14 @@ function find_submit($prefix, $numeric=true)
}
return $numeric ? -1 : null;
}
+/*
+ Helper function.
+ Returns true if input $name with $submit_on_change option set is subject to update.
+*/
+function input_changed($name)
+{
+ return isset($_POST['_'.$name.'_changed']);
+}
//------------------------------------------------------------------------------
//
@@ -85,10 +93,16 @@ function input_num($postname=null, $dflt=0)
}
//---------------------------------------------------------------------------------
+//
+// Thanks to hidden fields buffering hidden() helper can be used in arbitrary places and
+// proper html structure is still preserved. Buffered hidden fields are output on the nearest
+// table or form closing tag (see output_hidden()).
+//
+$hidden_fields = array();
function hidden($name, $value=null, $echo=true)
{
- global $Ajax;
+ global $Ajax, $hidden_fields;
if ($value === null)
$value = get_post($name);
@@ -96,7 +110,7 @@ function hidden($name, $value=null, $echo=true)
$ret = "";
$Ajax->addUpdate($name, $name, $value);
if ($echo)
- echo $ret."\n";
+ $hidden_fields[] = $ret;
else
return $ret;
}
@@ -128,7 +142,7 @@ function submit($name, $value, $echo=true, $title=false, $atype=false, $icon=fal
} elseif (!is_bool($atype)) { // necessary: switch uses '=='
- $aspect = "aspect='$atype' ";
+ $aspect = " aspect='$atype' ";
$types = explode(' ', $atype);
foreach ($types as $type) {
@@ -156,7 +170,7 @@ function submit($name, $value, $echo=true, $title=false, $atype=false, $icon=fal
." name=\"$name\" id=\"$name\" value=\"$value\""
.($title ? " title='$title'" : '')
.">"
- .($icon ? "
" : '')
+ .($icon ? "
" : '')
."$value"
."\n";
if ($echo)
@@ -188,6 +202,7 @@ function submit_center_last($name, $value, $title=false, $async=false, $icon=fal
/*
For following controls:
'both' - use both Ctrl-Enter and Escape hotkeys
+ 'upgrade' - use Ctrl-Enter with progress ajax indicator and Escape hotkeys. Nonajax request for OK option is performed.
'cancel' - apply to 'RESET' button
*/
function submit_add_or_update($add=true, $title=false, $async=false, $clone=false)
@@ -196,7 +211,10 @@ function submit_add_or_update($add=true, $title=false, $async=false, $clone=fals
if ($async === 'both') {
$async = 'default'; $cancel = 'cancel';
- }
+ }
+ elseif ($async === 'upgrade') {
+ $async = 'default nonajax process'; $cancel = 'cancel';
+ }
else if ($async === 'default')
$cancel = true;
else if ($async === 'cancel')
@@ -269,7 +287,7 @@ function set_icon($icon, $title=false)
global $path_to_root;
if (basename($icon) === $icon) // standard icons does not contain path separator
$icon = "$path_to_root/themes/".user_theme()."/images/$icon";
- return "
\n";
+ return "
\n";
}
function button($name, $value, $title=false, $icon=false, $aspect='')
@@ -291,7 +309,7 @@ function button($name, $value, $title=false, $icon=false, $aspect='')
."' value='1'" . ($title ? " title='$title'":" title='$value'")
. ($aspect ? " aspect='$aspect'" : '')
. $rel
- ." />".set_icon($icon)."\n";
+ ." >".set_icon($icon)."\n";
}
else
return "\n";
+ ." >\n";
}
function button_cell($name, $value, $title=false, $icon=false, $aspect='')
@@ -329,7 +347,7 @@ function select_button_cell($name, $value, $title=false)
function check_value($name)
{
- if (!isset($_POST[$name]))
+ if (!isset($_POST[$name]) || $_POST[$name]=='')
return 0;
return 1;
}
@@ -387,7 +405,7 @@ function check_row($label, $name, $value=null, $submit_on_change=false, $title=f
function radio($label, $name, $value, $selected=null, $submit_on_change=false)
{
if (!isset($selected))
- $selected = get_post($name) == $value;
+ $selected = get_post($name) === (string)$value;
if ($submit_on_change === true)
$submit_on_change =
@@ -465,14 +483,14 @@ function qty_cell($label, $bold=false, $dec=null, $id=null)
label_cell(number_format2($label, $dec), "nowrap align=right", $id);
}
-function label_cells($label, $value, $params="", $params2="", $id='')
+function label_cells($label, $value, $params="", $params2="", $id=null)
{
if ($label != null)
echo "
$label | \n";
label_cell($value, $params2, $id);
}
-function label_row($label, $value, $params="", $params2="", $leftfill=0, $id='')
+function label_row($label, $value, $params="", $params2="", $leftfill=0, $id=null)
{
echo "";
if ($params == "")
@@ -486,6 +504,16 @@ function label_row($label, $value, $params="", $params2="", $leftfill=0, $id='')
echo "
\n";
}
+function text_input($name, $value=null, $size='', $max='', $title='', $params='')
+{
+ if ($value === null)
+ $value = get_post($name);
+
+ return "";
+}
+
//-----------------------------------------------------------------------------------
function text_cells($label, $name, $value=null, $size="", $max="", $title=false,
@@ -498,11 +526,7 @@ function text_cells($label, $name, $value=null, $size="", $max="", $title=false,
label_cell($label, $labparams);
echo "";
- if ($value === null)
- $value = get_post($name);
- echo "";
+ echo text_input($name, $value, $size, $max, $title, $inparams);
if ($post_label != "")
echo " " . $post_label;
@@ -606,7 +630,7 @@ function link_row_ex($label, $name, $size, $max=null, $title=null, $value=null,
function date_cells($label, $name, $title = null, $check=null, $inc_days=0,
$inc_months=0, $inc_years=0, $params=null, $submit_on_change=false)
{
- global $use_date_picker, $path_to_root, $Ajax;
+ global $path_to_root, $Ajax;
if (!isset($_POST[$name]) || $_POST[$name] == "")
{
@@ -624,7 +648,7 @@ function date_cells($label, $name, $title = null, $check=null, $inc_days=0,
$_POST[$name] = $dd;
}
}
- if ($use_date_picker)
+ if (user_use_date_picker())
{
$calc_image = (file_exists("$path_to_root/themes/".user_theme()."/images/cal.gif")) ?
"$path_to_root/themes/".user_theme()."/images/cal.gif" : "$path_to_root/themes/default/images/cal.gif";
@@ -667,7 +691,7 @@ function date_row($label, $name, $title=null, $check=null, $inc_days=0, $inc_mon
function password_row($label, $name, $value)
{
echo " | $label | ";
- label_cell("");
+ label_cell("");
echo "
\n";
}
@@ -676,7 +700,7 @@ function file_cells($label, $name, $id="")
{
if ($id != "")
$id = "id='$id'";
- label_cells($label, "");
+ label_cells($label, "");
}
function file_row($label, $name, $id = "")
{
@@ -685,19 +709,70 @@ function file_row($label, $name, $id = "")
echo "\n";
}
-//-----------------------------------------------------------------------------------
+/*-----------------------------------------------------------------------------------
+
+ Reference number input.
-function ref_cells($label, $name, $title=null, $init=null, $params=null, $submit_on_change=false)
+ Optional $context array contains transaction data used in number parsing:
+ 'data' - data used for month/year codes
+ 'location' - location code
+ 'customer' - debtor_no
+ 'supplier' - supplier id
+ 'branch' - branch_code
+*/
+function ref_cells($label, $name, $title=null, $init=null, $params=null, $submit_on_change=false, $type=null, $context=null)
{
- text_cells_ex($label, $name, 16, 18, $init, $title, $params, null, $submit_on_change);
+ global $Ajax, $Refs;
+
+ if (isset($type)) {
+ if (empty($_POST[$name.'_list'])) // restore refline id
+ $_POST[$name.'_list'] = $Refs->reflines->find_refline_id(empty($_POST[$name]) ? $init : $_POST[$name], $type);
+
+ if (empty($_POST[$name]) || ($_SERVER['REQUEST_METHOD'] == 'GET')) // initialization
+ {
+ if (isset($init))
+ {
+ $_POST[$name] = $init;
+ } else {
+ $_POST[$name] = $Refs->get_next($type, $_POST[$name.'_list'], $context); // set default
+ }
+ $Ajax->addUpdate(true, $name, $_POST[$name]);
+ }
+
+ if (check_ui_refresh($name)) { // call context changed
+ $_POST[$name] = $Refs->normalize($init, $type, $context, $_POST[$name.'_list']);
+ $Ajax->addUpdate(true, $name, $_POST[$name]);
+ }
+
+ if ($Refs->reflines->count($type)>1) {
+ if (list_updated($name.'_list')) {
+ $_POST[$name] = $Refs->get_next($type, $_POST[$name.'_list'], $context);
+ $Ajax->addUpdate(true, $name, $_POST[$name]);
+ }
+ $list = refline_list($name.'_list', $type);
+ } else {
+ $list = '';
+ }
+
+ if (isset($label))
+ label_cell($label, $params);
+
+ label_cell($list."");
+ }
+ else // just wildcard ref field (e.g. for global inquires)
+ {
+ text_cells_ex($label, $name, 16, 35, $init, $title, $params, null, $submit_on_change);
+ }
}
//-----------------------------------------------------------------------------------
-function ref_row($label, $name, $title=null, $init=null, $submit_on_change=false)
+function ref_row($label, $name, $title=null, $init=null, $submit_on_change=false, $type=null, $context = null)
{
echo "$label | ";
- ref_cells(null, $name, $title, $init, null, $submit_on_change);
+ ref_cells(null, $name, $title, $init, null, $submit_on_change, $type, $context);
echo "
\n";
}
@@ -891,7 +966,7 @@ function inactive_control_cell($id, $value, $table, $key)
get_post('Update')) && (check_value('Inactive'.$id) != $value)) {
update_record_status($id, !$value, $table, $key);
}
- echo ''. checkbox(null, $name, $value, true, '', "align='center'")
+ echo ' | '. checkbox(null, $name, $value, true, '')
. hidden("LInact[$id]", $value, false) . ' | ';
}
}
@@ -943,26 +1018,6 @@ function supplier_credit_row($supplier, $credit, $parms='')
."", $parms);
}
-/*
- Edit transaction link to be used in transaction inquires
-*/
-function edit_trans_link($trans_type, $trans_no, $url='')
-{
- global $path_to_root, $trans_editors;
-
- if (!$url) $url = @$trans_editors[$trans_type];
-
- if (!$trans_no || !$url)
- return '';
-
- if (is_closed_trans($trans_type, $trans_no)) {
- return set_icon(ICON_CLOSED, _('Closed'));
- } else {
- $link_text = user_graphic_links() ? set_icon(ICON_EDIT, _('Edit')) : _('Edit');
- return "$link_text";
- }
-}
-
function bank_balance_row($bank_acc, $parms='')
{
global $path_to_root;
@@ -977,4 +1032,3 @@ function bank_balance_row($bank_acc, $parms='')
."", $parms);
}
-?>
\ No newline at end of file