WebshopApi: template und js überarbeitet

[mfinanz.git] / js / kivi.Part.js

diff --git a/js/kivi.Part.js b/js/kivi.Part.js
index 4f813bbf4713183b1267db65283b22970576eee7..b83fb044d711870d75a10615fa4680d6536c19f2 100644 (file)
--- a/js/kivi.Part.js
+++ b/js/kivi.Part.js
@@ -312,7 +312,8 @@ namespace('kivi.Part', function(ns) {
         commit_none: function(){ },
         commit_one:  function(){ $('#update_button').click(); },
         commit_many: function(){ self.open_dialog(); }
         commit_none: function(){ },
         commit_one:  function(){ $('#update_button').click(); },
         commit_many: function(){ self.open_dialog(); }

-      }
+      },
+      multiple_limit: 100

     }, $real.data('part-picker-data'), options);
     this.$real              = $real;
     this.real_id            = $real.attr('id');
     }, $real.data('part-picker-data'), options);
     this.$real              = $real;
     this.real_id            = $real.attr('id');


@@ -323,6 +324,7 @@ namespace('kivi.Part', function(ns) {
     this.last_dummy         = this.$dummy.val();
     this.timer              = undefined;
     this.dialog             = undefined;
     this.last_dummy         = this.$dummy.val();
     this.timer              = undefined;
     this.dialog             = undefined;

+    this.multiple_default   = this.o.multiple;

 
     this.init();
   };
 
     this.init();
   };


@@ -347,7 +349,7 @@ namespace('kivi.Part', function(ns) {
         data['filter.obsolete'] = 0;
 
       if (this.o.classification_id)
         data['filter.obsolete'] = 0;
 
       if (this.o.classification_id)

-        data['filter.classification_id'] = this.o.classification_id.split(',');
+        data['filter.classification_id:any'] = this.o.classification_id.replaceAll(',', ' ');

 
       if (this.o.unit)
         data['filter.unit'] = this.o.unit.split(',');
 
       if (this.o.unit)
         data['filter.unit'] = this.o.unit.split(',');


@@ -487,6 +489,7 @@ namespace('kivi.Part', function(ns) {
     },
     open_dialog: function() {
       if (this.o.multiple) {
     },
     open_dialog: function() {
       if (this.o.multiple) {

+        this.o.multiple = this.multiple_default;

         this.dialog = new ns.PickerMultiPopup(this);
       } else {
         this.dialog = new ns.PickerPopup(this);
         this.dialog = new ns.PickerMultiPopup(this);
       } else {
         this.dialog = new ns.PickerPopup(this);


@@ -565,7 +568,9 @@ namespace('kivi.Part', function(ns) {
       var self = this;
       kivi.popup_dialog({
         url: 'controller.pl?action=Part/part_picker_search',
       var self = this;
       kivi.popup_dialog({
         url: 'controller.pl?action=Part/part_picker_search',

-        data: self.pp.ajax_data(this.pp.$dummy.val()),
+        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'),
         id: 'part_selection',
         dialog: {
           title: kivi.t8('Part picker'),


@@ -663,6 +668,7 @@ namespace('kivi.Part', function(ns) {
         url: 'controller.pl?action=Part/show_multi_items_dialog',
         data: $.extend({
           real_id: self.pp.real_id,
         url: 'controller.pl?action=Part/show_multi_items_dialog',
         data: $.extend({
           real_id: self.pp.real_id,

+          show_pos_input: self.pp.o.multiple_pos_input,

         }, self.pp.ajax_data(this.pp.$dummy.val())),
         id: 'jq_multi_items_dialog',
         dialog: {
         }, self.pp.ajax_data(this.pp.$dummy.val())),
         id: 'jq_multi_items_dialog',
         dialog: {


@@ -694,7 +700,8 @@ namespace('kivi.Part', function(ns) {
     update_results: function() {
       var self = this;
       var data = $('#multi_items_form').serializeArray();
     update_results: function() {
       var self = this;
       var data = $('#multi_items_form').serializeArray();

-      data.push({ name: 'type', value: self.pp.type });
+      data.push({ name: 'type',  value: self.pp.type });
+      data.push({ name: 'limit', value: self.pp.o.multiple_limit });

       var ppdata = self.pp.ajax_data(function(){
         var val = $('#multi_items_filter').val();
         return val === undefined ? '' : val
       var ppdata = self.pp.ajax_data(function(){
         var val = $('#multi_items_filter').val();
         return val === undefined ? '' : val


@@ -730,12 +737,12 @@ namespace('kivi.Part', function(ns) {
       $('#jq_multi_items_dialog').dialog('close');
     },
     disable_continue: function() {
       $('#jq_multi_items_dialog').dialog('close');
     },
     disable_continue: function() {

-      $('#multi_items_result input').off("keydown");
+      $('#multi_items_result input, #multi_items_position').off("keydown");

       $('#continue_button').prop('disabled', true);
     },
     enable_continue: function() {
       var self = this;
       $('#continue_button').prop('disabled', true);
     },
     enable_continue: function() {
       var self = this;

-      $('#multi_items_result input').keydown(function(event) {
+      $('#multi_items_result input, #multi_items_position').keydown(function(event) {

         if(event.keyCode == KEY.ENTER) {
           event.preventDefault();
           self.add_multi_items();
         if(event.keyCode == KEY.ENTER) {
           event.preventDefault();
           self.add_multi_items();