X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_input.inc;h=36f99e9ce01bf0e7bd5fc69095c14a804bd3ea59;hb=29e68a1b8dcbe7c7ecb797396945e0cccf2d6cd8;hp=483a885115df40f7edf9998049ebda9c9937ee27;hpb=c2f2b28297b0355051ca2508fc7778438f5c6a3d;p=fa-stable.git
diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index 483a8851..36f99e9c 100644
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -75,7 +75,7 @@ function simple_page_mode($numeric_id = true)
//
// Read numeric value from user formatted input
//
-function input_num($postname=null, $dflt=null)
+function input_num($postname=null, $dflt=0)
{
if (!isset($_POST[$postname]) || $_POST[$postname] == "")
return $dflt;
@@ -154,9 +154,9 @@ function submit($name, $value, $echo=true, $title=false, $atype=false, $icon=fal
function submit_center($name, $value, $echo=true, $title=false, $async=false, $icon=false)
{
- echo "
";
+ if ($echo) echo "";
submit($name, $value, $echo, $title, $async, $icon);
- echo "";
+ if ($echo) echo "";
}
function submit_center_first($name, $value, $title=false, $async=false, $icon=false)
@@ -241,7 +241,8 @@ function submit_return($name, $value, $title=false)
function submit_js_confirm($name, $msg) {
add_js_source(
- "_validate.$name=function(){ return confirm('$msg');};");
+ "_validate.$name=function(){ return confirm('"
+ . strtr($msg, array("\n"=>'\\n')) . "');};");
};
//-----------------------------------------------------------------------------------
@@ -269,7 +270,7 @@ function button($name, $value, $title=false, $icon=false, $aspect='')
"' value='1'" . ($title ? " title='$title'":" title='$value'")
. ($aspect ? " aspect='$aspect'" : '')
. $rel
- ." />".set_icon($icon)."\n";
+ ." />".set_icon($icon)."\n";
}
else
return "$label";
+ echo check_cells(NULL, $name, $value, $submit_on_change, $title);
echo "\n";
}
//-----------------------------------------------------------------------------------
+function radio($label, $name, $value, $selected, $submit_on_change=false) {
+ if ($submit_on_change === true)
+ $submit_on_change =
+ "JsHttpRequest.request(\"_{$name}_update\", this.form);";
+
+ return "".($label ? $label : '');
+}
+
+//-----------------------------------------------------------------------------------
function labelheader_cell($label, $params="")
{
echo "\n";
@@ -386,6 +398,12 @@ function email_cell($label, $params="", $id=null)
label_cell("$label", $params, $id);
}
+function amount_decimal_cell($label, $params="", $id=null)
+{
+ $dec = 0;
+ label_cell(price_decimal_format($label, $dec), "nowrap align=right ".$params, $id);
+}
+
function amount_cell($label, $bold=false, $params="", $id=null)
{
if ($bold)
@@ -394,6 +412,16 @@ function amount_cell($label, $bold=false, $params="", $id=null)
label_cell(price_format($label), "nowrap align=right ".$params, $id);
}
+//JAM Allow entered unit prices to be fractional
+function unit_amount_cell($label, $bold=false, $params="", $id=null)
+{
+ if ($bold)
+ label_cell("".unit_price_format($label)."", "nowrap align=right ".$params, $id);
+ else
+ label_cell(unit_price_format($label), "nowrap align=right ".$params, $id);
+}
+
+
function percent_cell($label, $bold=false, $id=null)
{
if ($bold)
@@ -422,6 +450,11 @@ function label_cells($label, $value, $params="", $params2="", $id='')
function label_row($label, $value, $params="", $params2="", $leftfill=0, $id='')
{
echo "";
+ if ($params == "")
+ {
+ echo "$label | ";
+ $label = null;
+ }
label_cells($label, $value, $params, $params2, $id);
if ($leftfill!=0)
echo " | ";
@@ -486,9 +519,8 @@ function text_cells_ex($label, $name, $size, $max=null, $init=null, $title=null,
function text_row($label, $name, $value, $size, $max, $title=null, $params="", $post_label="")
{
- echo "
";
-
- text_cells($label, $name, $value, $size, $max, $title, $params, $post_label);
+ echo "
$label | ";
+ text_cells(null, $name, $value, $size, $max, $title, $params, $post_label);
echo "
\n";
}
@@ -497,9 +529,8 @@ function text_row($label, $name, $value, $size, $max, $title=null, $params="", $
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, $title, $params, $post_label);
+ echo "
$label | ";
+ text_cells_ex(null, $name, $size, $max, $value, $title, $params, $post_label);
echo "
\n";
}
@@ -597,12 +628,34 @@ function date_cells($label, $name, $title = null, $check=null, $inc_days=0,
function date_row($label, $name, $title=null, $check=null, $inc_days=0, $inc_months=0,
$inc_years=0, $params=null, $submit_on_change=false)
{
- echo "";
- date_cells($label, $name, $title, $check, $inc_days, $inc_months,
+ echo "
$label | ";
+ date_cells(null, $name, $title, $check, $inc_days, $inc_months,
$inc_years, $params, $submit_on_change);
echo "
\n";
}
+//-----------------------------------------------------------------------------------
+function password_row($label, $name, $value)
+{
+ echo "$label | ";
+ label_cell("");
+ echo "
\n";
+}
+
+//-----------------------------------------------------------------------------------
+function file_cells($label, $name, $id="")
+{
+ if ($id != "")
+ $id = "id='$id'";
+ label_cells($label, "");
+}
+function file_row($label, $name, $id = "")
+{
+ echo "$label | ";
+ file_cells(null, $name, $id);
+ echo "
\n";
+}
+
//-----------------------------------------------------------------------------------
function ref_cells($label, $name, $title=null, $init=null, $params=null, $submit_on_change=false)
@@ -614,8 +667,8 @@ function ref_cells($label, $name, $title=null, $init=null, $params=null, $submit
function ref_row($label, $name, $title=null, $init=null, $submit_on_change=false)
{
- echo "";
- ref_cells($label, $name, $title, $init, null, $submit_on_change);
+ echo "
$label | ";
+ ref_cells(null, $name, $title, $init, null, $submit_on_change);
echo "
\n";
}
@@ -646,8 +699,11 @@ function amount_cells_ex($label, $name, $size, $max=null, $init=null, $params=nu
$_POST[$name] = '';
}
if ($label != null)
+ {
+ if ($params == null)
+ $params = "class='label'";
label_cell($label, $params);
-
+ }
if (!isset($max))
$max = $size;
@@ -675,6 +731,15 @@ function amount_cells($label, $name, $init=null, $params=null, $post_label=null,
amount_cells_ex($label, $name, 15, 15, $init, $params, $post_label, $dec);
}
+//JAM Allow entered unit prices to be fractional
+function unit_amount_cells($label, $name, $init=null, $params=null, $post_label=null, $dec=null)
+{
+ if (!isset($dec))
+ $dec = user_price_dec()+2;
+
+ amount_cells_ex($label, $name, 15, 15, $init, $params, $post_label, $dec+2);
+}
+
function amount_row($label, $name, $init=null, $params=null, $post_label=null, $dec=null)
{
echo "";
@@ -754,8 +819,8 @@ function textarea_cells($label, $name, $value, $cols, $rows, $title = null, $par
function textarea_row($label, $name, $value, $cols, $rows, $title=null, $params="")
{
- echo "
";
- textarea_cells($label, $name, $value, $cols, $rows, $title, $params);
+ echo "
$label | ";
+ textarea_cells(null, $name, $value, $cols, $rows, $title, $params);
echo "
\n";
}