X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_input.inc;h=9ca13632a5fd7a149e7be85cae1183c981927bba;hb=c640dae024fb9554d476bd863a68ef82ada8822d;hp=1e29770487deff359a401b9349dbb170cbc89398;hpb=4567e45243466f391f152b86cd972a847ec82a86;p=fa-stable.git diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc index 1e297704..9ca13632 100644 --- a/includes/ui/ui_input.inc +++ b/includes/ui/ui_input.inc @@ -37,6 +37,15 @@ function find_submit($prefix, $numeric=true) } return $numeric ? -1 : null; } +/* + Helper function. + Returns true if input $name with $submit_on_change option set is subject to update. +*/ +function input_changed($name) +{ + return isset($_POST['_'.$name.'_changed']); +} + //------------------------------------------------------------------------------ // // Helper function for simple db table editor pages @@ -84,10 +93,11 @@ function input_num($postname=null, $dflt=0) } //--------------------------------------------------------------------------------- +$hidden_fields = array(); // store for hiddn fields attached just before form end (for proper html validation) function hidden($name, $value=null, $echo=true) { - global $Ajax; + global $Ajax, $hidden_fields; if ($value === null) $value = get_post($name); @@ -95,7 +105,7 @@ function hidden($name, $value=null, $echo=true) $ret = ""; $Ajax->addUpdate($name, $name, $value); if ($echo) - echo $ret."\n"; + $hidden_fields[] = $ret; else return $ret; } @@ -112,6 +122,7 @@ function hidden($name, $value=null, $echo=true) 'selector' - ditto with closing current popup editor window 'cancel' - cancel form entry on Escape press; dflt ICON_CANCEL 'process' - displays progress bar during call; optional icon + 'nonajax' - ditto, non-ajax submit $atype can contain also multiply type selectors separated by space, however make sense only combination of 'process' and one of defualt/selector/cancel @@ -126,7 +137,7 @@ function submit($name, $value, $echo=true, $title=false, $atype=false, $icon=fal } elseif (!is_bool($atype)) { // necessary: switch uses '==' - $aspect = "aspect='$atype' "; + $aspect = " aspect='$atype' "; $types = explode(' ', $atype); foreach ($types as $type) { @@ -141,6 +152,9 @@ function submit($name, $value, $echo=true, $title=false, $atype=false, $icon=fal case 'cancel': if ($icon===false) $icon=ICON_ESCAPE; break; + + case 'nonajax': + $atype = false; } } } @@ -151,7 +165,7 @@ function submit($name, $value, $echo=true, $title=false, $atype=false, $icon=fal ." name=\"$name\" id=\"$name\" value=\"$value\"" .($title ? " title='$title'" : '') .">" - .($icon ? "" : '') + .($icon ? "" : '') ."$value" ."\n"; if ($echo) @@ -247,11 +261,16 @@ function submit_return($name, $value, $title=false) } } -function submit_js_confirm($name, $msg) { - add_js_source( - "_validate.$name=function(){ return confirm('" - . strtr($msg, array("\n"=>'\\n')) . "');};"); -}; +function submit_js_confirm($name, $msg, $set = true) { + global $Ajax; + $js = "_validate.$name=".($set ? "function(){ return confirm('" + . strtr($msg, array("\n"=>'\\n')) . "');};" + : 'null;'); + if (in_ajax()) { + $Ajax->addScript(true, $js); + } else + add_js_source($js); +} //----------------------------------------------------------------------------------- function set_icon($icon, $title=false) @@ -259,7 +278,7 @@ function set_icon($icon, $title=false) global $path_to_root; if (basename($icon) === $icon) // standard icons does not contain path separator $icon = "$path_to_root/themes/".user_theme()."/images/$icon"; - return "\n"; + return "\n"; } function button($name, $value, $title=false, $icon=false, $aspect='') @@ -281,7 +300,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 "\n"; + ." >\n"; } function button_cell($name, $value, $title=false, $icon=false, $aspect='') @@ -374,7 +393,10 @@ function check_row($label, $name, $value=null, $submit_on_change=false, $title=f } //----------------------------------------------------------------------------------- -function radio($label, $name, $value, $selected, $submit_on_change=false) { +function radio($label, $name, $value, $selected=null, $submit_on_change=false) +{ + if (!isset($selected)) + $selected = get_post($name) === (string)$value; if ($submit_on_change === true) $submit_on_change = @@ -452,14 +474,14 @@ function qty_cell($label, $bold=false, $dec=null, $id=null) label_cell(number_format2($label, $dec), "nowrap align=right", $id); } -function label_cells($label, $value, $params="", $params2="", $id='') +function label_cells($label, $value, $params="", $params2="", $id=null) { if ($label != null) echo "$label\n"; label_cell($value, $params2, $id); } -function label_row($label, $value, $params="", $params2="", $leftfill=0, $id='') +function label_row($label, $value, $params="", $params2="", $leftfill=0, $id=null) { echo ""; if ($params == "") @@ -593,7 +615,7 @@ function link_row_ex($label, $name, $size, $max=null, $title=null, $value=null, function date_cells($label, $name, $title = null, $check=null, $inc_days=0, $inc_months=0, $inc_years=0, $params=null, $submit_on_change=false) { - global $use_date_picker, $path_to_root, $Ajax; + global $path_to_root, $Ajax; if (!isset($_POST[$name]) || $_POST[$name] == "") { @@ -611,9 +633,13 @@ function date_cells($label, $name, $title = null, $check=null, $inc_days=0, $_POST[$name] = $dd; } } - if ($use_date_picker) + if (user_use_date_picker()) + { + $calc_image = (file_exists("$path_to_root/themes/".user_theme()."/images/cal.gif")) ? + "$path_to_root/themes/".user_theme()."/images/cal.gif" : "$path_to_root/themes/default/images/cal.gif"; $post_label = "" - . " "._(\n"; + . " "._(\n"; + } else $post_label = ""; @@ -622,15 +648,15 @@ function date_cells($label, $name, $title = null, $check=null, $inc_days=0, echo ""; - $class = $submit_on_change ? 'class="searchbox"' : ''; + $class = $submit_on_change ? 'date active' : 'date'; $aspect = $check ? 'aspect="cdate"' : ''; if ($check && (get_post($name) != Today())) $aspect .= ' style="color:#FF0000"'; default_focus($name); - - echo "3)?11:10; + echo " $post_label"; echo "\n"; @@ -650,7 +676,7 @@ function date_row($label, $name, $title=null, $check=null, $inc_days=0, $inc_mon function password_row($label, $name, $value) { echo "$label"; - label_cell(""); + label_cell(""); echo "\n"; } @@ -659,7 +685,7 @@ function file_cells($label, $name, $id="") { if ($id != "") $id = "id='$id'"; - label_cells($label, ""); + label_cells($label, ""); } function file_row($label, $name, $id = "") { @@ -874,7 +900,7 @@ function inactive_control_cell($id, $value, $table, $key) get_post('Update')) && (check_value('Inactive'.$id) != $value)) { update_record_status($id, !$value, $table, $key); } - echo ''. checkbox(null, $name, $value, true, '', "align='center'") + echo ''. checkbox(null, $name, $value, true, '') . hidden("LInact[$id]", $value, false) . ''; } } @@ -926,4 +952,17 @@ function supplier_credit_row($supplier, $credit, $parms='') ."", $parms); } -?> \ No newline at end of file +function bank_balance_row($bank_acc, $parms='') +{ + global $path_to_root; + + $to = add_days(Today(), 1); + $bal = get_balance_before_for_bank_account($bank_acc, $to); + label_row( _("Bank Balance:"), + " " + . price_format($bal) + ."", $parms); +} +