X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fui%2Fui_input.inc;h=ab33f649a81ce3cb4418b2ad9f4f4a5e191e03d7;hb=e8707dc974e7153ec0ac304144fcbd246ee5db13;hp=58027b2fcface54702a10d6f467a16d3cf6cd881;hpb=431531eebf3ba494002cfbf7ea36f9e82d4975c0;p=fa-stable.git
diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index 58027b2f..ab33f649 100644
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -86,14 +86,28 @@ function submit_row($name, $value, $right=true, $extra="")
echo "
| \n";
submit_cells($name, $value, $extra);
echo "\n";
-}
+}
+//---------------------------------------------------------------------------------
+
+function button($name, $value, $onclick)
+{
+ echo "\n";
+}
+
+function button_cell($name, $value, $onclick)
+{
+ echo "";
+ button($name, $value, $onclick);
+ echo " | \n";
+}
+
//-----------------------------------------------------------------------------------
-function check_value($name)
+function check_value($name)
{
if (!isset($_POST[$name]))
return 0;
- return 1;
+ return 1;
}
function check($label, $name, $value, $submit_on_change=false)
@@ -130,12 +144,12 @@ function check_row($label, $name, $value, $submit_on_change=false)
//-----------------------------------------------------------------------------------
-function labelheader_cell($label, $params="")
+function labelheader_cell($label, $params="")
{
echo "\n";
}
-function label_cell($label, $params="")
+function label_cell($label, $params="")
{
echo "$label | \n";
}
@@ -144,15 +158,23 @@ function amount_cell($label, $bold=false)
{
if ($bold)
label_cell("".number_format2($label,user_price_dec())."", "nowrap align=right");
- else
+ else
label_cell(number_format2($label,user_price_dec()), "nowrap align=right");
}
+function percent_cell($label, $bold=false)
+{
+ if ($bold)
+ label_cell("".number_format2($label,user_percent_dec())." %", "nowrap align=right");
+ else
+ label_cell(number_format2($label,user_percent_dec())." %", "nowrap align=right");
+}
+
function qty_cell($label, $bold=false)
{
if ($bold)
label_cell("".number_format2($label,user_qty_dec())."", "nowrap align=right");
- else
+ else
label_cell(number_format2($label,user_qty_dec()), "nowrap align=right");
}
@@ -163,10 +185,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";
}
@@ -190,7 +214,7 @@ function text_cells($label, $name, $value, $size="", $max="", $params="", $post_
function text_cells_ex($label, $name, $size, $max=null, $init=null, $params=null, $post_label=null)
{
- if (!isset($_POST[$name]) || $_POST[$name] == "")
+ if (!isset($_POST[$name]) || $_POST[$name] == "")
{
if ($init)
$_POST[$name] = $init;
@@ -238,20 +262,29 @@ function text_row_ex($label, $name, $size, $max=null, $value=null, $params=null,
function date_cells($label, $name, $init=null, $inc_days=0, $inc_months=0, $inc_years=0, $params=null)
{
global $use_date_picker, $path_to_root;
- if (!isset($_POST[$name]) || $_POST[$name] == "")
+ if (!isset($_POST[$name]) || $_POST[$name] == "")
{
if (!$init)
{
- if ($inc_days == 1001)
+ if ($inc_years == 1001)
$_POST[$name] = null;
- else
- $_POST[$name] = date(user_date_display(), Mktime(0,0,0,date("m") + $inc_months,date("d") + $inc_days,date("Y") + $inc_years));
- }
+ else
+ {
+ $dd = Today();
+ if ($inc_days != 0)
+ $dd = add_days($dd, $inc_days);
+ if ($inc_months != 0)
+ $dd = add_months($dd, $inc_months);
+ if ($inc_years != 0)
+ $dd = add_years($dd, $inc_years);
+ $_POST[$name] = $dd;
+ }
+ }
else
$_POST[$name] = $init;
}
if ($use_date_picker)
- $post_label = ""
+ $post_label = ""
. " \n";
else
$post_label = "";
@@ -286,10 +319,9 @@ function ref_row($label, $name, $init=null)
function percent_row($label, $name, $init=null)
{
- if (!isset($_POST[$name]) || $_POST[$name]=="")
+ if (!isset($_POST[$name]) || $_POST[$name]=="")
{
- if ($init)
- $_POST[$name] = $init;
+ $_POST[$name] = $init== null ? '' : $init;
}
text_row($label, $name, $_POST[$name], 6, 6, "", "%");