X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fui%2Fui_input.inc;h=230dd495b325439db6a65c82a1372d6c2cb50230;hb=de3d898de357e5b7a79f793428461106a916ea80;hp=7e9218e6b42305ca719fc64759fdcb69e80e2e50;hpb=495692c2ac16b3ceb56811ba0ec4eda493fcffeb;p=fa-stable.git
diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index 7e9218e6..230dd495 100644
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -1,56 +1,155 @@
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)
+{
-function hidden($name, $value)
+ foreach($_POST as $postkey=>$postval )
+ {
+ if (strpos($postkey, $prefix) === 0)
+ {
+ $id = substr($postkey, strlen($prefix));
+ return $numeric ? (int)$id : $id;
+ }
+ }
+ return $numeric ? -1 : null;
+}
+//------------------------------------------------------------------------------
+//
+// Helper function for simple db table editor pages
+//
+function simple_page_mode($numeric_id = true)
+{
+ global $Ajax, $Mode, $selected_id;
+
+ $default = $numeric_id ? -1 : '';
+ $selected_id = get_post('selected_id', $default);
+ foreach (array('ADD_ITEM', 'UPDATE_ITEM', 'RESET') as $m) {
+ if (isset($_POST[$m])) {
+ $Ajax->activate('_page_body');
+ if ($m == 'RESET')
+ $selected_id = $default;
+ $Mode = $m; return;
+ }
+ }
+ foreach (array('Edit', 'Delete') as $m) {
+ foreach ($_POST as $p => $pvar) {
+ if (strpos($p, $m) === 0) {
+// $selected_id = strtr(substr($p, strlen($m)), array('%2E'=>'.'));
+ unset($_POST['_focus']); // focus on first form entry
+ $selected_id = quoted_printable_decode(substr($p, strlen($m)));
+ $Ajax->activate('_page_body');
+ $Mode = $m;
+ return;
+ }
+ }
+ }
+ $Mode = '';
+}
+
+//------------------------------------------------------------------------------
+//
+// Read numeric value from user formatted input
+//
+function input_num($postname=null, $dflt=null)
{
- echo "\n";
+ if (!isset($_POST[$postname]))
+ return $dflt;
+
+ return user_numeric($_POST[$postname]);
}
//---------------------------------------------------------------------------------
-function submit($name, $value, $echo=true)
+function hidden($name, $value=null, $echo=true)
{
- $submit_str = "\n";
+ global $Ajax;
+
+ if ($value === null)
+ $value = get_post($name);
+
+ $ret = "";
+ $Ajax->addUpdate($name, $name, $value);
+ if ($echo)
+ echo $ret."\n";
+ else
+ return $ret;
+}
+
+function submit($name, $value, $echo=true, $title=false, $async=false, $icon=false)
+{
+ global $path_to_root;
+
+ 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, $title=false, $async=false, $icon=false)
{
echo "
";
- submit($name, $value, $echo);
+ submit($name, $value, $echo, $title, $async, $icon);
echo "";
}
-function submit_center_first($name, $value)
+function submit_center_first($name, $value, $title=false, $async=false, $icon=false)
{
echo "";
- submit($name, $value);
+ submit($name, $value, true, $title, $async, $icon);
echo " ";
}
-function submit_center_last($name, $value)
+function submit_center_last($name, $value, $title=false, $async=false, $icon=false)
{
echo " ";
- submit($name, $value);
+ submit($name, $value, true, $title, $async, $icon);
echo "";
}
-function submit_add_or_update($add=true)
+function submit_add_or_update($add=true, $title=false, $async=false)
{
if ($add)
- submit('ADD_ITEM', _("Save"));
- else
- submit('UPDATE_ITEM', _("Update"));
+ submit('ADD_ITEM', _("Add new"), true, $title, $async);
+ else {
+ submit('UPDATE_ITEM', _("Update"), true, $title, $async);
+ submit('RESET', _("Cancel"), true, $title, $async);
+ }
}
-function submit_add_or_update_center($add=true)
+function submit_add_or_update_center($add=true, $title=false, $async=false)
{
echo "";
- submit_add_or_update($add);
+ submit_add_or_update($add, $title, $async);
echo "";
}
@@ -62,135 +161,193 @@ 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="", $title=false, $async=false)
{
echo "";
if ($right)
echo " | \n";
echo "";
- submit_add_or_update($add);
+ submit_add_or_update($add, $title, $async);
echo " |
\n";
}
-function submit_cells($name, $value, $extra="")
+function submit_cells($name, $value, $extra="", $title=false, $async=false)
{
echo "";
- submit($name, $value);
+ submit($name, $value, true, $title, $async);
echo " | \n";
}
-function submit_row($name, $value, $right=true, $extra="")
+function submit_row($name, $value, $right=true, $extra="", $title=false, $async=false)
{
echo "";
if ($right)
echo " | \n";
- submit_cells($name, $value, $extra);
+ submit_cells($name, $value, $extra, $title, $async);
echo "
\n";
-}
+}
+
+function submit_return($name, $value, $title=false, $async=false)
+{
+ if (count($_SESSION['Context'])) {
+ submit($name, $value, true, $title, $async);
+ }
+}
+//---------------------------------------------------------------------------------
+
+function button($name, $value, $onclick, $title=false)
+{
+ default_focus($name);
+ echo "\n";
+}
+
+function button_cell($name, $value, $onclick, $title=false)
+{
+ echo "";
+ button($name, $value, $onclick, $title);
+ 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)
+function check($label, $name, $value=null, $submit_on_change=false, $title=false)
{
+ global $Ajax;
+
+ default_focus($name);
if ($label)
echo $label . " ";
- if ($value == null)
- $value = (!isset($_POST[$name]) ? 0 : $_POST[$name]);
- if ($value == 1)
- echo "\n";
+ if ($value === null)
+ $value = get_post($name,0);
+
+ echo "\n";
+ $Ajax->addUpdate($name, $name, $value);
}
-function check_cells($label, $name, $value, $submit_on_change=false)
+function check_cells($label, $name, $value, $submit_on_change=false, $title=false)
{
if ($label != null)
echo "$label | \n";
echo "";
- check(null, $name, $value, $submit_on_change);
+ check(null, $name, $value, $submit_on_change, $title);
echo " | ";
}
-function check_row($label, $name, $value, $submit_on_change=false)
+function check_row($label, $name, $value, $submit_on_change=false, $title=false)
{
echo "";
- check_cells($label, $name, $value, $submit_on_change);
+ check_cells($label, $name, $value, $submit_on_change, $title);
echo "
\n";
}
//-----------------------------------------------------------------------------------
-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="", $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");
- else
- label_cell(number_format2($label,user_price_dec()), "nowrap align=right");
+ label_cell("".price_format($label)."", "nowrap align=right ".$params, $id);
+ else
+ label_cell(price_format($label), "nowrap align=right ".$params, $id);
}
-function qty_cell($label, $bold=false)
+function percent_cell($label, $bold=false, $id=null)
{
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", $id);
+ else
+ label_cell(percent_format($label), "nowrap align=right", $id);
+}
+// 2008-06-15. Changed
+function qty_cell($label, $bold=false, $dec=null, $id=null)
+{
+ if ($dec == null)
+ $dec = get_qty_dec();
+ if ($bold)
+ label_cell("".number_format2($label, $dec)."", "nowrap align=right", $id);
+ else
+ label_cell(number_format2($label, $dec), "nowrap align=right", $id);
}
-function label_cells($label, $value, $params="", $params2="")
+function label_cells($label, $value, $params="", $params2="", $id='')
{
if ($label != null)
echo "$label | \n";
- echo "$value | \n";
+ label_cell($value, $params2, $id);
}
-function label_row($label, $value, $params="", $params2="")
+function label_row($label, $value, $params="", $params2="", $leftfill=0, $id='')
{
echo "";
- label_cells($label, $value, $params, $params2);
+ label_cells($label, $value, $params, $params2, $id);
+ if ($leftfill!=0)
+ echo " | ";
echo "
\n";
}
//-----------------------------------------------------------------------------------
-function text_cells($label, $name, $value, $size="", $max="", $params="", $post_label="", $disabled="")
+function text_cells($label, $name, $value=null, $size="", $max="", $title=false, $params="", $post_label="", $disabled="")
{
+ global $Ajax;
+
+ default_focus($name);
if ($label != null)
label_cell($label, $params);
echo "";
- if ($value == null)
- $value = (!isset($_POST[$name]) ? "" : $_POST[$name]);
- echo "";
+ if ($value === null)
+ $value = get_post($name);
+ echo "";
if ($post_label != "")
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)
+function text_cells_ex($label, $name, $size, $max=null, $init=null, $title=null, $params=null, $post_label=null, $submit_on_change=false)
{
- if (!isset($_POST[$name]) || $_POST[$name] == "")
+ global $Ajax;
+
+ default_focus($name);
+ if (!isset($_POST[$name]) || $_POST[$name] == "")
{
if ($init)
$_POST[$name] = $init;
@@ -204,71 +361,94 @@ function text_cells_ex($label, $name, $size, $max=null, $init=null, $params=null
$max = $size;
echo "";
-
- echo "";
+ $class = $submit_on_change ? 'class="searchbox"' : '';
+ echo "";
if ($post_label)
echo " " . $post_label;
echo " | \n";
+ $Ajax->addUpdate($name, $name, $_POST[$name]);
}
-function text_row($label, $name, $value, $size, $max, $params="", $post_label="")
+function text_row($label, $name, $value, $size, $max, $title=null, $params="", $post_label="")
{
echo "";
- text_cells($label, $name, $value, $size, $max, $params, $post_label);
+ text_cells($label, $name, $value, $size, $max, $title, $params, $post_label);
echo "
\n";
}
//-----------------------------------------------------------------------------------
-function text_row_ex($label, $name, $size, $max=null, $value=null, $params=null, $post_label=null)
+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, $params, $post_label);
+ text_cells_ex($label, $name, $size, $max, $value, $title, $params, $post_label);
echo "
\n";
}
//-----------------------------------------------------------------------------------
-function date_cells($label, $name, $init=null, $inc_days=0, $inc_months=0, $inc_years=0, $params=null)
+function date_cells($label, $name, $title = null, $init=null, $inc_days=0,
+ $inc_months=0, $inc_years=0, $params=null, $submit_on_change=false)
{
- 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], $title, $params, $post_label, $submit_on_change);
}
-function date_row($label, $name, $init=null, $inc_days=0, $inc_months=0, $inc_years=0, $params=null)
+function date_row($label, $name, $title=null, $init=null, $inc_days=0, $inc_months=0,
+ $inc_years=0, $params=null, $submit_on_change=false)
{
echo "";
- date_cells($label, $name, $init, $inc_days, $inc_months, $inc_years, $params);
+ date_cells($label, $name, $title, $init, $inc_days, $inc_months,
+ $inc_years, $params, $submit_on_change);
echo "
\n";
}
//-----------------------------------------------------------------------------------
-function ref_cells($label, $name, $init=null, $params=null)
+function ref_cells($label, $name, $title=null, $init=null, $params=null, $submit_on_change=false)
{
- text_cells_ex($label, $name, 16, 18, $init, $params);
+ text_cells_ex($label, $name, 16, 18, $init, $title, $params, null, $submit_on_change);
}
//-----------------------------------------------------------------------------------
-function ref_row($label, $name, $init=null)
+function ref_row($label, $name, $title=null, $init=null, $submit_on_change=false)
{
echo "";
- ref_cells($label, $name, $init);
+ ref_cells($label, $name, $title, $init, null, $submit_on_change);
echo "
\n";
}
@@ -277,58 +457,144 @@ 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 == 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)
+{
+ global $Ajax;
+
+ if (!isset($dec))
+ $dec = user_price_dec();
+ if (!isset($_POST[$name]) || $_POST[$name] == "")
+ {
+ if ($init !== null)
$_POST[$name] = $init;
+ else
+ $_POST[$name] = '';
}
+ if ($label != null)
+ label_cell($label, $params);
+
+ if (!isset($max))
+ $max = $size;
+
+ echo "";
+
+ echo "";
- text_row($label, $name, $_POST[$name], 6, 6, "", "%");
+ if ($post_label)
+ echo " " . $post_label;
+
+ echo " | \n";
+ $Ajax->addUpdate($name, $name, $_POST[$name]);
+ $Ajax->addAssign($name, $name, 'dec', $dec);
}
+
//-----------------------------------------------------------------------------------
-function amount_cells($label, $name, $init=null, $params=null, $post_label=null)
+function amount_cells($label, $name, $init=null, $params=null, $post_label=null, $dec=null)
{
- text_cells_ex($label, $name, 15, 15, $init, $params, $post_label);
+ 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 amount_row($label, $name, $init=null, $params=null, $post_label=null, $dec=null)
{
echo "";
- amount_cells($label, $name, $init, $params, $post_label);
+ 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 small_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, 7, 12, $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 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 textarea_cells($label, $name, $value, $cols, $rows, $params="")
+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)
+{
+ 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, $title = null, $params="")
+{
+ global $Ajax;
+
+ default_focus($name);
if ($label != null)
echo "$label | \n";
if ($value == null)
$value = (!isset($_POST[$name]) ? "" : $_POST[$name]);
- echo " | \n";
+ echo " | \n";
+ $Ajax->addUpdate($name, $name, $value);
}
-function textarea_row($label, $name, $value, $cols, $rows, $params="")
+function textarea_row($label, $name, $value, $cols, $rows, $title=null, $params="")
{
echo "";
- textarea_cells($label, $name, $value, $cols, $rows, $params);
+ textarea_cells($label, $name, $value, $cols, $rows, $title, $params);
echo "
\n";
}
//-----------------------------------------------------------------------------------
-
+/*
function text_row_with_submit($label, $name, $value, $size, $max, $input_name, $input_value)
{
+ global $Ajax;
+
+ default_focus($name);
echo "$label | \n";
echo "";
@@ -339,8 +605,9 @@ function text_row_with_submit($label, $name, $value, $size, $max, $input_name, $
submit($input_name, $input_value);
echo " |
\n";
+ $Ajax->addUpdate($name, $name, $value);
}
-
+*/
//-----------------------------------------------------------------------------------