X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_input.inc;h=08a4035b518fa3d06a8ab7a0feff03bc20cd22a0;hb=348062667e6a96e9849bf25de0f2a426b4f0b9c6;hp=67abbbde5861271a68e393e98e56c33cf2e998db;hpb=dcb13782fcae94b2111445f96ac75129fadf3d61;p=fa-stable.git
diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index 67abbbde..08a4035b 100644
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -1,84 +1,155 @@
activate($name);
+}
+*/
//------------------------------------------------------------------------------
// Seek for _POST variable with $prefix.
// If var is found returns variable name with prefix stripped,
// and null or -1 otherwise.
//
-function find_submit($prefix, $numeric=true) {
+function find_submit($prefix, $numeric=true)
+{
- foreach($_POST as $postkey=>$postval ) {
- if (strpos($postkey, $prefix) === 0) {
- $id = substr($postkey, strlen($prefix));
- return $numeric ? (int)$id : $id;
- }
+ foreach($_POST as $postkey=>$postval )
+ {
+ if (strpos($postkey, $prefix) === 0)
+ {
+ $id = substr($postkey, strlen($prefix));
+ return $numeric ? (int)$id : $id;
+ }
}
return $numeric ? -1 : null;
}
+//------------------------------------------------------------------------------
+//
+// Helper function for simple db table editor pages
+//
+function simple_page_mode($numeric_id = true)
+{
+ global $Ajax, $Mode, $selected_id;
+
+ $default = $numeric_id ? -1 : '';
+ $selected_id = get_post('selected_id', $default);
+ foreach (array('ADD_ITEM', 'UPDATE_ITEM', 'RESET') as $m) {
+ if (isset($_POST[$m])) {
+ $Ajax->activate('_page_body');
+ if ($m == 'RESET')
+ $selected_id = $default;
+ $Mode = $m; return;
+ }
+ }
+ foreach (array('Edit', 'Delete') as $m) {
+ foreach ($_POST as $p => $pvar) {
+ if (strpos($p, $m) === 0) {
+// $selected_id = strtr(substr($p, strlen($m)), array('%2E'=>'.'));
+ unset($_POST['_focus']); // focus on first form entry
+ $selected_id = quoted_printable_decode(substr($p, strlen($m)));
+ $Ajax->activate('_page_body');
+ $Mode = $m;
+ return;
+ }
+ }
+ }
+ $Mode = '';
+}
//------------------------------------------------------------------------------
//
// Read numeric value from user formatted input
//
-function input_num($postname=null) {
- if (!isset($_POST[$postname]))
- return null;
+function input_num($postname=null, $dflt=null)
+{
+ if (!isset($_POST[$postname]))
+ return $dflt;
return user_numeric($_POST[$postname]);
}
//---------------------------------------------------------------------------------
-function hidden($name, $value)
+function hidden($name, $value=null, $echo=true)
{
- echo "\n";
-}
-
-//---------------------------------------------------------------------------------
-
-function submit($name, $value, $echo=true)
-{
-
- $submit_str = "\n";
+ global $Ajax;
+
+ if ($value === null)
+ $value = get_post($name);
+
+ $ret = "";
+ $Ajax->addUpdate($name, $name, $value);
+ if ($echo)
+ echo $ret."\n";
+ else
+ return $ret;
+}
+
+function submit($name, $value, $echo=true, $title=false, $async=false, $icon=false)
+{
+ global $path_to_root;
+
+ default_focus($name);
+ $submit_str = "\n";
if ($echo)
echo $submit_str;
else
return $submit_str;
}
-function submit_center($name, $value, $echo=true)
+function submit_center($name, $value, $echo=true, $title=false, $async=false, $icon=false)
{
echo "
";
- submit($name, $value, $echo);
+ submit($name, $value, $echo, $title, $async, $icon);
echo "";
}
-function submit_center_first($name, $value)
+function submit_center_first($name, $value, $title=false, $async=false, $icon=false)
{
echo "";
- submit($name, $value);
+ submit($name, $value, true, $title, $async, $icon);
echo " ";
}
-function submit_center_last($name, $value)
+function submit_center_last($name, $value, $title=false, $async=false, $icon=false)
{
echo " ";
- submit($name, $value);
+ submit($name, $value, true, $title, $async, $icon);
echo "";
}
-function submit_add_or_update($add=true)
+function submit_add_or_update($add=true, $title=false, $async=false)
{
if ($add)
- submit('ADD_ITEM', _("Save"));
- else
- submit('UPDATE_ITEM', _("Update"));
+ submit('ADD_ITEM', _("Add new"), true, $title, $async);
+ else {
+ submit('UPDATE_ITEM', _("Update"), true, $title, $async);
+ submit('RESET', _("Cancel"), true, $title, $async);
+ }
}
-function submit_add_or_update_center($add=true)
+function submit_add_or_update_center($add=true, $title=false, $async=false)
{
echo "";
- submit_add_or_update($add);
+ submit_add_or_update($add, $title, $async);
echo "";
}
@@ -90,42 +161,52 @@ function submit_add_or_update_row($add=true)
echo "\n";
}
*/
-function submit_add_or_update_row($add=true, $right=true, $extra="")
+function submit_add_or_update_row($add=true, $right=true, $extra="", $title=false, $async=false)
{
echo "";
if ($right)
echo " | \n";
echo "";
- submit_add_or_update($add);
+ submit_add_or_update($add, $title, $async);
echo " |
\n";
}
-function submit_cells($name, $value, $extra="")
+function submit_cells($name, $value, $extra="", $title=false, $async=false)
{
echo "";
- submit($name, $value);
+ submit($name, $value, true, $title, $async);
echo " | \n";
}
-function submit_row($name, $value, $right=true, $extra="")
+function submit_row($name, $value, $right=true, $extra="", $title=false, $async=false)
{
echo "";
if ($right)
echo " | \n";
- submit_cells($name, $value, $extra);
+ submit_cells($name, $value, $extra, $title, $async);
echo "
\n";
}
+
+function submit_return($name, $value, $title=false, $async=false)
+{
+ if (count($_SESSION['Context'])) {
+ submit($name, $value, true, $title, $async);
+ }
+}
//---------------------------------------------------------------------------------
-function button($name, $value, $onclick)
+function button($name, $value, $onclick, $title=false)
{
- echo "\n";
+ default_focus($name);
+ echo "\n";
}
-function button_cell($name, $value, $onclick)
+function button_cell($name, $value, $onclick, $title=false)
{
echo "";
- button($name, $value, $onclick);
+ button($name, $value, $onclick, $title);
echo " | \n";
}
@@ -138,35 +219,39 @@ function check_value($name)
return 1;
}
-function check($label, $name, $value, $submit_on_change=false)
+function check($label, $name, $value=null, $submit_on_change=false, $title=false)
{
+ global $Ajax;
+
+ default_focus($name);
if ($label)
echo $label . " ";
- if ($value == null)
- $value = (!isset($_POST[$name]) ? 0 : $_POST[$name]);
- if ($value == 1)
- echo "\n";
+ if ($value === null)
+ $value = get_post($name,0);
+
+ echo "\n";
+ $Ajax->addUpdate($name, $name, $value);
}
-function check_cells($label, $name, $value, $submit_on_change=false)
+function check_cells($label, $name, $value, $submit_on_change=false, $title=false)
{
if ($label != null)
echo "$label | \n";
echo "";
- check(null, $name, $value, $submit_on_change);
+ check(null, $name, $value, $submit_on_change, $title);
echo " | ";
}
-function check_row($label, $name, $value, $submit_on_change=false)
+function check_row($label, $name, $value, $submit_on_change=false, $title=false)
{
echo "";
- check_cells($label, $name, $value, $submit_on_change);
+ check_cells($label, $name, $value, $submit_on_change, $title);
echo "
\n";
}
@@ -177,71 +262,91 @@ function labelheader_cell($label, $params="")
echo "\n";
}
-function label_cell($label, $params="")
+function label_cell($label, $params="", $id=null)
{
+ global $Ajax;
+
+ if(isset($id))
+ {
+ $params .= " id='$id'";
+ $Ajax->addUpdate($id, $id, $label);
+ }
echo "$label | \n";
+
+ return $label;
}
-function amount_cell($label, $bold=false)
+function amount_cell($label, $bold=false, $params="", $id=null)
{
if ($bold)
- label_cell("".price_format($label)."", "nowrap align=right");
+ label_cell("".price_format($label)."", "nowrap align=right ".$params, $id);
else
- label_cell(price_format($label), "nowrap align=right");
+ label_cell(price_format($label), "nowrap align=right ".$params, $id);
}
-function percent_cell($label, $bold=false)
+function percent_cell($label, $bold=false, $id=null)
{
if ($bold)
- label_cell("".percent_format($label)."", "nowrap align=right");
+ label_cell("".percent_format($label)."", "nowrap align=right", $id);
else
- label_cell(percent_format($label), "nowrap align=right");
+ label_cell(percent_format($label), "nowrap align=right", $id);
}
-
-function qty_cell($label, $bold=false, $dec=null)
+// 2008-06-15. Changed
+function qty_cell($label, $bold=false, $dec=null, $id=null)
{
+ if ($dec == null)
+ $dec = get_qty_dec();
if ($bold)
- label_cell("".qty_format($label, $dec)."", "nowrap align=right");
+ label_cell("".number_format2($label, $dec)."", "nowrap align=right", $id);
else
- label_cell(qty_format($label, $dec), "nowrap align=right");
+ label_cell(number_format2($label, $dec), "nowrap align=right", $id);
}
-function label_cells($label, $value, $params="", $params2="")
+function label_cells($label, $value, $params="", $params2="", $id='')
{
if ($label != null)
echo "$label | \n";
- echo "$value | \n";
+ label_cell($value, $params2, $id);
}
-function label_row($label, $value, $params="", $params2="", $leftfill=0)
+function label_row($label, $value, $params="", $params2="", $leftfill=0, $id='')
{
echo "";
- label_cells($label, $value, $params, $params2);
- if($leftfill!=0)
- echo " | ";
+ label_cells($label, $value, $params, $params2, $id);
+ if ($leftfill!=0)
+ echo " | ";
echo "
\n";
}
//-----------------------------------------------------------------------------------
-function text_cells($label, $name, $value, $size="", $max="", $params="", $post_label="", $disabled="")
+function text_cells($label, $name, $value=null, $size="", $max="", $title=false, $params="", $post_label="", $disabled="")
{
+ global $Ajax;
+
+ default_focus($name);
if ($label != null)
label_cell($label, $params);
echo "";
- if ($value == null)
- $value = (!isset($_POST[$name]) ? "" : $_POST[$name]);
- echo "";
+ if ($value === null)
+ $value = get_post($name);
+ echo "";
if ($post_label != "")
echo " " . $post_label;
echo " | \n";
+ $Ajax->addUpdate($name, $name, $value);
}
-function text_cells_ex($label, $name, $size, $max=null, $init=null, $params=null, $post_label=null)
+function text_cells_ex($label, $name, $size, $max=null, $init=null, $title=null, $params=null, $post_label=null, $submit_on_change=false)
{
+ global $Ajax;
+
+ default_focus($name);
if (!isset($_POST[$name]) || $_POST[$name] == "")
{
if ($init)
@@ -256,38 +361,41 @@ function text_cells_ex($label, $name, $size, $max=null, $init=null, $params=null
$max = $size;
echo "";
-
- echo "";
+ $class = $submit_on_change ? 'class="searchbox"' : '';
+ echo "";
if ($post_label)
echo " " . $post_label;
echo " | \n";
+ $Ajax->addUpdate($name, $name, $_POST[$name]);
}
-function text_row($label, $name, $value, $size, $max, $params="", $post_label="")
+function text_row($label, $name, $value, $size, $max, $title=null, $params="", $post_label="")
{
echo "";
- text_cells($label, $name, $value, $size, $max, $params, $post_label);
+ text_cells($label, $name, $value, $size, $max, $title, $params, $post_label);
echo "
\n";
}
//-----------------------------------------------------------------------------------
-function text_row_ex($label, $name, $size, $max=null, $value=null, $params=null, $post_label=null)
+function text_row_ex($label, $name, $size, $max=null, $title=null, $value=null, $params=null, $post_label=null)
{
echo "";
- text_cells_ex($label, $name, $size, $max, $value, $params, $post_label);
+ text_cells_ex($label, $name, $size, $max, $value, $title, $params, $post_label);
echo "
\n";
}
//-----------------------------------------------------------------------------------
-function date_cells($label, $name, $init=null, $inc_days=0, $inc_months=0, $inc_years=0, $params=null)
+function date_cells($label, $name, $title = null, $init=null, $inc_days=0,
+ $inc_months=0, $inc_years=0, $params=null, $submit_on_change=false)
{
global $use_date_picker, $path_to_root;
if (!isset($_POST[$name]) || $_POST[$name] == "")
@@ -312,33 +420,35 @@ function date_cells($label, $name, $init=null, $inc_days=0, $inc_months=0, $inc_
$_POST[$name] = $init;
}
if ($use_date_picker)
- $post_label = ""
+ $post_label = ""
. " \n";
else
$post_label = "";
- text_cells_ex($label, $name, 9, 12, $_POST[$name], $params, $post_label);
+ text_cells_ex($label, $name, 9, 12, $_POST[$name], $title, $params, $post_label, $submit_on_change);
}
-function date_row($label, $name, $init=null, $inc_days=0, $inc_months=0, $inc_years=0, $params=null)
+function date_row($label, $name, $title=null, $init=null, $inc_days=0, $inc_months=0,
+ $inc_years=0, $params=null, $submit_on_change=false)
{
echo "";
- date_cells($label, $name, $init, $inc_days, $inc_months, $inc_years, $params);
+ date_cells($label, $name, $title, $init, $inc_days, $inc_months,
+ $inc_years, $params, $submit_on_change);
echo "
\n";
}
//-----------------------------------------------------------------------------------
-function ref_cells($label, $name, $init=null, $params=null)
+function ref_cells($label, $name, $title=null, $init=null, $params=null, $submit_on_change=false)
{
- text_cells_ex($label, $name, 16, 18, $init, $params);
+ text_cells_ex($label, $name, 16, 18, $init, $title, $params, null, $submit_on_change);
}
//-----------------------------------------------------------------------------------
-function ref_row($label, $name, $init=null)
+function ref_row($label, $name, $title=null, $init=null, $submit_on_change=false)
{
echo "";
- ref_cells($label, $name, $init);
+ ref_cells($label, $name, $title, $init, null, $submit_on_change);
echo "
\n";
}
@@ -349,7 +459,7 @@ function percent_row($label, $name, $init=null)
if (!isset($_POST[$name]) || $_POST[$name]=="")
{
- $_POST[$name] = $init== null ? '' : $init;
+ $_POST[$name] = $init == null ? '' : $init;
}
small_amount_row($label, $name, $_POST[$name], null, "%", user_percent_dec());
@@ -357,11 +467,13 @@ function percent_row($label, $name, $init=null)
function amount_cells_ex($label, $name, $size, $max=null, $init=null, $params=null, $post_label=null, $dec=null)
{
+ global $Ajax;
+
if (!isset($dec))
- $dec = user_price_dec();
+ $dec = user_price_dec();
if (!isset($_POST[$name]) || $_POST[$name] == "")
{
- if ($init)
+ if ($init !== null)
$_POST[$name] = $init;
else
$_POST[$name] = '';
@@ -380,6 +492,8 @@ function amount_cells_ex($label, $name, $size, $max=null, $init=null, $params=nu
echo " " . $post_label;
echo "\n";
+ $Ajax->addUpdate($name, $name, $_POST[$name]);
+ $Ajax->addAssign($name, $name, 'dec', $dec);
}
@@ -408,16 +522,16 @@ function small_amount_row($label, $name, $init=null, $params=null, $post_label=n
function qty_cells($label, $name, $init=null, $params=null, $post_label=null, $dec=null)
{
- if(!isset($dec))
- $dec = user_qty_dec();
+ if (!isset($dec))
+ $dec = user_qty_dec();
amount_cells_ex($label, $name, 15, 15, $init, $params, $post_label, $dec);
}
function qty_row($label, $name, $init=null, $params=null, $post_label=null, $dec=null)
{
- if(!isset($dec))
- $dec = user_qty_dec();
+ if (!isset($dec))
+ $dec = user_qty_dec();
echo "";
amount_cells($label, $name, $init, $params, $post_label, $dec);
@@ -426,8 +540,8 @@ function qty_row($label, $name, $init=null, $params=null, $post_label=null, $dec
function small_qty_row($label, $name, $init=null, $params=null, $post_label=null, $dec=null)
{
- if(!isset($dec))
- $dec = user_qty_dec();
+ if (!isset($dec))
+ $dec = user_qty_dec();
echo "
";
small_amount_cells($label, $name, $init, $params, $post_label, $dec);
@@ -445,33 +559,42 @@ function small_amount_cells($label, $name, $init=null, $params=null, $post_label
function small_qty_cells($label, $name, $init=null, $params=null, $post_label=null, $dec=null)
{
- if (!isset($dec))
- $dec = user_qty_dec();
+ if (!isset($dec))
+ $dec = user_qty_dec();
amount_cells_ex($label, $name, 7, 12, $init, $params, $post_label, $dec);
}
//-----------------------------------------------------------------------------------
-function textarea_cells($label, $name, $value, $cols, $rows, $params="")
+function textarea_cells($label, $name, $value, $cols, $rows, $title = null, $params="")
{
+ global $Ajax;
+
+ default_focus($name);
if ($label != null)
echo "$label | \n";
if ($value == null)
$value = (!isset($_POST[$name]) ? "" : $_POST[$name]);
- echo " | \n";
+ echo " | \n";
+ $Ajax->addUpdate($name, $name, $value);
}
-function textarea_row($label, $name, $value, $cols, $rows, $params="")
+function textarea_row($label, $name, $value, $cols, $rows, $title=null, $params="")
{
echo "
";
- textarea_cells($label, $name, $value, $cols, $rows, $params);
+ textarea_cells($label, $name, $value, $cols, $rows, $title, $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 "";
@@ -482,8 +605,9 @@ function text_row_with_submit($label, $name, $value, $size, $max, $input_name, $
submit($input_name, $input_value);
echo " |
\n";
+ $Ajax->addUpdate($name, $name, $value);
}
-
+*/
//-----------------------------------------------------------------------------------