X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fautocomplete_part.js;h=57f90c7a733438574bd2c4a8bdd1c96c50a24a65;hb=4438ac8995ba86eeef3f20fa246583eebf5bc3cd;hp=de8f6e535681b0ca2a65e1c20a946e8c9f0b853e;hpb=5e96049428deceda2ef857930bbf67311deccbcb;p=kivitendo-erp.git

diff --git a/js/autocomplete_part.js b/js/autocomplete_part.js
index de8f6e535..57f90c7a7 100644
--- a/js/autocomplete_part.js
+++ b/js/autocomplete_part.js
@@ -28,11 +28,10 @@ namespace('kivi', function(k){
       UNDEFINED: CLASSES.UNDEFINED
     }
     var real_id = $real.attr('id');
-    var $dummy  = $('#' + real_id + '_name');
-    var $type   = $('#' + real_id + '_type');
-    var $unit   = $('#' + real_id + '_unit');
+    var $dummy     = $('#' + real_id + '_name');
+    var $part_type = $('#' + real_id + '_part_type');
+    var $unit      = $('#' + real_id + '_unit');
     var $convertible_unit = $('#' + real_id + '_convertible_unit');
-    var $column = $('#' + real_id + '_column');
     var state   = STATES.PICKED;
     var last_real = $real.val();
     var last_dummy = $dummy.val();
@@ -61,12 +60,11 @@ namespace('kivi', function(k){
         'filter.obsolete': 0,
         'filter.unit_obj.convertible_to': $convertible_unit && $convertible_unit.val() ? $convertible_unit.val() : '',
         no_paginate:  $('#no_paginate').prop('checked') ? 1 : 0,
-        column:   $column && $column.val() ? $column.val() : '',
         current:  $real.val(),
       };
 
-      if ($type && $type.val())
-        data['filter.type'] = $type.val().split(',');
+      if ($part_type && $part_type.val())
+        data['filter.part_type'] = $part_type.val().split(',');
 
       if ($unit && $unit.val())
         data['filter.unit'] = $unit.val().split(',');
@@ -77,8 +75,8 @@ namespace('kivi', function(k){
     function set_item (item) {
       if (item.id) {
         $real.val(item.id);
-        // autocomplete ui has name, ajax items have description
-        $dummy.val(item.name ? item.name : item.description);
+        // autocomplete ui has name, use the value for ajax items, which contains displayable_name
+        $dummy.val(item.name ? item.name : item.value);
       } else {
         $real.val('');
         $dummy.val('');
@@ -156,6 +154,27 @@ namespace('kivi', function(k){
       $('#part_selection').dialog('close');
     };
 
+    function handle_changed_text(callbacks) {
+      $.ajax({
+        url: 'controller.pl?action=Part/ajax_autocomplete',
+        dataType: "json",
+        data: $.extend( ajax_data($dummy.val()), { prefer_exact: 1 } ),
+        success: function (data) {
+          if (data.length == 1) {
+            set_item(data[0]);
+            if (callbacks && callbacks.match_one) callbacks.match_one(data[0]);
+          } else if (data.length > 1) {
+            state = STATES.UNDEFINED;
+            if (callbacks && callbacks.match_many) callbacks.match_many(data);
+          } else {
+            state = STATES.UNDEFINED;
+            if (callbacks &&callbacks.match_none) callbacks.match_none();
+          }
+          annotate_state();
+        }
+      });
+    };
+
     $dummy.autocomplete({
       source: function(req, rsp) {
         $.ajax($.extend(o, {
@@ -190,50 +209,44 @@ namespace('kivi', function(k){
         } else if (state == STATES.PICKED) {
           return true;
         }
-        if (event.which == KEY.TAB) event.preventDefault();
-        $.ajax({
-          url: 'controller.pl?action=Part/ajax_autocomplete',
-          dataType: "json",
-          data: $.extend( ajax_data($dummy.val()), { prefer_exact: 1 } ),
-          success: function (data) {
-            if (data.length == 1) {
-              set_item(data[0]);
-              if (event.which == KEY.ENTER)
-                $('#update_button').click();
-            } else if (data.length > 1) {
-             if (event.which == KEY.ENTER)
-                open_dialog();
-            } else {
-            }
-            annotate_state();
-          }
-        });
-        if (event.which == KEY.ENTER)
+        if (event.which == KEY.TAB) {
+          event.preventDefault();
+          handle_changed_text();
+        }
+        if (event.which == KEY.ENTER) {
+          handle_changed_text({
+            match_one:  function(){$('#update_button').click();},
+            match_many: function(){open_dialog();}
+          });
           return false;
+        }
       } else {
         state = STATES.UNDEFINED;
       }
     });
 
+    $dummy.on('paste', function(){
+      setTimeout(function() {
+        handle_changed_text();
+      }, 1);
+    });
+
     $dummy.blur(function(){
       window.clearTimeout(timer);
       timer = window.setTimeout(annotate_state, 100);
     });
 
     // now add a picker div after the original input
-    var pcont  = $('<span>').addClass('position-absolute');
-    var picker = $('<div>');
-    $dummy.after(pcont);
-    pcont.append(picker);
-    picker.addClass('icon16 crm--search').click(open_dialog);
+    var popup_button = $('<span>').addClass('ppp_popup_button');
+    $dummy.after(popup_button);
+    popup_button.click(open_dialog);
 
     var pp = {
       real:           function() { return $real },
       dummy:          function() { return $dummy },
-      type:           function() { return $type },
+      part_type:      function() { return $part_type },
       unit:           function() { return $unit },
       convertible_unit: function() { return $convertible_unit },
-      column:         function() { return $column },
       update_results: update_results,
       result_timer:   result_timer,
       set_item:       set_item,
@@ -246,6 +259,8 @@ namespace('kivi', function(k){
               id:   $(this).children('input.part_picker_id').val(),
               name: $(this).children('input.part_picker_description').val(),
               unit: $(this).children('input.part_picker_unit').val(),
+              partnumber:  $(this).children('input.part_picker_partnumber').val(),
+              description: $(this).children('input.part_picker_description').val(),
             });
             close_popup();
             $dummy.focus();