X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fui%2Fui_input.inc;h=0f20919277ad65138640d96f9a08b12e3d4d5b1c;hb=bcbf5c697db09a36994f391b5fe568d269145c68;hp=ab33f649a81ce3cb4418b2ad9f4f4a5e191e03d7;hpb=0c1bcd8ce3c089d7ddb3722a097f8fc8417f41e6;p=fa-stable.git
diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index ab33f649..0f209192 100644
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -1,56 +1,101 @@
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) {
+
+ foreach($_POST as $postkey=>$postval ) {
+ if (strpos($postkey, $prefix) === 0) {
+ $id = substr($postkey, strlen($prefix));
+ return $numeric ? (int)$id : $id;
+ }
+ }
+ return $numeric ? -1 : null;
+}
+
+//------------------------------------------------------------------------------
+//
+// Read numeric value from user formatted input
+//
+function input_num($postname=null) {
+ if (!isset($_POST[$postname]))
+ return null;
+
+ return user_numeric($_POST[$postname]);
+}
+
//---------------------------------------------------------------------------------
function hidden($name, $value)
{
+ global $Ajax;
echo "\n";
+ $Ajax->addUpdate($name, $name, $value);
}
//---------------------------------------------------------------------------------
-function submit($name, $value, $echo=true)
+function submit($name, $value, $echo=true, $async=false)
{
- $submit_str = "\n";
+ 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, $async=false)
{
echo "
";
- submit($name, $value, $echo);
+ submit($name, $value, $echo, $async);
echo "";
}
-function submit_center_first($name, $value)
+function submit_center_first($name, $value, $async=false)
{
echo "";
- submit($name, $value);
+ submit($name, $value, true, $async);
echo " ";
}
-function submit_center_last($name, $value)
+function submit_center_last($name, $value, $async=false)
{
echo " ";
- submit($name, $value);
+ submit($name, $value, true, $async);
echo "";
}
-function submit_add_or_update($add=true)
+function submit_add_or_update($add=true, $async=false)
{
if ($add)
- submit('ADD_ITEM', _("Save"));
+ submit('ADD_ITEM', _("Save"), true, $async);
else
- submit('UPDATE_ITEM', _("Update"));
+ submit('UPDATE_ITEM', _("Update"), true, $async);
}
-function submit_add_or_update_center($add=true)
+function submit_add_or_update_center($add=true, $async=false)
{
echo "";
- submit_add_or_update($add);
+ submit_add_or_update($add, $async);
echo "";
}
@@ -62,24 +107,24 @@ 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="", $async=false)
{
echo "";
if ($right)
echo " | \n";
echo "";
- submit_add_or_update($add);
+ submit_add_or_update($add, $async);
echo " |
\n";
}
-function submit_cells($name, $value, $extra="")
+function submit_cells($name, $value, $extra="", $async=false)
{
echo "";
- submit($name, $value);
+ submit($name, $value, true, $async);
echo " | \n";
}
-function submit_row($name, $value, $right=true, $extra="")
+function submit_row($name, $value, $right=true, $extra="", $async=false)
{
echo "";
if ($right)
@@ -91,7 +136,8 @@ function submit_row($name, $value, $right=true, $extra="")
function button($name, $value, $onclick)
{
- echo "\n";
+ default_focus($name);
+ echo "\n";
}
function button_cell($name, $value, $onclick)
@@ -112,6 +158,9 @@ function check_value($name)
function check($label, $name, $value, $submit_on_change=false)
{
+ global $Ajax;
+
+ default_focus($name);
if ($label)
echo $label . " ";
@@ -124,6 +173,7 @@ function check($label, $name, $value, $submit_on_change=false)
if ($submit_on_change)
echo " onclick='this.form.submit();' ";
echo " >\n";
+ $Ajax->addUpdate($name, $name, $value);
}
function check_cells($label, $name, $value, $submit_on_change=false)
@@ -149,33 +199,41 @@ 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("".number_format2($label,user_price_dec())."", "nowrap align=right");
+ label_cell("".price_format($label)."", "nowrap align=right ".$params, $id);
else
- label_cell(number_format2($label,user_price_dec()), "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("".number_format2($label,user_percent_dec())." %", "nowrap align=right");
+ label_cell("".percent_format($label)."", "nowrap align=right", $id);
else
- label_cell(number_format2($label,user_percent_dec())." %", "nowrap align=right");
+ label_cell(percent_format($label), "nowrap align=right", $id);
}
-function qty_cell($label, $bold=false)
+function qty_cell($label, $bold=false, $dec=null, $id=null)
{
if ($bold)
- label_cell("".number_format2($label,user_qty_dec())."", "nowrap align=right");
+ label_cell("".qty_format($label, $dec)."", "nowrap align=right", $id);
else
- label_cell(number_format2($label,user_qty_dec()), "nowrap align=right");
+ label_cell(qty_format($label, $dec), "nowrap align=right", $id);
}
function label_cells($label, $value, $params="", $params2="")
@@ -198,6 +256,9 @@ function label_row($label, $value, $params="", $params2="", $leftfill=0)
function text_cells($label, $name, $value, $size="", $max="", $params="", $post_label="", $disabled="")
{
+ global $Ajax;
+
+ default_focus($name);
if ($label != null)
label_cell($label, $params);
echo "";
@@ -210,10 +271,14 @@ function text_cells($label, $name, $value, $size="", $max="", $params="", $post_
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)
{
+ global $Ajax;
+
+ default_focus($name);
if (!isset($_POST[$name]) || $_POST[$name] == "")
{
if ($init)
@@ -235,6 +300,7 @@ function text_cells_ex($label, $name, $size, $max=null, $init=null, $params=null
echo " " . $post_label;
echo "\n";
+ $Ajax->addUpdate($name, $name, $_POST[$name]);
}
function text_row($label, $name, $value, $size, $max, $params="", $post_label="")
@@ -284,7 +350,7 @@ 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 = "";
@@ -324,39 +390,120 @@ function percent_row($label, $name, $init=null)
$_POST[$name] = $init== null ? '' : $init;
}
- text_row($label, $name, $_POST[$name], 6, 6, "", "%");
+ small_amount_row($label, $name, $_POST[$name], null, "%", user_percent_dec());
+}
+
+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();
+ if (!isset($_POST[$name]) || $_POST[$name] == "")
+ {
+ if ($init)
+ $_POST[$name] = $init;
+ else
+ $_POST[$name] = '';
+ }
+ if ($label != null)
+ label_cell($label, $params);
+
+ if (!isset($max))
+ $max = $size;
+
+ echo "";
+
+ echo "";
+
+ if ($post_label)
+ echo " " . $post_label;
+
+ echo " | \n";
+ $Ajax->addUpdate($name, $name, $_POST[$name]);
+}
+
+
+//-----------------------------------------------------------------------------------
+
+function amount_cells($label, $name, $init=null, $params=null, $post_label=null, $dec=null)
+{
+ amount_cells_ex($label, $name, 15, 15, $init, $params, $post_label, $dec);
+}
+
+function amount_row($label, $name, $init=null, $params=null, $post_label=null, $dec=null)
+{
+ echo "
";
+ amount_cells($label, $name, $init, $params, $post_label, $dec);
+ echo "
\n";
+}
+
+function small_amount_row($label, $name, $init=null, $params=null, $post_label=null, $dec=null)
+{
+ echo "";
+ small_amount_cells($label, $name, $init, $params, $post_label, $dec);
+ echo "
\n";
}
//-----------------------------------------------------------------------------------
-function amount_cells($label, $name, $init=null, $params=null, $post_label=null)
+function qty_cells($label, $name, $init=null, $params=null, $post_label=null, $dec=null)
{
- text_cells_ex($label, $name, 15, 15, $init, $params, $post_label);
+ if(!isset($dec))
+ $dec = user_qty_dec();
+
+ amount_cells_ex($label, $name, 15, 15, $init, $params, $post_label, $dec);
}
-function amount_row($label, $name, $init=null, $params=null, $post_label=null)
+function qty_row($label, $name, $init=null, $params=null, $post_label=null, $dec=null)
{
+ if(!isset($dec))
+ $dec = user_qty_dec();
+
echo "";
- amount_cells($label, $name, $init, $params, $post_label);
+ amount_cells($label, $name, $init, $params, $post_label, $dec);
echo "
\n";
}
+function small_qty_row($label, $name, $init=null, $params=null, $post_label=null, $dec=null)
+{
+ if(!isset($dec))
+ $dec = user_qty_dec();
+
+ echo "";
+ small_amount_cells($label, $name, $init, $params, $post_label, $dec);
+ echo "
\n";
+}
+
+//-----------------------------------------------------------------------------------
+
+function small_amount_cells($label, $name, $init=null, $params=null, $post_label=null, $dec=null)
+{
+ amount_cells_ex($label, $name, 7, 12, $init, $params, $post_label, $dec);
+}
+
//-----------------------------------------------------------------------------------
-function small_amount_cells($label, $name, $init=null, $params=null, $post_label=null)
+function small_qty_cells($label, $name, $init=null, $params=null, $post_label=null, $dec=null)
{
- text_cells_ex($label, $name, 7, 12, $init, $params, $post_label);
+ 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="")
{
+ global $Ajax;
+
+ default_focus($name);
if ($label != null)
echo "$label | \n";
if ($value == null)
$value = (!isset($_POST[$name]) ? "" : $_POST[$name]);
echo " | \n";
+ $Ajax->addUpdate($name, $name, $value);
}
function textarea_row($label, $name, $value, $cols, $rows, $params="")
@@ -370,6 +517,9 @@ function textarea_row($label, $name, $value, $cols, $rows, $params="")
function text_row_with_submit($label, $name, $value, $size, $max, $input_name, $input_value)
{
+ global $Ajax;
+
+ default_focus($name);
echo "$label | \n";
echo "";
@@ -380,6 +530,7 @@ function text_row_with_submit($label, $name, $value, $size, $max, $input_name, $
submit($input_name, $input_value);
echo " |
\n";
+ $Ajax->addUpdate($name, $name, $value);
}
//-----------------------------------------------------------------------------------