X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fautocomplete_part.js;h=de8f6e535681b0ca2a65e1c20a946e8c9f0b853e;hb=4eea286e58d6646d95fa7392f9bdd7611eafa07f;hp=04af286b2d8950859b5c9196671775a232d2ed09;hpb=6dbc83af32ca1bded29101903d98d8656113801e;p=kivitendo-erp.git

diff --git a/js/autocomplete_part.js b/js/autocomplete_part.js
index 04af286b2..de8f6e535 100644
--- a/js/autocomplete_part.js
+++ b/js/autocomplete_part.js
@@ -8,14 +8,24 @@ namespace('kivi', function(k){
       ESCAPE: 27,
       ENTER:  13,
       TAB:    9,
+      LEFT:   37,
+      RIGHT:  39,
+      PAGE_UP: 33,
+      PAGE_DOWN: 34,
     };
+    var CLASSES = {
+      PICKED:       'partpicker-picked',
+      UNDEFINED:    'partpicker-undefined',
+      FAT_SET_ITEM: 'partpicker_fat_set_item',
+    }
     var o = $.extend({
       limit: 20,
       delay: 50,
+      fat_set_item: $real.hasClass(CLASSES.FAT_SET_ITEM),
     }, options);
     var STATES = {
-      UNIQUE: 1,
-      UNDEFINED: 0,
+      PICKED:    CLASSES.PICKED,
+      UNDEFINED: CLASSES.UNDEFINED
     }
     var real_id = $real.attr('id');
     var $dummy  = $('#' + real_id + '_name');
@@ -35,7 +45,11 @@ namespace('kivi', function(k){
           real_id: real_id,
         }, ajax_data($dummy.val())),
         id: 'part_selection',
-        dialog: { title: k.t8('Part picker') }
+        dialog: {
+          title: k.t8('Part picker'),
+          width: 800,
+          height: 800,
+        }
       });
       window.clearTimeout(timer);
       return true;
@@ -43,9 +57,10 @@ namespace('kivi', function(k){
 
     function ajax_data(term) {
       var data = {
-        'filter.all:substr::ilike': term,
+        'filter.all:substr:multi::ilike': term,
         '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(),
       };
@@ -71,16 +86,45 @@ namespace('kivi', function(k){
       state = STATES.PICKED;
       last_real = $real.val();
       last_dummy = $dummy.val();
+      last_unverified_dummy = $dummy.val();
       $real.trigger('change');
+
+      if (o.fat_set_item && item.id) {
+        $.ajax({
+          url: 'controller.pl?action=Part/show.json',
+          data: { id: item.id },
+          success: function(rsp) {
+            $real.trigger('set_item:PartPicker', rsp);
+          },
+        });
+      } else {
+        $real.trigger('set_item:PartPicker', item);
+      }
+      annotate_state();
     }
 
     function make_defined_state () {
-      if (state == STATES.PICKED)
+      if (state == STATES.PICKED) {
+        annotate_state();
         return true
-      else if (state == STATES.UNDEFINED && $dummy.val() == '')
+      } else if (state == STATES.UNDEFINED && $dummy.val() == '')
         set_item({})
-      else
+      else {
+        last_unverified_dummy = $dummy.val();
         set_item({ id: last_real, name: last_dummy })
+      }
+      annotate_state();
+    }
+
+    function annotate_state () {
+      if (state == STATES.PICKED)
+        $dummy.removeClass(STATES.UNDEFINED).addClass(STATES.PICKED);
+      else if (state == STATES.UNDEFINED && $dummy.val() == '')
+        $dummy.removeClass(STATES.UNDEFINED).addClass(STATES.PICKED);
+      else {
+        last_unverified_dummy = $dummy.val();
+        $dummy.addClass(STATES.UNDEFINED).removeClass(STATES.PICKED);
+      }
     }
 
     function update_results () {
@@ -94,6 +138,16 @@ namespace('kivi', function(k){
     };
 
     function result_timer (event) {
+      if (!$('no_paginate').prop('checked')) {
+        if (event.keyCode == KEY.PAGE_UP) {
+          $('#part_picker_result a.paginate-prev').click();
+          return;
+        }
+        if (event.keyCode == KEY.PAGE_DOWN) {
+          $('#part_picker_result a.paginate-next').click();
+          return;
+        }
+      }
       window.clearTimeout(timer);
       timer = window.setTimeout(update_results, 100);
     }
@@ -126,11 +180,9 @@ namespace('kivi', function(k){
     /* note:
      *  event.which does not contain tab events in keypressed in firefox but will report 0
      *  chrome does not fire keypressed at all on tab or escape
-     *  TODO: users expect tab to work on keydown but enter to trigger on keyup,
-     *        should be handled seperately
      */
     $dummy.keydown(function(event){
-      if (event.which == KEY.ENTER || event.which == KEY.TAB) { // enter or tab or tab
+      if (event.which == KEY.ENTER || event.which == KEY.TAB) {
         // if string is empty assume they want to delete
         if ($dummy.val() == '') {
           set_item({});
@@ -138,11 +190,12 @@ 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){
+          success: function (data) {
             if (data.length == 1) {
               set_item(data[0]);
               if (event.which == KEY.ENTER)
@@ -150,12 +203,9 @@ namespace('kivi', function(k){
             } else if (data.length > 1) {
              if (event.which == KEY.ENTER)
                 open_dialog();
-              else
-                make_defined_state();
             } else {
-              if (event.which == KEY.TAB)
-                make_defined_state();
             }
+            annotate_state();
           }
         });
         if (event.which == KEY.ENTER)
@@ -167,7 +217,7 @@ namespace('kivi', function(k){
 
     $dummy.blur(function(){
       window.clearTimeout(timer);
-      timer = window.setTimeout(make_defined_state, 100);
+      timer = window.setTimeout(annotate_state, 100);
     });
 
     // now add a picker div after the original input
@@ -175,7 +225,7 @@ namespace('kivi', function(k){
     var picker = $('<div>');
     $dummy.after(pcont);
     pcont.append(picker);
-    picker.addClass('icon16 CRM--Schnellsuche').click(open_dialog);
+    picker.addClass('icon16 crm--search').click(open_dialog);
 
     var pp = {
       real:           function() { return $real },
@@ -188,14 +238,17 @@ namespace('kivi', function(k){
       result_timer:   result_timer,
       set_item:       set_item,
       reset:          make_defined_state,
+      is_defined_state: function() { return state == STATES.PICKED },
       init_results:    function () {
         $('div.part_picker_part').each(function(){
           $(this).click(function(){
             set_item({
-              name: $(this).children('input.part_picker_description').val(),
               id:   $(this).children('input.part_picker_id').val(),
+              name: $(this).children('input.part_picker_description').val(),
+              unit: $(this).children('input.part_picker_unit').val(),
             });
             close_popup();
+            $dummy.focus();
             return true;
           });
         });