X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_input.inc;h=272d515b9965283b1770fc8ce02f65ba077b0b00;hb=b611def496e4942321d66f183fe0e1d95417c99f;hp=558460e5325d211757adcdbc77e6a79351c4e658;hpb=31a87119c319b95241389111765b40a3faadf4f6;p=fa-stable.git diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc index 558460e5..272d515b 100644 --- a/includes/ui/ui_input.inc +++ b/includes/ui/ui_input.inc @@ -47,11 +47,12 @@ function simple_page_mode($numeric_id = true) $default = $numeric_id ? -1 : ''; $selected_id = get_post('selected_id', $default); - foreach (array('ADD_ITEM', 'UPDATE_ITEM', 'RESET') as $m) { + foreach (array('ADD_ITEM', 'UPDATE_ITEM', 'RESET', 'CLONE') as $m) { if (isset($_POST[$m])) { $Ajax->activate('_page_body'); - if ($m == 'RESET') + if ($m == 'RESET' || $m == 'CLONE') $selected_id = $default; + unset($_POST['_focus']); $Mode = $m; return; } } @@ -74,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; @@ -106,36 +107,43 @@ function hidden($name, $value=null, $echo=true) null - button visible only in fallback mode; optional icon Ajax submit: true - standard button; optional icon - 'process' - displays progress bar during call; optional icon + 'default' - default form submit on Ctrl-Enter press; dflt ICON_OK icon '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 + + $atype can contain also multiply type selectors separated by space, + however make sense only combination of 'process' and one of defualt/selector/cancel */ function submit($name, $value, $echo=true, $title=false, $atype=false, $icon=false) { global $path_to_root; $aspect=''; - if (!is_bool($atype)) // necessary: switch uses '==' - switch($atype) { - case 'process': - $aspect = " aspect='process'"; break; - case 'selector': - $aspect = " aspect='selector' rel = '$value'"; - $value = _("Select"); - if ($icon===false) $icon=ICON_SUBMIT; break; - case 'default': - $aspect = " aspect='default'"; - if ($icon===false) $icon=ICON_SUBMIT; break; - case 'cancel': - $aspect = " aspect='cancel'"; - if ($icon===false) $icon=ICON_ESCAPE; break; - case null: - $aspect = fallback_mode() ? - " aspect='fallback'" : " style='display:none;'"; break; - } + if ($atype === null) { + $aspect = fallback_mode() ? " aspect='fallback'" : " style='display:none;'"; - default_focus($name); + } elseif (!is_bool($atype)) { // necessary: switch uses '==' + + $aspect = "aspect='$atype' "; + $types = explode(' ', $atype); + + foreach ($types as $type) { + switch($type) { + case 'selector': + $aspect = " aspect='selector' rel = '$value'"; + $value = _("Select"); + if ($icon===false) $icon=ICON_SUBMIT; break; + + case 'default': + if ($icon===false) $icon=ICON_SUBMIT; break; + + case 'cancel': + if ($icon===false) $icon=ICON_ESCAPE; break; + } + } + } $submit_str = "\n"; } else return "'=2E',' '=>'=20','='=>'=3D','['=>'=5B'))) + .htmlentities(strtr($name, array('.'=>'=2E', '='=>'=3D',// ' '=>'=20','['=>'=5B' + ))) ."' value='$value'" .($title ? " title='$title'":'') . ($aspect ? " aspect='$aspect'" : '') @@ -314,7 +327,7 @@ function checkbox($label, $name, $value=null, $submit_on_change=false, $title=fa global $Ajax; $str = ''; - default_focus($name); + if ($label) $str .= $label . " "; if ($submit_on_change !== false) { @@ -341,7 +354,7 @@ function check($label, $name, $value=null, $submit_on_change=false, $title=false echo checkbox($label, $name, $value, $submit_on_change, $title); } -function check_cells($label, $name, $value, $submit_on_change=false, $title=false, +function check_cells($label, $name, $value=null, $submit_on_change=false, $title=false, $params='') { if ($label != null) @@ -351,15 +364,26 @@ function check_cells($label, $name, $value, $submit_on_change=false, $title=fals echo ""; } -function check_row($label, $name, $value, $submit_on_change=false, $title=false) +function check_row($label, $name, $value=null, $submit_on_change=false, $title=false) { - echo ""; - echo check_cells($label, $name, $value, $submit_on_change, $title); + echo "$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 "$label\n"; @@ -384,6 +408,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) @@ -392,6 +422,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) @@ -420,6 +460,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 ""; @@ -484,9 +529,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"; } @@ -495,9 +539,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"; } @@ -583,6 +626,8 @@ function date_cells($label, $name, $title = null, $check=null, $inc_days=0, if ($check && (get_post($name) != Today())) $aspect .= ' style="color:#FF0000"'; + default_focus($name); + echo " $post_label"; @@ -593,12 +638,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) @@ -610,8 +677,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"; } @@ -642,8 +709,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; @@ -671,6 +741,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 ""; @@ -750,8 +829,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"; } @@ -820,4 +899,29 @@ function inactive_control_column(&$th) { $Ajax->activate('_page_body'); } } + +function customer_credit_row($customer, $credit, $parms='') +{ + global $path_to_root; + + label_row( _("Current Credit:"), + "" + . price_format($credit) + ."", $parms); +} + +function supplier_credit_row($supplier, $credit, $parms='') +{ + global $path_to_root; + + label_row( _("Current Credit:"), + "" + . price_format($credit) + ."", $parms); +} + ?> \ No newline at end of file