X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_input.inc;h=054af15e98ee463c3587ab87b11e4908de4089f1;hb=0388050f6d4c6c7c9a9db06d2f31aa8879da69a8;hp=1e966a1a72758135e2bd5a06d434e2c0a41b660d;hpb=da774ae85617b051675afe581f413da78febfc0f;p=fa-stable.git
diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index 1e966a1a..054af15e 100644
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -37,6 +37,15 @@ 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']);
+}
+
//------------------------------------------------------------------------------
//
// Helper function for simple db table editor pages
@@ -84,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);
@@ -95,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;
}
@@ -112,6 +127,7 @@ function hidden($name, $value=null, $echo=true)
'selector' - ditto with closing current popup editor window
'cancel' - cancel form entry on Escape press; dflt ICON_CANCEL
'process' - displays progress bar during call; optional icon
+ 'nonajax' - ditto, non-ajax submit
$atype can contain also multiply type selectors separated by space,
however make sense only combination of 'process' and one of defualt/selector/cancel
@@ -126,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) {
@@ -141,6 +157,9 @@ function submit($name, $value, $echo=true, $title=false, $atype=false, $icon=fal
case 'cancel':
if ($icon===false) $icon=ICON_ESCAPE; break;
+
+ case 'nonajax':
+ $atype = false;
}
}
}
@@ -151,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)
@@ -183,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)
@@ -191,10 +211,13 @@ function submit_add_or_update($add=true, $title=false, $async=false, $clone=fals
if ($async === 'both') {
$async = 'default'; $cancel = 'cancel';
- }
- else if ($async === 'default')
+ }
+ elseif ($async === 'upgrade') {
+ $async = 'default nonajax process'; $cancel = 'cancel';
+ }
+ elseif ($async === 'default')
$cancel = true;
- else if ($async === 'cancel')
+ elseif ($async === 'cancel')
$async = true;
if ($add)
@@ -264,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='')
@@ -281,12 +304,12 @@ function button($name, $value, $title=false, $icon=false, $aspect='')
if ($value == _("Delete")) // Helper during implementation
$icon = ICON_DELETE;
return "\n";
+ ." >".set_icon($icon)."\n";
}
else
return "\n";
+ ." >\n";
}
function button_cell($name, $value, $title=false, $icon=false, $aspect='')
@@ -324,9 +347,7 @@ function select_button_cell($name, $value, $title=false)
function check_value($name)
{
- if (!isset($_POST[$name]))
- return 0;
- return 1;
+ return (empty($_POST[$name]) ? 0 : 1);
}
function checkbox($label, $name, $value=null, $submit_on_change=false, $title=false)
@@ -379,7 +400,10 @@ function check_row($label, $name, $value=null, $submit_on_change=false, $title=f
}
//-----------------------------------------------------------------------------------
-function radio($label, $name, $value, $selected, $submit_on_change=false) {
+function radio($label, $name, $value, $selected=null, $submit_on_change=false)
+{
+ if (!isset($selected))
+ $selected = get_post($name) === (string)$value;
if ($submit_on_change === true)
$submit_on_change =
@@ -457,14 +481,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 == "")
@@ -478,6 +502,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,
@@ -490,11 +524,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;
@@ -598,7 +628,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] == "")
{
@@ -616,9 +646,13 @@ 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";
$post_label = ""
- . " \n";
+ . " \n";
+ }
else
$post_label = "";
@@ -627,15 +661,15 @@ function date_cells($label, $name, $title = null, $check=null, $inc_days=0,
echo " | ";
- $class = $submit_on_change ? 'class="searchbox"' : '';
+ $class = $submit_on_change ? 'date active' : 'date';
$aspect = $check ? 'aspect="cdate"' : '';
if ($check && (get_post($name) != Today()))
$aspect .= ' style="color:#FF0000"';
default_focus($name);
-
- echo "3)?11:10;
+ echo " $post_label";
echo " | \n";
@@ -655,7 +689,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";
}
@@ -664,7 +698,7 @@ function file_cells($label, $name, $id="")
{
if ($id != "")
$id = "id='$id'";
- label_cells($label, "");
+ label_cells($label, "");
}
function file_row($label, $name, $id = "")
{
@@ -673,19 +707,70 @@ function file_row($label, $name, $id = "")
echo "\n";
}
-//-----------------------------------------------------------------------------------
+/*-----------------------------------------------------------------------------------
-function ref_cells($label, $name, $title=null, $init=null, $params=null, $submit_on_change=false)
+ Reference number input.
+
+ 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])) // initialization
+ {
+ if (isset($init))
+ {
+ $_POST[$name] = $init;
+ } else {
+ $_POST[$name] = $Refs->get_next($type, $_POST[$name.'_list'], $context);
+ }
+ $Ajax->addUpdate(true, $name, $_POST[$name]);
+ }
+
+ if (check_ui_refresh($name)) { // call context changed
+ $_POST[$name] = $Refs->normalize($_POST[$name], $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";
}
@@ -841,26 +926,6 @@ function textarea_row($label, $name, $value, $cols, $rows, $title=null, $params=
echo "\n";
}
-//-----------------------------------------------------------------------------------
-/*
-function text_row_with_submit($label, $name, $value, $size, $max, $input_name, $input_value)
-{
- global $Ajax;
-
- default_focus($name);
- echo "$label | \n";
- echo "";
-
- if ($value == null)
- $value = (!isset($_POST[$name]) ? "" : $_POST[$name]);
- echo " ";
-
- submit($input_name, $input_value);
-
- echo " |
\n";
- $Ajax->addUpdate($name, $name, $value);
-}
-*/
//-----------------------------------------------------------------------------------
//
// When show_inactive page option is set
@@ -879,7 +944,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) . ' | ';
}
}
@@ -934,7 +999,7 @@ function supplier_credit_row($supplier, $credit, $parms='')
function bank_balance_row($bank_acc, $parms='')
{
global $path_to_root;
-
+
$to = add_days(Today(), 1);
$bal = get_balance_before_for_bank_account($bank_acc, $to);
label_row( _("Bank Balance:"),
@@ -945,4 +1010,12 @@ function bank_balance_row($bank_acc, $parms='')
."", $parms);
}
-?>
\ No newline at end of file
+function ahref($label, $href, $target="", $onclick="") {
+ echo "$label";
+}
+
+function ahref_cell($label, $href, $target="", $onclick="") {
+ echo " ";
+ ahref($label, $href, $target, $onclick);
+ echo " | ";
+}