projects / fa-stable.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Popup editors now available as option for some list selectors.
[fa-stable.git] / includes / ui / ui_lists.inc
diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index bd411303ce3f9571ef0443882ec2f160a532f4c9..b2332aeab064e42ad5981ff045a663fde8260c03 100644 (file)
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -41,7 +41,6 @@ $opts = array(                // default options
                // submit on select parameters
        'default' => '', // default value when $_POST is not set
        'select_submit' => false, //submit on select: true/false
-       'edit_submit' => false, // call editor on F4
        'async' => true,        // select update via ajax (true) vs _page_body reload
                // search box parameters
        'sel_hint' => null,
@@ -69,7 +68,7 @@ $opts = array(                // default options
 
        $search_box = $opts['search_box']===true ? '_'.$name.'_edit' : $opts['search_box'];
        $search_submit = $opts['search_submit']===true ? '_'.$name.'_button' : $opts['search_submit'];
-       $select_submit =  $opts['select_submit']===true ? '_'.$name.'_update' : $opts['select_submit'];
+       $select_submit =  $opts['select_submit'];
        $spec_id = $opts['spec_id'];
        $spec_option = $opts['spec_option'];
        $by_id = ($opts['type'] == 0);
@@ -95,7 +94,7 @@ $opts = array(                // default options
        $rel = '';
        $limit = '';
 
-       if (isset($_POST[$select_submit])) {
+       if (isset($_POST['_'.$name.'_update'])) {
                if ($by_id) $txt = $_POST[$name];
 
                if (!$opts['async'])
@@ -209,9 +208,8 @@ $opts = array(              // default options
                $txt = $found;
                $Ajax->addUpdate($name, $search_box, $txt ? $txt : '');
        }
-       $aspect = $opts['edit_submit'] ? " aspect='editable'" : '';
        $selector = "<select $disabled name='$name' class='$class' title='"
-               . $opts['sel_hint']."'$aspect $rel>".$selector."</select>\n";
+               . $opts['sel_hint']."' $rel>".$selector."</select>\n";
 
        $Ajax->addUpdate($name, "_{$name}_sel", $selector);
 
@@ -224,7 +222,7 @@ $opts = array(              // default options
        // button class selects form reload/ajax selector update
                $selector .= sprintf($_select_button, $disabled, user_theme(),
                        (fallback_mode() ? '' : 'display:none;'),
-                       $select_submit)."\n";
+                        '_'.$name.'_update')."\n";
        }
 // ------ make combo ----------
 
@@ -274,7 +272,6 @@ $opts = array(              // default options
        'spec_option'=>false,   // option text or false
        'spec_id' => 0,         // option id
        'select_submit' => false, //submit on select: true/false
-       'edit_submit' => false, // call editor on F4
        'async' => true,        // select update via ajax (true) vs _page_body reload
        'default' => '', // default value when $_POST is not set
                // search box parameters
@@ -284,7 +281,7 @@ $opts = array(              // default options
 // ------ merge options with defaults ----------
        if($options != null)
                $opts = array_merge($opts, $options);
-       $select_submit =  $opts['select_submit']===true ? '_'.$name.'_update' : $opts['select_submit'];
+       $select_submit =  $opts['select_submit'];
        $spec_id = $opts['spec_id'];
        $spec_option = $opts['spec_option'];
        $disabled = $opts['disabled'] ? "disabled" : '';
@@ -293,7 +290,7 @@ $opts = array(              // default options
                $selected_id = get_post($name, $opts['default']);
        }
 
-       if (isset($_POST[$select_submit])) {
+       if (isset($_POST[ '_'.$name.'_update'])) {
                if (!$opts['async'])
                        $Ajax->activate('_page_body');
                else
@@ -332,9 +329,8 @@ $opts = array(              // default options
        }
        $_POST[$name] = $selected_id;
 
-       $aspect = $opts['edit_submit'] ? " aspect='editable'" : '';
        $selector = "<select $disabled name='$name' class='combo' title='"
-               . $opts['sel_hint']."'$aspect >".$selector."</select>\n";
+               . $opts['sel_hint']."'>".$selector."</select>\n";
 
        $Ajax->addUpdate($name, "_{$name}_sel", $selector);
 
@@ -344,7 +340,7 @@ $opts = array(              // default options
                global $_select_button;
                $selector .= sprintf($_select_button, $disabled, user_theme(),
                        (fallback_mode() ? '' : 'display:none;'),
-                       $select_submit)."\n";
+                        '_'.$name.'_update')."\n";
        }
        default_focus($name);
        echo $selector;
@@ -366,7 +362,7 @@ function _format_add_curr($row)
 }
 
 function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false,
-       $all=false)
+       $all=false, $editkey = false)
 {
        global $all_items;
 
@@ -374,11 +370,13 @@ function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_
 
        $mode = get_company_pref('no_supplier_list');
 
+       if ($editkey)
+               set_editor('supplier', $name, $editkey);
+               
        return combo_input($name, $selected_id, $sql, 'supplier_id', 'supp_name',
        array(
                'format' => '_format_add_curr',
                'search_box' => $mode!=0,
-               'edit_submit' => true, 
                'type' => 1,
                'spec_option' => $spec_option === true ? _("All Suppliers") : $spec_option,
                'spec_id' => $all_items,
@@ -391,25 +389,29 @@ function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_
 }
 
 function supplier_list_cells($label, $name, $selected_id=null, $all_option=false, 
-       $submit_on_change=false, $all=false)
+       $submit_on_change=false, $all=false, $editkey = false)
 {
        if ($label != null)
                echo "<td>$label</td><td>\n";
-       $str = supplier_list($name, $selected_id, $all_option, $submit_on_change, $all);
+       $str = supplier_list($name, $selected_id, $all_option, $submit_on_change, 
+               $all, $editkey);
                echo "</td>\n";
        return $str;
 }
 
-function supplier_list_row($label, $name, $selected_id=null, $all_option = false, $submit_on_change=false)
+function supplier_list_row($label, $name, $selected_id=null, $all_option = false, 
+       $submit_on_change=false, $all=false, $editkey = false)
 {
 echo "<tr><td>$label</td><td>";
-       $str = supplier_list($name, $selected_id, $all_option, $submit_on_change );
+       $str = supplier_list($name, $selected_id, $all_option, $submit_on_change,
+               $all, $editkey);
 echo "</td></tr>\n";
 return $str;
 }
 //----------------------------------------------------------------------------------------------
 
-function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false, $show_inactive=false)
+function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false, 
+       $show_inactive=false, $editkey = false)
 {
        global $all_items;
 
@@ -417,6 +419,9 @@ function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_
 
        $mode = get_company_pref('no_customer_list');
 
+       if ($editkey)
+               set_editor('customer', $name, $editkey);
+
 return combo_input($name, $selected_id, $sql, 'debtor_no', 'name',
        array(
            'format' => '_format_add_curr',
@@ -426,32 +431,31 @@ return combo_input($name, $selected_id, $sql, 'debtor_no', 'name',
                'spec_option' => $spec_option === true ? _("All Customers") : $spec_option,
                'spec_id' => $all_items,
                'select_submit'=> $submit_on_change,
-               'edit_submit' => true, // call editor on F4
                'async' => false,
-               'sel_hint' => $mode ? _('Press Space tab to filter by name fragment; F4 - entry new customer') :
+               'sel_hint' => $mode ? _('Press Space tab to filter by name fragment; F2 - entry new customer') :
                _('Select customer'),
                'show_inactive' => $show_inactive
        ) );
 }
 
 function customer_list_cells($label, $name, $selected_id=null, $all_option=false, 
-       $submit_on_change=false, $show_inactive=false)
+       $submit_on_change=false, $show_inactive=false, $editkey = false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td nowrap>";
        $str = customer_list($name, $selected_id, $all_option, $submit_on_change,
-               $show_inactive);
+               $show_inactive, $editkey);
        echo "</td>\n";
        return $str;
 }
 
 function customer_list_row($label, $name, $selected_id=null, $all_option = false, 
-       $submit_on_change=false, $show_inactive=false)
+       $submit_on_change=false, $show_inactive=false, $editkey = false)
 {
        echo "<tr><td>$label</td><td nowrap>";
        $str = customer_list($name, $selected_id, $all_option, $submit_on_change,
-               $show_inactive);
+               $show_inactive, $editkey);
        echo "</td>\n</tr>\n";
        return $str;
 }
