X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_input.inc;h=36f99e9ce01bf0e7bd5fc69095c14a804bd3ea59;hb=29e68a1b8dcbe7c7ecb797396945e0cccf2d6cd8;hp=9d74f67ca33606c520fc6c6436e8214a3926a6ae;hpb=8273b6b981c008c7968a7f7c8eaea640d453c3f2;p=fa-stable.git diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc index 9d74f67c..36f99e9c 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; @@ -108,6 +109,7 @@ function hidden($name, $value=null, $echo=true) 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 */ function submit($name, $value, $echo=true, $title=false, $atype=false, $icon=false) @@ -119,6 +121,10 @@ function submit($name, $value, $echo=true, $title=false, $atype=false, $icon=fal 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; @@ -130,7 +136,6 @@ function submit($name, $value, $echo=true, $title=false, $atype=false, $icon=fal " aspect='fallback'" : " style='display:none;'"; break; } - default_focus($name); $submit_str = "\n"; if ($echo) @@ -149,9 +154,9 @@ function submit($name, $value, $echo=true, $title=false, $atype=false, $icon=fal function submit_center($name, $value, $echo=true, $title=false, $async=false, $icon=false) { - echo "
"; + if ($echo) echo "
"; submit($name, $value, $echo, $title, $async, $icon); - echo "
"; + if ($echo) echo "
"; } function submit_center_first($name, $value, $title=false, $async=false, $icon=false) @@ -172,7 +177,7 @@ function submit_center_last($name, $value, $title=false, $async=false, $icon=fal 'both' - use both Ctrl-Enter and Escape hotkeys 'cancel' - apply to 'RESET' button */ -function submit_add_or_update($add=true, $title=false, $async=false) +function submit_add_or_update($add=true, $title=false, $async=false, $clone=false) { $cancel = $async; @@ -187,25 +192,27 @@ function submit_add_or_update($add=true, $title=false, $async=false) if ($add) submit('ADD_ITEM', _("Add new"), true, $title, $async); else { - submit('UPDATE_ITEM', _("Update"), true, $title, $async); - submit('RESET', _("Cancel"), true, $title, $cancel); + submit('UPDATE_ITEM', _("Update"), true, _('Submit changes'), $async); + if ($clone) submit('CLONE', _("Clone"), true, + _('Edit new record with current data'), $async); + submit('RESET', _("Cancel"), true, _('Cancel edition'), $cancel); } } -function submit_add_or_update_center($add=true, $title=false, $async=false) +function submit_add_or_update_center($add=true, $title=false, $async=false, $clone=false) { echo "
"; - submit_add_or_update($add, $title, $async); + submit_add_or_update($add, $title, $async, $clone); echo "
"; } -function submit_add_or_update_row($add=true, $right=true, $extra="", $title=false, $async=false) +function submit_add_or_update_row($add=true, $right=true, $extra="", $title=false, $async=false, $clone = false) { echo ""; if ($right) echo " \n"; echo ""; - submit_add_or_update($add, $title, $async); + submit_add_or_update($add, $title, $async, $clone); echo "\n"; } @@ -225,43 +232,60 @@ function submit_row($name, $value, $right=true, $extra="", $title=false, $async= echo "\n"; } -function submit_return($name, $value, $title=false, $async=false) +function submit_return($name, $value, $title=false) { - if (count($_SESSION['Context'])) { - submit($name, $value, true, $title, $async); + if (@$_REQUEST['popup']) { + submit($name, $value, true, $title, 'selector'); } } + +function submit_js_confirm($name, $msg) { + add_js_source( + "_validate.$name=function(){ return confirm('" + . strtr($msg, array("\n"=>'\\n')) . "');};"); +}; //----------------------------------------------------------------------------------- function set_icon($icon, $title=false) { global $path_to_root; - return "\n"; + return "\n"; } -function button($name, $value, $title=false, $icon=false) +function button($name, $value, $title=false, $icon=false, $aspect='') { // php silently changes dots,spaces,'[' and characters 128-159 // to underscore in POST names, to maintain compatibility with register_globals + $rel = ''; + if ($aspect == 'selector') { + $rel = " rel='$value'"; + $value = _("Select"); + } if (user_graphic_links() && $icon) { if ($value == _("Delete")) // Helper during implementation $icon = ICON_DELETE; return "\n"; } else return "'=2E',' '=>'=20','='=>'=3D','['=>'=5B'))) ."' value='$value'" - .($title ? " title='$title'":'')." />\n"; + .($title ? " title='$title'":'') + . ($aspect ? " aspect='$aspect'" : '') + . $rel + ." />\n"; } -function button_cell($name, $value, $title=false, $icon=false) +function button_cell($name, $value, $title=false, $icon=false, $aspect='') { echo ""; - echo button($name, $value, $title, $icon); + echo button($name, $value, $title, $icon, $aspect); echo ""; } @@ -274,6 +298,11 @@ function edit_button_cell($name, $value, $title=false) { button_cell($name, $value, $title, ICON_EDIT); } + +function select_button_cell($name, $value, $title=false) +{ + button_cell($name, $value, $title, ICON_ADD, 'selector'); +} //----------------------------------------------------------------------------------- function check_value($name) @@ -288,7 +317,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) { @@ -315,7 +344,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) @@ -325,15 +354,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"; @@ -358,6 +398,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) @@ -366,6 +412,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) @@ -394,6 +450,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 ""; @@ -458,9 +519,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"; } @@ -469,9 +529,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"; } @@ -557,6 +616,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"; @@ -567,12 +628,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) @@ -584,8 +667,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"; } @@ -616,8 +699,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; @@ -645,6 +731,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 ""; @@ -724,8 +819,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"; }