X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fkivi.Part.js;h=eee498e3be57edc6fa25245f4b93311af9074a3d;hb=7e7aae8d20f3faf45073e5b888989a0ee5fce146;hp=d7bbd2ffdcd1411e781255726f73b9878e0c7797;hpb=426a5bf3c8b6a5cd2509699ebace0d24e614f2b7;p=kivitendo-erp.git

diff --git a/js/kivi.Part.js b/js/kivi.Part.js
index d7bbd2ffd..eee498e3b 100644
--- a/js/kivi.Part.js
+++ b/js/kivi.Part.js
@@ -154,7 +154,7 @@ namespace('kivi.Part', function(ns) {
   };
 
   ns.add_assortment_item = function() {
-    if ($('#add_assortment_item_id').val() === '') return;
+    if ($('#assortment_picker').val() === '') return;
 
     $('#row_table_id thead a img').remove();
 
@@ -162,21 +162,42 @@ namespace('kivi.Part', function(ns) {
     data.push({ name: 'action', value: 'Part/add_assortment_item' },
               { name: 'part.id', value: $('#part_id').val()       },
               { name: 'part.part_type', value: 'assortment'       });
+    $('#assortment_picker').data('part_picker').clear();
 
     $.post("controller.pl", data, kivi.eval_json_result);
   };
 
   ns.add_assembly_item = function() {
-    if ($('#add_assembly_item_id').val() === '') return;
+    if ($('#assembly_picker').val() === '') return;
 
     var data = $('#assembly :input').serializeArray();
     data.push({ name: 'action', value: 'Part/add_assembly_item' },
               { name: 'part.id', value: $("#part_id").val()     },
               { name: 'part.part_type', value: 'assortment'     });
+    $('#assembly_picker').data('part_picker').clear();
 
     $.post("controller.pl", data, kivi.eval_json_result);
   };
 
+  ns.set_multi_assembly_items = function(data) {
+    data.push({ name: 'part.id',        value: $('#part_id').val() });
+    data.push({ name: 'part.part_type', value: $('#part_part_type').val() });
+    $.post("controller.pl?action=Part/add_multi_assembly_items", data, kivi.eval_json_result);
+  }
+
+  ns.set_multi_assortment_items = function(data) {
+    data.push({ name: 'part.id', value: $('#part_id').val() });
+    data.push({ name: 'part.part_type', value: $('#part_part_type').val() });
+    $.post("controller.pl?action=Part/add_multi_assortment_items", data, kivi.eval_json_result);
+  }
+
+  ns.close_picker_dialogs = function() {
+    $('.part_autocomplete').each(function(_, e) {
+      var picker = $(e).data('part_picker');
+      if (picker) picker.close_dialog();
+    });
+  }
+
   ns.redisplay_items = function(data) {
     var old_rows;
     var part_type = $("#part_part_type").val();
@@ -205,32 +226,6 @@ namespace('kivi.Part', function(ns) {
     $("#assembly_rows tr:last").find('input[type=text]').filter(':visible:first').focus();
   };
 
-  ns.show_multi_items_dialog = function(part_type,part_id) {
-
-    $('#row_table_id thead a img').remove();
-
-    kivi.popup_dialog({
-      url: 'controller.pl?action=Part/show_multi_items_dialog',
-      data: { callback:         'Part/add_multi_' + part_type + '_items',
-              callback_data_id: 'ic',
-              'part.part_type': part_type,
-              'part.id'       : part_id,
-            },
-      id: 'jq_multi_items_dialog',
-      dialog: {
-        title: kivi.t8('Add multiple items'),
-        width:  800,
-        height: 800
-      }
-    });
-    return true;
-  };
-
-  ns.close_multi_items_dialog = function() {
-    $('#jq_multi_items_dialog').dialog('close');
-  };
-
-
   // makemodel
   ns.makemodel_renumber_positions = function() {
     $('.makemodel_row [name="position"]').each(function(idx, elt) {
@@ -246,7 +241,7 @@ namespace('kivi.Part', function(ns) {
   };
 
   ns.add_makemodel_row = function() {
-    if ($('#add_makemodelid').val() === '') return;
+    if ($('#add_makemodel').val() === '') return;
 
     var data = $('#makemodel_table :input').serializeArray();
     data.push({ name: 'action', value: 'Part/add_makemodel_row' });
@@ -258,7 +253,6 @@ namespace('kivi.Part', function(ns) {
     $("#makemodel_rows tr:last").find('input[type=text]').filter(':visible:first').focus();
   };
 
-
   ns.reload_bin_selection = function() {
     $.post("controller.pl", { action: 'Part/warehouse_changed', warehouse_id: function(){ return $('#part_warehouse_id').val() } },   kivi.eval_json_result);
   }
@@ -280,13 +274,13 @@ namespace('kivi.Part', function(ns) {
 
   ns.Picker = function($real, options) {
     var self = this;
-    this.o = $.extend({
+    this.o = $.extend(true, {
       limit: 20,
       delay: 50,
       action: {
-        on_enter_match_none: function(){ },
-        on_enter_match_one:  function(){ $('#update_button').click(); },
-        on_enter_match_many: function(){ self.open_dialog(); }
+        commit_none: function(){ },
+        commit_one:  function(){ $('#update_button').click(); },
+        commit_many: function(){ self.open_dialog(); }
       }
     }, $real.data('part-picker-data'), options);
     this.$real              = $real;
@@ -297,6 +291,7 @@ namespace('kivi.Part', function(ns) {
     this.state              = this.STATES.PICKED;
     this.last_dummy         = this.$dummy.val();
     this.timer              = undefined;
+    this.dialog             = undefined;
 
     this.init();
   };
@@ -355,6 +350,9 @@ namespace('kivi.Part', function(ns) {
       }
       this.annotate_state();
     },
+    set_multi_items: function(data) {
+      this.run_action(this.o.action.set_multi_items, [ data ]);
+    },
     make_defined_state: function() {
       if (this.state == this.STATES.PICKED) {
         this.annotate_state();
@@ -384,13 +382,13 @@ namespace('kivi.Part', function(ns) {
         success: function (data) {
           if (data.length == 1) {
             self.set_item(data[0]);
-            if (callbacks && callbacks.match_one) callbacks.match_one(data[0]);
+            if (callbacks && callbacks.match_one) self.run_action(callbacks.match_one, [ data[0] ]);
           } else if (data.length > 1) {
             self.state = self.STATES.UNDEFINED;
-            if (callbacks && callbacks.match_many) callbacks.match_many(data);
+            if (callbacks && callbacks.match_many) self.run_action(callbacks.match_many, [ data ]);
           } else {
             self.state = self.STATES.UNDEFINED;
-            if (callbacks && callbacks.match_none) callbacks.match_none();
+            if (callbacks && callbacks.match_none) self.run_action(callbacks.match_none, [ self, self.$dummy.val() ]);
           }
           self.annotate_state();
         }
@@ -416,6 +414,9 @@ namespace('kivi.Part', function(ns) {
           self.set_item({});
           return true;
         } else if (self.state == self.STATES.PICKED) {
+          if (self.o.action.commit_one) {
+            self.run_action(self.o.action.commit_one);
+          }
           return true;
         }
         if (event.which == KEY.TAB) {
@@ -424,8 +425,9 @@ namespace('kivi.Part', function(ns) {
         }
         if (event.which == KEY.ENTER) {
           self.handle_changed_text({
-            match_one:  self.o.action.on_enter_match_one,
-            match_many: self.o.action.on_enter_match_many
+            match_none: self.o.action.commit_none,
+            match_one:  self.o.action.commit_one,
+            match_many: self.o.action.commit_many
           });
           return false;
         }
@@ -439,7 +441,15 @@ namespace('kivi.Part', function(ns) {
       }
     },
     open_dialog: function() {
-      new ns.PickerPopup(this);
+      if (this.o.multiple) {
+        this.dialog = new ns.PickerMultiPopup(this);
+      } else {
+        this.dialog = new ns.PickerPopup(this);
+      }
+    },
+    close_dialog: function() {
+      this.dialog.close_dialog();
+      this.dialog = undefined;
     },
     init: function() {
       var self = this;
@@ -480,6 +490,15 @@ namespace('kivi.Part', function(ns) {
       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);
+    },
+    clear: function() {
+      this.set_item({});
     }
   };
   ns.Picker.prototype.STATES = {
@@ -498,9 +517,7 @@ namespace('kivi.Part', function(ns) {
       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())),
+        data: self.pp.ajax_data(this.pp.$dummy.val()),
         id: 'part_selection',
         dialog: {
           title: kivi.t8('Part picker'),
@@ -523,7 +540,6 @@ namespace('kivi.Part', function(ns) {
       $.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();
@@ -547,14 +563,14 @@ namespace('kivi.Part', function(ns) {
             partnumber:  $(this).children('input.part_picker_partnumber').val(),
             description: $(this).children('input.part_picker_description').val(),
           });
-          self.close_popup();
+          self.close_dialog();
           self.pp.$dummy.focus();
           return true;
         });
       });
       $('#part_selection').keydown(function(e){
          if (e.which == KEY.ESCAPE) {
-           self.close_popup();
+           self.close_dialog();
            self.pp.$dummy.focus();
          }
       });
@@ -578,11 +594,120 @@ namespace('kivi.Part', function(ns) {
         this.timer = window.setTimeout(function() { self.update_results() }, 100);
       }
     },
-    close_popup: function() {
+    close_dialog: function() {
       $('#part_selection').dialog('close');
     }
   };
 
+  ns.PickerMultiPopup = function(pp) {
+    this.pp       = pp;
+    this.callback = 'Part/add_multi_' + this.pp.o.part_type + '_items';
+    this.open_dialog();
+  };
+
+  ns.PickerMultiPopup.prototype = {
+    open_dialog: function() {
+      var self = this;
+      $('#row_table_id thead a img').remove();
+
+      kivi.popup_dialog({
+        url: 'controller.pl?action=Part/show_multi_items_dialog',
+        data: $.extend({
+          real_id: self.pp.real_id,
+        }, self.pp.ajax_data(this.pp.$dummy.val())),
+        id: 'jq_multi_items_dialog',
+        dialog: {
+          title: kivi.t8('Add multiple items'),
+          width:  800,
+          height: 800
+        },
+        load: function() {
+          self.init_search();
+        }
+      });
+      return true;
+    },
+    init_search: function() {
+      var self = this;
+      $('#multi_items_filter_table input, #multi_items_filter_table select').keydown(function(event) {
+        if(event.which == KEY.ENTER) {
+          event.preventDefault();
+          self.update_results();
+          return false;
+        }
+      });
+
+      $('#multi_items_filter_all_substr_multi_ilike').focus();
+      $('#multi_items_filter_button').click(function(){ self.update_results() });
+      $('#multi_items_filter_reset').click(function(){ $("#multi_items_form").resetForm() });
+      $('#continue_button').click(function(){ self.add_multi_items() });
+    },
+    update_results: function() {
+      var self = this;
+      var data = $('#multi_items_form').serializeArray();
+      data.push({ name: 'type', value: self.pp.type });
+      $.ajax({
+        url: 'controller.pl?action=Part/multi_items_update_result',
+        data: data,
+        method: 'post',
+        success: function(data){
+          $('#multi_items_result').html(data);
+          self.init_results();
+          self.enable_continue();
+        }
+      });
+    },
+    set_qty_to_one: function(clicked) {
+      if ($(clicked).val() === '') {
+        $(clicked).val(kivi.format_amount(1.00, -2));
+      }
+      $(clicked).select();
+    },
+    init_results: function() {
+      var self = this;
+      $('#multi_items_all_qty').change(function(event){
+        $('.multi_items_qty').val($(event.target).val());
+      });
+      $('.multi_items_qty').click(function(){ self.set_qty_to_one(this) });
+    },
+    result_timer: function(event) {
+    },
+    close_dialog: function() {
+      $('#jq_multi_items_dialog').dialog('close');
+    },
+    disable_continue: function() {
+      $('#multi_items_result input').off("keydown");
+      $('#continue_button').prop('disabled', true);
+    },
+    enable_continue: function() {
+      var self = this;
+      $('#multi_items_result input').keydown(function(event) {
+        if(event.keyCode == KEY.ENTER) {
+          event.preventDefault();
+          self.add_multi_items();
+          return false;
+        }
+      });
+      $('#continue_button').prop('disabled', false);
+    },
+    add_multi_items: function() {
+      // rows at all
+      var n_rows = $('.multi_items_qty').length;
+      if ( n_rows === 0) { return; }
+
+      // filled rows
+      n_rows = $('.multi_items_qty').filter(function() {
+        return $(this).val().length > 0;
+      }).length;
+      if (n_rows === 0) { return; }
+
+      this.disable_continue();
+
+      var data = $('#multi_items_form').serializeArray();
+      this.pp.set_multi_items(data);
+    }
+  };
+
   ns.reinit_widgets = function() {
     kivi.run_once_for('input.part_autocomplete', 'part_picker', function(elt) {
       if (!$(elt).data('part_picker'))
@@ -595,35 +720,8 @@ namespace('kivi.Part', function(ns) {
   }
 
   $(function(){
-
-    // assortment
-    // TODO: allow units for assortment items
-    $('#add_assortment_item_id').on('set_item:PartPicker', function(e,o) { $('#add_item_unit').val(o.unit) });
-
     $('#ic').on('focusout', '.reformat_number', function(event) {
        ns.reformat_number(event);
-    })
-
-    $('.add_assortment_item_input').keydown(function(event) {
-      if(event.keyCode == 13) {
-        event.preventDefault();
-        if ($("input[name='add_items[+].parts_id']").val() !== '' ) {
-          kivi.Part.show_multi_items_dialog("assortment");
-         // ns.add_assortment_item();
-        }
-        return false;
-      }
-    });
-
-    $('.add_assembly_item_input').keydown(function(event) {
-      if(event.keyCode == 13) {
-        event.preventDefault();
-        if ($("input[name='add_items[+].parts_id']").val() !== '' ) {
-          kivi.Part.show_multi_items_dialog("assortment");
-          // ns.add_assembly_item();
-        }
-        return false;
-      }
     });
 
     $('.add_makemodel_input').keydown(function(event) {