@@ -459,13 +463,16 @@ function customer_list_row($label, $name, $selected_id=null, $all_option = false
 //------------------------------------------------------------------------------------------------
 
 function customer_branches_list($customer_id, $name, $selected_id=null,
-       $spec_option = true, $enabled=true, $submit_on_change=false)
+       $spec_option = true, $enabled=true, $submit_on_change=false, $editkey = false)
 {
        global $all_items;
 
        $sql = "SELECT branch_code, br_name FROM ".TB_PREF."cust_branch
                WHERE debtor_no='" . $customer_id . "' ";
 
+       if ($editkey)
+               set_editor('branch', $name, $editkey);
+
        $where = $enabled ? array("disable_trans = 0") : array();
 return  combo_input($name, $selected_id, $sql, 'branch_code', 'br_name',
        array(
@@ -478,20 +485,24 @@ return  combo_input($name, $selected_id, $sql, 'branch_code', 'br_name',
 }
 //------------------------------------------------------------------------------------------------
 
-function customer_branches_list_cells($label,$customer_id, $name, $selected_id=null, $all_option = true, $enabled=true, $submit_on_change=false)
+function customer_branches_list_cells($label,$customer_id, $name, $selected_id=null, 
+       $all_option = true, $enabled=true, $submit_on_change=false, $editkey = false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       $ret = customer_branches_list($customer_id, $name, $selected_id, $all_option, $enabled, $submit_on_change);
+       $ret = customer_branches_list($customer_id, $name, $selected_id, $all_option, $enabled, 
+               $submit_on_change, $editkey);
        echo "</td>\n";
        return $ret;
 }
 
-function customer_branches_list_row($label,$customer_id, $name, $selected_id=null, $all_option = true, $enabled=true, $submit_on_change=false)
+function customer_branches_list_row($label, $customer_id, $name, $selected_id=null, 
+       $all_option = true, $enabled=true, $submit_on_change=false, $editkey = false)
 {
        echo "<tr>";
-       $ret = customer_branches_list_cells($label, $customer_id, $name, $selected_id, $all_option, $enabled, $submit_on_change);
+       $ret = customer_branches_list_cells($label, $customer_id, $name, $selected_id, 
+               $all_option, $enabled, $submit_on_change, $editkey);
        echo "</tr>";
        return $ret;
 }
@@ -653,13 +664,16 @@ function dimensions_list_row($label, $name, $selected_id=null, $no_option=false,
 //---------------------------------------------------------------------------------------------------
 
 function stock_items_list($name, $selected_id=null, $all_option=false, 
-       $submit_on_change=false, $opts=array())
+       $submit_on_change=false, $opts=array(), $editkey = false)
 {
        global $all_items;
 
        $sql = "SELECT stock_id, s.description, c.description, s.inactive
                        FROM ".TB_PREF."stock_master s,".TB_PREF."stock_category c WHERE s.category_id=c.category_id";
 
+       if ($editkey)
+               set_editor('item', $name, $editkey);
+
        return combo_input($name, $selected_id, $sql, 'stock_id', 's.description',
        array_merge(
          array(
@@ -682,12 +696,12 @@ function _format_stock_items($row)
 }
 
 function stock_items_list_cells($label, $name, $selected_id=null, $all_option=false, 
-       $submit_on_change=false, $all=false)
+       $submit_on_change=false, $all=false, $editkey = false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
-               array('cells'=>true, 'show_inactive'=>$all));
+               array('cells'=>true, 'show_inactive'=>$all), $editkey);
        return $str;
 }
 /*
@@ -776,8 +790,7 @@ function stock_manufactured_items_list($name, $selected_id=null,
        $all_option=false, $submit_on_change=false)
 {
        $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
-               array('where'=>array("mb_flag= 'M'"), 
-                       'edit_submit' => true));
+               array('where'=>array("mb_flag= 'M'")));
        return $str;            
 }
 
@@ -803,20 +816,21 @@ function stock_manufactured_items_list_row($label, $name, $selected_id=null,
 //------------------------------------------------------------------------------------
 
 function stock_component_items_list($name, $parent_stock_id, $selected_id=null,
-       $all_option=false, $submit_on_change=false)
+       $all_option=false, $submit_on_change=false, $editkey = false)
 {
        $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
-               array('where'=>array("stock_id != '$parent_stock_id'")));
+               array('where'=>array("stock_id != '$parent_stock_id'")), $editkey);
        return $str;
 }
 
 function stock_component_items_list_cells($label, $name, $parent_stock_id, 
-       $selected_id=null, $all_option=false, $submit_on_change=false)
+       $selected_id=null, $all_option=false, $submit_on_change=false, $editkey = false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
-               array('where'=>array("stock_id != '$parent_stock_id'"), 'cells'=>true));
+               array('where'=>array("stock_id != '$parent_stock_id'"), 'cells'=>true),
+               $editkey);
        return $str;
 }
 //------------------------------------------------------------------------------------
@@ -841,33 +855,31 @@ function stock_costable_items_list_cells($label, $name, $selected_id=null,
 
 //------------------------------------------------------------------------------------
 function stock_purchasable_items_list($name, $selected_id=null,        
-       $all_option=false, $submit_on_change=false, $all=false)
+       $all_option=false, $submit_on_change=false, $all=false, $editkey=false)
 {
        $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
                array('where'=>array("mb_flag!= 'M'"), 
-                       'edit_submit' => true,
-                       'show_inactive'=>$all));
+                       'show_inactive'=>$all), $editkey);
        return $str;
 }
 
 function stock_purchasable_items_list_cells($label, $name, $selected_id=null,
-                       $all_option=false, $submit_on_change=false, $all=false)
+                       $all_option=false, $submit_on_change=false, $editkey=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
                array('where'=>array("mb_flag!= 'M'"), 
-                        'edit_submit' => true,
-                        'cells'=>true));
+                        'cells'=>true), $editkey);
        return $str;
 }
 
 function stock_purchasable_items_list_row($label, $name, $selected_id=null,
-                       $all_option=false, $submit_on_change=false)
+                       $all_option=false, $submit_on_change=false, $editkey=false)
 {
        echo "<tr>\n";
        $ret = stock_purchasable_items_list_cells($label, $name, $selected_id=null,
-               $all_option, $submit_on_change);
+               $all_option, $submit_on_change, $editkey);
        echo "</tr>\n";
        return $ret;
 }
FrontAccounting stable branch