X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fkivi.Part.js;h=41e94bb9d895bcb0e8801f7cf30c3b304609c7c6;hb=8f19c47cfbccd1f40739aa5cb8ea22b2697c0e5e;hp=de5571cc92aa92a774d452ec02ad761bc2d80694;hpb=cd39824ebc0e001b6b05a1b073ffd22afefbc9d1;p=kivitendo-erp.git

diff --git a/js/kivi.Part.js b/js/kivi.Part.js
index de5571cc9..41e94bb9d 100644
--- a/js/kivi.Part.js
+++ b/js/kivi.Part.js
@@ -263,216 +263,139 @@ namespace('kivi.Part', function(ns) {
     $.post("controller.pl", { action: 'Part/warehouse_changed', warehouse_id: function(){ return $('#part_warehouse_id').val() } },   kivi.eval_json_result);
   }
 
+  var KEY = {
+    TAB:       9,
+    ENTER:     13,
+    SHIFT:     16,
+    CTRL:      17,
+    ALT:       18,
+    ESCAPE:    27,
+    PAGE_UP:   33,
+    PAGE_DOWN: 34,
+    LEFT:      37,
+    UP:        38,
+    RIGHT:     39,
+    DOWN:      40,
+  };
+
   ns.Picker = function($real, options) {
-    // short circuit in case someone double inits us
-    if ($real.data("part_picker"))
-      return $real.data("part_picker");
-
-    var KEY = {
-      ESCAPE: 27,
-      ENTER:  13,
-      TAB:    9,
-      LEFT:   37,
-      RIGHT:  39,
-      DOWN:   40,
-      PAGE_UP: 33,
-      PAGE_DOWN: 34,
-      SHIFT:     16,
-      CTRL:      17,
-      ALT:       18,
-    };
-    var CLASSES = {
-      PICKED:       'partpicker-picked',
-      UNDEFINED:    'partpicker-undefined',
-      FAT_SET_ITEM: 'partpicker_fat_set_item',
-    };
-    var o = $.extend({
+    var self = this;
+    this.o = $.extend({
       limit: 20,
       delay: 50,
-      fat_set_item: $real.hasClass(CLASSES.FAT_SET_ITEM),
       action: {
-        on_enter_match_none:  function(){},
-        on_enter_match_one:   function(){$('#update_button').click();},
-        on_enter_match_many:  function(){open_dialog();}
+        on_enter_match_none: function(){ },
+        on_enter_match_one:  function(){ $('#update_button').click(); },
+        on_enter_match_many: function(){ self.open_dialog(); }
       }
-    }, options);
-    var STATES = {
-      PICKED:    CLASSES.PICKED,
-      UNDEFINED: CLASSES.UNDEFINED
-    }
-    var real_id = $real.attr('id');
-    var $dummy             = $('#' + real_id + '_name');
-    var $part_type         = $('#' + real_id + '_part_type');
-    var $classification_id = $('#' + real_id + '_classification_id');
-    var $unit              = $('#' + real_id + '_unit');
-    var $convertible_unit  = $('#' + real_id + '_convertible_unit');
-    var autocomplete_open  = false;
-    var state   = STATES.PICKED;
-    var last_real = $real.val();
-    var last_dummy = $dummy.val();
-    var timer;
-
-    function open_dialog () {
-      kivi.popup_dialog({
-        url: 'controller.pl?action=Part/part_picker_search',
-        data: $.extend({
-          real_id: real_id,
-        }, ajax_data($dummy.val())),
-        id: 'part_selection',
-        dialog: {
-          title: kivi.t8('Part picker'),
-          width: 800,
-          height: 800,
-        }
-      });
-      window.clearTimeout(timer);
-      return true;
-    }
+    }, $real.data('part-picker-data'), options);
+    this.$real              = $real;
+    this.real_id            = $real.attr('id');
+    this.last_real          = $real.val();
+    this.$dummy             = $($real.siblings()[0]);
+    this.autocomplete_open  = false;
+    this.state              = this.STATES.PICKED;
+    this.last_dummy         = this.$dummy.val();
+    this.timer              = undefined;
+
+    this.init();
+  };
 
-    function ajax_data(term) {
+  ns.Picker.prototype = {
+    CLASSES: {
+      PICKED:       'partpicker-picked',
+      UNDEFINED:    'partpicker-undefined',
+    },
+    ajax_data: function(term) {
       var data = {
         '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,
-        current:  $real.val(),
+        current:  this.$real.val(),
       };
 
-      if ($part_type && $part_type.val())
-        data['filter.part_type'] = $part_type.val().split(',');
+      if (this.o.part_type)
+        data['filter.part_type'] = this.o.part_type.split(',');
 
-      if ($classification_id && $classification_id.val())
-        data['filter.classification_id'] = $classification_id.val().split(',');
+      if (this.o.classification_id)
+        data['filter.classification_id'] = this.o.classification_id.split(',');
 
-      if ($unit && $unit.val())
-        data['filter.unit'] = $unit.val().split(',');
+      if (this.o.unit)
+        data['filter.unit'] = this.o.unit.split(',');
 
-      return data;
-    }
+      if (this.o.convertible_unit)
+        data['filter.unit_obj.convertible_to'] = this.o.convertible_unit;
 
-    function set_item (item) {
+      return data;
+    },
+    set_item: function(item) {
+      var self = this;
       if (item.id) {
-        $real.val(item.id);
+        this.$real.val(item.id);
         // autocomplete ui has name, use the value for ajax items, which contains displayable_name
-        $dummy.val(item.name ? item.name : item.value);
+        this.$dummy.val(item.name ? item.name : item.value);
       } else {
-        $real.val('');
-        $dummy.val('');
+        this.$real.val('');
+        this.$dummy.val('');
       }
-      state = STATES.PICKED;
-      last_real = $real.val();
-      last_dummy = $dummy.val();
-      $real.trigger('change');
+      this.state      = this.STATES.PICKED;
+      this.last_real  = this.$real.val();
+      this.last_dummy = this.$dummy.val();
+      this.$real.trigger('change');
 
-      if (o.fat_set_item && item.id) {
+      if (this.o.fat_set_item && item.id) {
         $.ajax({
           url: 'controller.pl?action=Part/show.json',
           data: { 'part.id': item.id },
           success: function(rsp) {
-            $real.trigger('set_item:PartPicker', rsp);
+            self.$real.trigger('set_item:PartPicker', rsp);
           },
         });
       } else {
-        $real.trigger('set_item:PartPicker', item);
+        this.$real.trigger('set_item:PartPicker', item);
       }
-      annotate_state();
-    }
-
-    function make_defined_state () {
-      if (state == STATES.PICKED) {
-        annotate_state();
+      this.annotate_state();
+    },
+    make_defined_state: function() {
+      if (this.state == this.STATES.PICKED) {
+        this.annotate_state();
         return true
-      } else if (state == STATES.UNDEFINED && $dummy.val() === '')
-        set_item({})
+      } else if (this.state == this.STATES.UNDEFINED && this.$dummy.val() === '')
+        this.set_item({})
       else {
-        set_item({ id: last_real, name: last_dummy })
+        this.set_item({ id: this.last_real, name: this.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);
+      this.annotate_state();
+    },
+    annotate_state: function() {
+      if (this.state == this.STATES.PICKED)
+        this.$dummy.removeClass(this.STATES.UNDEFINED).addClass(this.STATES.PICKED);
+      else if (this.state == this.STATES.UNDEFINED && this.$dummy.val() === '')
+        this.$dummy.removeClass(this.STATES.UNDEFINED).addClass(this.STATES.PICKED);
       else {
-        $dummy.addClass(STATES.UNDEFINED).removeClass(STATES.PICKED);
+        this.$dummy.addClass(this.STATES.UNDEFINED).removeClass(this.STATES.PICKED);
       }
-    }
-
-    function update_results () {
-      $.ajax({
-        url: 'controller.pl?action=Part/part_picker_result',
-        data: $.extend({
-            'real_id': $real.val(),
-        }, ajax_data(function(){ var val = $('#part_picker_filter').val(); return val === undefined ? '' : val })),
-        success: function(data){ $('#part_picker_result').html(data) }
-      });
-    }
-
-    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);
-    }
-
-    function close_popup() {
-      $('#part_selection').dialog('close');
-    }
-
-    function handle_changed_text(callbacks) {
+    },
+    handle_changed_text: function(callbacks) {
+      var self = this;
       $.ajax({
         url: 'controller.pl?action=Part/ajax_autocomplete',
         dataType: "json",
-        data: $.extend( ajax_data($dummy.val()), { prefer_exact: 1 } ),
+        data: $.extend( self.ajax_data(self.$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]);
+            self.set_item(data[0]);
+            if (callbacks && callbacks.match_one) self.run_action(callbacks.match_one, [ data[0] ]);
           } else if (data.length > 1) {
-            state = STATES.UNDEFINED;
-            if (callbacks && callbacks.match_many) callbacks.match_many(data);
+            self.state = self.STATES.UNDEFINED;
+            if (callbacks && callbacks.match_many) self.run_action(callbacks.match_many, [ data ]);
           } else {
-            state = STATES.UNDEFINED;
-            if (callbacks &&callbacks.match_none) callbacks.match_none();
+            self.state = self.STATES.UNDEFINED;
+            if (callbacks && callbacks.match_none) self.run_action(callbacks.match_none);
           }
-          annotate_state();
+          self.annotate_state();
         }
       });
-    }
-
-    $dummy.autocomplete({
-      source: function(req, rsp) {
-        $.ajax($.extend(o, {
-          url:      'controller.pl?action=Part/ajax_autocomplete',
-          dataType: "json",
-          data:     ajax_data(req.term),
-          success:  function (data){ rsp(data) }
-        }));
-      },
-      select: function(event, ui) {
-        set_item(ui.item);
-      },
-      search: function(event, ui) {
-        if ((event.which == KEY.SHIFT) || (event.which == KEY.CTRL) || (event.which == KEY.ALT))
-          event.preventDefault();
-      },
-      open: function() {
-        autocomplete_open = true;
-      },
-      close: function() {
-        autocomplete_open = false;
-      }
-    });
+    },
     /*  In case users are impatient and want to skip ahead:
      *  Capture <enter> key events and check if it's a unique hit.
      *  If it is, go ahead and assume it was selected. If it wasn't don't do
@@ -485,98 +408,198 @@ namespace('kivi.Part', function(ns) {
      *  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
      */
-    $dummy.keydown(function(event){
+    handle_keydown: function(event) {
+      var self = this;
       if (event.which == KEY.ENTER || event.which == KEY.TAB) {
         // if string is empty assume they want to delete
-        if ($dummy.val() === '') {
-          set_item({});
+        if (self.$dummy.val() === '') {
+          self.set_item({});
           return true;
-        } else if (state == STATES.PICKED) {
+        } else if (self.state == self.STATES.PICKED) {
           return true;
         }
         if (event.which == KEY.TAB) {
           event.preventDefault();
-          handle_changed_text();
+          self.handle_changed_text();
         }
         if (event.which == KEY.ENTER) {
-          handle_changed_text({
-            match_one:  o.action.on_enter_match_one,
-            match_many: o.action.on_enter_match_many
+          self.handle_changed_text({
+            match_one:  self.o.action.on_enter_match_one,
+            match_many: self.o.action.on_enter_match_many
           });
           return false;
         }
-      } else if (event.which == KEY.DOWN && !autocomplete_open) {
-        var old_options = $dummy.autocomplete('option');
-        $dummy.autocomplete('option', 'minLength', 0);
-        $dummy.autocomplete('search', $dummy.val());
-        $dummy.autocomplete('option', 'minLength', old_options.minLength);
+      } else if (event.which == KEY.DOWN && !self.autocomplete_open) {
+        var old_options = self.$dummy.autocomplete('option');
+        self.$dummy.autocomplete('option', 'minLength', 0);
+        self.$dummy.autocomplete('search', self.$dummy.val());
+        self.$dummy.autocomplete('option', 'minLength', old_options.minLength);
       } else if ((event.which != KEY.SHIFT) && (event.which != KEY.CTRL) && (event.which != KEY.ALT)) {
-        state = STATES.UNDEFINED;
+        self.state = self.STATES.UNDEFINED;
       }
-    });
+    },
+    open_dialog: function() {
+      new ns.PickerPopup(this);
+    },
+    init: function() {
+      var self = this;
+      this.$dummy.autocomplete({
+        source: function(req, rsp) {
+          $.ajax($.extend(self.o, {
+            url:      'controller.pl?action=Part/ajax_autocomplete',
+            dataType: "json",
+            data:     self.ajax_data(req.term),
+            success:  function (data){ rsp(data) }
+          }));
+        },
+        select: function(event, ui) {
+          self.set_item(ui.item);
+        },
+        search: function(event, ui) {
+          if ((event.which == KEY.SHIFT) || (event.which == KEY.CTRL) || (event.which == KEY.ALT))
+            event.preventDefault();
+        },
+        open: function() {
+          self.autocomplete_open = true;
+        },
+        close: function() {
+          self.autocomplete_open = false;
+        }
+      });
+      this.$dummy.keydown(function(event){ self.handle_keydown(event) });
+      this.$dummy.on('paste', function(){
+        setTimeout(function() {
+          self.handle_changed_text();
+        }, 1);
+      });
+      this.$dummy.blur(function(){
+        window.clearTimeout(self.timer);
+        self.timer = window.setTimeout(function() { self.annotate_state() }, 100);
+      });
 
-    $dummy.on('paste', function(){
-      setTimeout(function() {
-        handle_changed_text();
-      }, 1);
-    });
+      var popup_button = $('<span>').addClass('ppp_popup_button');
+      this.$dummy.after(popup_button);
+      popup_button.click(function() { self.open_dialog() });
+    },
+    run_action: function(code, args) {
+      if (typeof code === 'function')
+        code.apply(this, args)
+      else
+        kivi.run(code, args);
+    }
+  };
+  ns.Picker.prototype.STATES = {
+    PICKED:    ns.Picker.prototype.CLASSES.PICKED,
+    UNDEFINED: ns.Picker.prototype.CLASSES.UNDEFINED
+  };
 
-    $dummy.blur(function(){
-      window.clearTimeout(timer);
-      timer = window.setTimeout(annotate_state, 100);
-    });
+  ns.PickerPopup = function(pp) {
+    this.timer = undefined;
+    this.pp    = pp;
+    this.open_dialog();
+  };
 
-    // now add a picker div after the original input
-    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 },
-      part_type:         function() { return $part_type },
-      classification_id: function() { return $classification_id },
-      unit:              function() { return $unit },
-      convertible_unit:  function() { return $convertible_unit },
-      update_results: update_results,
-      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({
-              id:   $(this).children('input.part_picker_id').val(),
-              name: $(this).children('input.part_picker_description').val(),
-              classification_id: $(this).children('input.part_picker_classification_id').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();
-            return true;
+  ns.PickerPopup.prototype = {
+    open_dialog: function() {
+      var self = this;
+      kivi.popup_dialog({
+        url: 'controller.pl?action=Part/part_picker_search',
+        data: $.extend({
+          real_id: self.pp.real_id,
+        }, self.pp.ajax_data(this.pp.$dummy.val())),
+        id: 'part_selection',
+        dialog: {
+          title: kivi.t8('Part picker'),
+          width: 800,
+          height: 800,
+        },
+        load: function() { self.init_search(); }
+      });
+      window.clearTimeout(this.timer);
+      return true;
+    },
+    init_search: function() {
+      var self = this;
+      $('#part_picker_filter').keypress(function(e) { self.result_timer(e) }).focus();
+      $('#no_paginate').change(function() { self.update_results() });
+      this.update_results();
+    },
+    update_results: function() {
+      var self = this;
+      $.ajax({
+        url: 'controller.pl?action=Part/part_picker_result',
+        data: $.extend({
+         'real_id':    self.pp.$real.val(),
+          no_paginate: $('#no_paginate').prop('checked') ? 1 : 0,
+        }, self.pp.ajax_data(function(){
+          var val = $('#part_picker_filter').val();
+          return val === undefined ? '' : val
+        })),
+        success: function(data){
+          $('#part_picker_result').html(data);
+          self.init_results();
+        }
+      });
+    },
+    init_results: function() {
+      var self = this;
+      $('div.part_picker_part').each(function(){
+        $(this).click(function(){
+          self.pp.set_item({
+            id:   $(this).children('input.part_picker_id').val(),
+            name: $(this).children('input.part_picker_description').val(),
+            classification_id: $(this).children('input.part_picker_classification_id').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(),
           });
+          self.close_popup();
+          self.pp.$dummy.focus();
+          return true;
         });
-        $('#part_selection').keydown(function(e){
-           if (e.which == KEY.ESCAPE) {
-             close_popup();
-             $dummy.focus();
-           }
-        });
+      });
+      $('#part_selection').keydown(function(e){
+         if (e.which == KEY.ESCAPE) {
+           self.close_popup();
+           self.pp.$dummy.focus();
+         }
+      });
+    },
+    result_timer: function(event) {
+      var self = this;
+      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(this.timer);
+      if (event.which == KEY.ENTER) {
+        self.update_results();
+      } else {
+        this.timer = window.setTimeout(function() { self.update_results() }, 100);
       }
+    },
+    close_popup: function() {
+      $('#part_selection').dialog('close');
     }
-    $real.data('part_picker', pp);
-    return pp;
   };
 
   ns.reinit_widgets = function() {
     kivi.run_once_for('input.part_autocomplete', 'part_picker', function(elt) {
-      kivi.Part.Picker($(elt));
+      if (!$(elt).data('part_picker'))
+        $(elt).data('part_picker', new kivi.Part.Picker($(elt)));
     });
   }
 
+  ns.init = function() {
+    ns.reinit_widgets();
+  }
+
   $(function(){
 
     // assortment
@@ -619,6 +642,6 @@ namespace('kivi.Part', function(ns) {
 
     $('#part_warehouse_id').change(kivi.Part.reload_bin_selection);
 
-    ns.reinit_widgets();
+    ns.init();
   });
 });