X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_input.inc;h=2a51d80ffaa35e9d60cade6e3c8530105a806d4b;hb=3c4482206218de2faceeb2f6563c92f28e57db50;hp=7e9218e6b42305ca719fc64759fdcb69e80e2e50;hpb=495692c2ac16b3ceb56811ba0ec4eda493fcffeb;p=fa-stable.git
diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index 7e9218e6..2a51d80f 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)
@@ -86,14 +113,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 +171,12 @@ function check_row($label, $name, $value, $submit_on_change=false)
//-----------------------------------------------------------------------------------
-function labelheader_cell($label, $params="") // ändra till label_td
+function labelheader_cell($label, $params="")
{
echo "\n";
}
-function label_cell($label, $params="") // ändra till label_td
+function label_cell($label, $params="")
{
echo "$label | \n";
}
@@ -143,17 +184,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");
- else
- label_cell(number_format2($label,user_price_dec()), "nowrap align=right");
+ label_cell("".price_format($label)."", "nowrap align=right");
+ else
+ label_cell(price_format($label), "nowrap align=right");
}
-function qty_cell($label, $bold=false)
+function percent_cell($label, $bold=false)
{
if ($bold)
- label_cell("".number_format2($label,user_qty_dec())."", "nowrap align=right");
- else
- label_cell(number_format2($label,user_qty_dec()), "nowrap align=right");
+ label_cell("".percent_format($label)."", "nowrap align=right");
+ else
+ label_cell(percent_format($label), "nowrap align=right");
+}
+
+function qty_cell($label, $bold=false, $dec=null)
+{
+ if ($bold)
+ label_cell("".qty_format($label, $dec)."", "nowrap align=right");
+ else
+ label_cell(qty_format($label, $dec), "nowrap align=right");
}
function label_cells($label, $value, $params="", $params2="")
@@ -163,10 +212,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 +241,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;
@@ -237,16 +288,34 @@ 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)
{
- if (!isset($_POST[$name]) || $_POST[$name] == "")
+ global $use_date_picker, $path_to_root;
+ if (!isset($_POST[$name]) || $_POST[$name] == "")
{
if (!$init)
{
- $_POST[$name] = date(user_date_display(), Mktime(0,0,0,date("m") + $inc_months,date("d") + $inc_days,date("Y") + $inc_years));
- }
+ if ($inc_years == 1001)
+ $_POST[$name] = null;
+ 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;
}
- text_cells_ex($label, $name, 9, 12, $_POST[$name], $params);
+ if ($use_date_picker)
+ $post_label = ""
+ . " \n";
+ else
+ $post_label = "";
+ text_cells_ex($label, $name, 9, 12, $_POST[$name], $params, $post_label);
}
function date_row($label, $name, $init=null, $inc_days=0, $inc_months=0, $inc_years=0, $params=null)
@@ -277,34 +346,107 @@ 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]=="")
+ {
+ $_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;
- text_row($label, $name, $_POST[$name], 6, 6, "", "%");
+ 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);
+}
+
+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)
+{
+ 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)
{
- text_cells_ex($label, $name, 15, 15, $init, $params, $post_label);
+ 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);
}
//-----------------------------------------------------------------------------------