X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_input.inc;h=ed0e05951c333e970187de8ed512bbf2a6d59a2f;hb=8ffddf50ffbe93672c769e2cf0501d0f9125e2a0;hp=de9c11531be3627497f88f81a3ae2d6db0f89c11;hpb=17b390efcf904072b02ec866b2a427490471a260;p=fa-stable.git diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc index de9c1153..ed0e0595 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,7 +93,12 @@ function input_num($postname=null, $dflt=0) } //--------------------------------------------------------------------------------- -$hidden_fields = array(); // store for hiddn fields attached just before form end (for proper html validation) +// +// 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) { @@ -189,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) @@ -197,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') @@ -487,6 +504,16 @@ function label_row($label, $value, $params="", $params2="", $leftfill=0, $id=nul 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, @@ -499,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; @@ -686,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"; }