X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fui%2Fui_input.inc;h=67abbbde5861271a68e393e98e56c33cf2e998db;hb=dcb13782fcae94b2111445f96ac75129fadf3d61;hp=7e122c3bb2abaad27e697e84ca33fb3e5781bf2b;hpb=8f5772176b209e19c73078ed92483f18dede93a4;p=fa-stable.git
diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index 7e122c3b..67abbbde 100644
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -1,5 +1,32 @@
$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)
@@ -11,6 +38,7 @@ function hidden($name, $value)
function submit($name, $value, $echo=true)
{
+
$submit_str = "\n";
if ($echo)
echo $submit_str;
@@ -91,7 +119,7 @@ function submit_row($name, $value, $right=true, $extra="")
function button($name, $value, $onclick)
{
- echo "\n";
+ echo "\n";
}
function button_cell($name, $value, $onclick)
@@ -157,25 +185,25 @@ function label_cell($label, $params="")
function amount_cell($label, $bold=false)
{
if ($bold)
- label_cell("".number_format2($label,user_price_dec())."", "nowrap align=right");
+ label_cell("".price_format($label)."", "nowrap align=right");
else
- label_cell(number_format2($label,user_price_dec()), "nowrap align=right");
+ label_cell(price_format($label), "nowrap align=right");
}
function percent_cell($label, $bold=false)
{
if ($bold)
- label_cell("".number_format2($label,user_percent_dec())." %", "nowrap align=right");
+ label_cell("".percent_format($label)."", "nowrap align=right");
else
- label_cell(number_format2($label,user_percent_dec())." %", "nowrap align=right");
+ label_cell(percent_format($label), "nowrap align=right");
}
-function qty_cell($label, $bold=false)
+function qty_cell($label, $bold=false, $dec=null)
{
if ($bold)
- label_cell("".number_format2($label,user_qty_dec())."", "nowrap align=right");
+ label_cell("".qty_format($label, $dec)."", "nowrap align=right");
else
- label_cell(number_format2($label,user_qty_dec()), "nowrap align=right");
+ label_cell(qty_format($label, $dec), "nowrap align=right");
}
function label_cells($label, $value, $params="", $params2="")
@@ -185,10 +213,12 @@ function label_cells($label, $value, $params="", $params2="")
echo "
$value | \n";
}
-function label_row($label, $value, $params="", $params2="")
+function label_row($label, $value, $params="", $params2="", $leftfill=0)
{
echo "";
label_cells($label, $value, $params, $params2);
+ if($leftfill!=0)
+ echo " | ";
echo "
\n";
}
@@ -282,7 +312,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 = "";
@@ -318,33 +348,106 @@ function percent_row($label, $name, $init=null)
{
if (!isset($_POST[$name]) || $_POST[$name]=="")
+ {
+ $_POST[$name] = $init== null ? '' : $init;
+ }
+
+ 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)
+{
+ 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";
+}
+
+
+//-----------------------------------------------------------------------------------
+
+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);
+}
- text_row($label, $name, $_POST[$name], 6, 6, "", "%");
+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 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, $dec);
+ echo "
\n";
}
-function amount_row($label, $name, $init=null, $params=null, $post_label=null)
+function small_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);
+ 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)
+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_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);
}
//-----------------------------------------------------------------------------------