X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fkivi.Part.js;h=6207569f672a10b77145dd651fb9d8e7a0c2d943;hb=713de5ed35a8a1faea940354254c4e781631c495;hp=cb55949c5fc58e1dbf9363dc3736b03831e46f16;hpb=a45a53329ce910cdf368e31847c9ff58c48f1d88;p=kivitendo-erp.git
diff --git a/js/kivi.Part.js b/js/kivi.Part.js
index cb55949c5..6207569f6 100644
--- a/js/kivi.Part.js
+++ b/js/kivi.Part.js
@@ -7,7 +7,7 @@ namespace('kivi.Part', function(ns) {
url: 'controller.pl?action=Part/history&part.id=' + id,
dialog: { title: kivi.t8('History') },
});
- }
+ };
ns.save = function() {
var data = $('#ic').serializeArray();
@@ -34,7 +34,7 @@ namespace('kivi.Part', function(ns) {
};
ns.set_tab_active_by_index = function (index) {
- $("#ic_tabs").tabs({active: index})
+ $("#ic_tabs").tabs({active: index});
};
ns.set_tab_active_by_name= function (name) {
@@ -66,26 +66,32 @@ namespace('kivi.Part', function(ns) {
$('#' + order_by + '_header_id a').append('
');
- data.push({ name: 'action', value: 'Part/reorder_items' },
- { name: 'order_by', value: order_by },
- { name: 'part_type', value: part_type },
- { name: 'sort_dir', value: dir });
+ data.push(
+ { name: 'action', value: 'Part/reorder_items' },
+ { name: 'order_by', value: order_by },
+ { name: 'part_type', value: part_type },
+ { name: 'sort_dir', value: dir }
+ );
$.post("controller.pl", data, kivi.eval_json_result);
};
ns.assortment_recalc = function() {
var data = $('#assortment :input').serializeArray();
- data.push({ name: 'action', value: 'Part/update_item_totals' },
- { name: 'part_type', value: 'assortment' });
+ data.push(
+ { name: 'action', value: 'Part/update_item_totals' },
+ { name: 'part_type', value: 'assortment' }
+ );
$.post("controller.pl", data, kivi.eval_json_result);
};
ns.assembly_recalc = function() {
var data = $('#assembly :input').serializeArray();
- data.push( { name: 'action', value: 'Part/update_item_totals' },
- { name: 'part_type', value: 'assembly' });
+ data.push(
+ { name: 'action', value: 'Part/update_item_totals' },
+ { name: 'part_type', value: 'assembly' }
+ );
$.post("controller.pl", data, kivi.eval_json_result);
};
@@ -154,29 +160,54 @@ 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();
var data = $('#assortment :input').serializeArray();
- data.push({ name: 'action', value: 'Part/add_assortment_item' },
- { name: 'part.id', value: $('#part_id').val() },
- { name: 'part.part_type', value: 'assortment' });
+ 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' });
+ data.push(
+ { name: 'action', value: 'Part/add_assembly_item' },
+ { name: 'part.id', value: $("#part_id").val() },
+ { name: 'part.part_type', value: 'assembly' }
+ );
+ $('#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.dialog) picker.close_dialog();
+ });
+ };
+
ns.redisplay_items = function(data) {
var old_rows;
var part_type = $("#part_part_type").val();
@@ -205,32 +236,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,10 +251,11 @@ 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' });
+ $('#add_makemodel').data('customer_vendor_picker').clear();
$.post("controller.pl", data, kivi.eval_json_result);
};
@@ -259,9 +265,38 @@ namespace('kivi.Part', function(ns) {
};
+ // customerprice
+ ns.customerprice_renumber_positions = function() {
+ $('.customerprice_row [name="position"]').each(function(idx, elt) {
+ $(elt).html(idx+1);
+ });
+ };
+
+ ns.delete_customerprice_row = function(clicked) {
+ var row = $(clicked).closest('tr');
+ $(row).remove();
+
+ ns.customerprice_renumber_positions();
+ };
+
+ ns.add_customerprice_row = function() {
+ if ($('#add_customerprice').val() === '') return;
+
+ var data = $('#customerprice_table :input').serializeArray();
+ data.push({ name: 'action', value: 'Part/add_customerprice_row' });
+ $('#add_customerprice').data('customer_vendor_picker').clear();
+
+ $.post("controller.pl", data, kivi.eval_json_result);
+ };
+
+ ns.focus_last_customerprice_input = function () {
+ $("#customerprice_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);
- }
+ $.post("controller.pl", { action: 'Part/warehouse_changed', warehouse_id: function(){ return $('#part_warehouse_id').val(); } }, kivi.eval_json_result);
+ };
var KEY = {
TAB: 9,
@@ -280,28 +315,26 @@ namespace('kivi.Part', function(ns) {
ns.Picker = function($real, options) {
var self = this;
- this.o = $.extend({
+ this.o = $.extend(true, {
limit: 20,
delay: 50,
- fat_set_item: $real.hasClass(this.CLASSES.FAT_SET_ITEM),
action: {
- on_enter_match_none: function(){ },
- on_enter_match_one: function(){ $('#update_button').click(); },
- on_enter_match_many: function(){ self.open_dialog(); }
- }
- }, options);
+ 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');
this.last_real = $real.val();
- this.$dummy = $('#' + this.real_id + '_name');
- this.$part_type = $('#' + this.real_id + '_part_type');
- this.$classification_id = $('#' + this.real_id + '_classification_id');
- this.$unit = $('#' + this.real_id + '_unit');
- this.$convertible_unit = $('#' + this.real_id + '_convertible_unit');
+ this.$dummy = $($real.siblings()[0]);
this.autocomplete_open = false;
this.state = this.STATES.PICKED;
this.last_dummy = this.$dummy.val();
this.timer = undefined;
+ this.dialog = undefined;
+ this.multiple_default = this.o.multiple;
this.init();
};
@@ -310,24 +343,38 @@ namespace('kivi.Part', function(ns) {
CLASSES: {
PICKED: 'partpicker-picked',
UNDEFINED: 'partpicker-undefined',
- FAT_SET_ITEM: 'partpicker_fat_set_item',
},
ajax_data: function(term) {
var data = {
- 'filter.all:substr:multi::ilike': term,
- 'filter.obsolete': 0,
- 'filter.unit_obj.convertible_to': this.$convertible_unit && this.$convertible_unit.val() ? this.$convertible_unit.val() : '',
current: this.$real.val(),
};
- if (this.$part_type && this.$part_type.val())
- data['filter.part_type'] = this.$part_type.val().split(',');
+ if (this.o.part_type)
+ data['filter.part_type'] = this.o.part_type.split(',');
+
+ if (this.o.status) {
+ if (this.o.status == 'active') data['filter.obsolete'] = 0;
+ if (this.o.status == 'obsolete') data['filter.obsolete'] = 1;
+ } else
+ data['filter.obsolete'] = 0;
+
+ if (this.o.classification_id)
+ data['filter.classification_id:any'] = this.o.classification_id.replaceAll(',', ' ');
- if (this.$classification_id && this.$classification_id.val())
- data['filter.classification_id'] = this.$classification_id.val().split(',');
+ if (this.o.unit)
+ data['filter.unit'] = this.o.unit.split(',');
- if (this.$unit && this.$unit.val())
- data['filter.unit'] = this.$unit.val().split(',');
+ if (this.o.convertible_unit)
+ data['filter.unit_obj.convertible_to'] = this.o.convertible_unit;
+
+ var filter_name = 'all';
+ if (this.o.with_makemodel) {
+ filter_name = 'all_with_makemodel';
+ }
+ if (this.o.with_customer_partnumber) {
+ filter_name = 'all_with_customer_partnumber';
+ }
+ data['filter.' + filter_name + ':substr:multi::ilike'] = term;
return data;
},
@@ -359,14 +406,17 @@ 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();
- return true
- } else if (this.state == this.STATES.UNDEFINED && this.$dummy.val() === '')
- this.set_item({})
- else {
- this.set_item({ id: this.last_real, name: this.last_dummy })
+ return true;
+ } else if (this.state == this.STATES.UNDEFINED && this.$dummy.val() === '') {
+ this.set_item({});
+ } else {
+ this.set_item({ id: this.last_real, name: this.last_dummy });
}
this.annotate_state();
},
@@ -388,13 +438,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();
}
@@ -420,6 +470,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) {
@@ -427,9 +480,11 @@ namespace('kivi.Part', function(ns) {
self.handle_changed_text();
}
if (event.which == KEY.ENTER) {
+ event.preventDefault();
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;
}
@@ -443,7 +498,16 @@ namespace('kivi.Part', function(ns) {
}
},
open_dialog: function() {
- new ns.PickerPopup(this);
+ if (this.o.multiple) {
+ this.o.multiple = this.multiple_default;
+ 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;
@@ -453,13 +517,16 @@ namespace('kivi.Part', function(ns) {
url: 'controller.pl?action=Part/ajax_autocomplete',
dataType: "json",
data: self.ajax_data(req.term),
- success: function (data){ rsp(data) }
+ success: function (data){ rsp(data); }
}));
},
select: function(event, ui) {
self.set_item(ui.item);
+ if (self.o.action.commit_one) {
+ self.run_action(self.o.action.commit_one);
+ }
},
- search: function(event, ui) {
+ search: function(event) {
if ((event.which == KEY.SHIFT) || (event.which == KEY.CTRL) || (event.which == KEY.ALT))
event.preventDefault();
},
@@ -470,7 +537,7 @@ namespace('kivi.Part', function(ns) {
self.autocomplete_open = false;
}
});
- this.$dummy.keydown(function(event){ self.handle_keydown(event) });
+ this.$dummy.keydown(function(event){ self.handle_keydown(event); });
this.$dummy.on('paste', function(){
setTimeout(function() {
self.handle_changed_text();
@@ -478,12 +545,21 @@ namespace('kivi.Part', function(ns) {
});
this.$dummy.blur(function(){
window.clearTimeout(self.timer);
- self.timer = window.setTimeout(function() { self.annotate_state() }, 100);
+ self.timer = window.setTimeout(function() { self.annotate_state(); }, 100);
});
var popup_button = $('').addClass('ppp_popup_button');
this.$dummy.after(popup_button);
- popup_button.click(function() { self.open_dialog() });
+ 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 = {
@@ -518,8 +594,8 @@ namespace('kivi.Part', function(ns) {
},
init_search: function() {
var self = this;
- $('#part_picker_filter').keypress(function(e) { self.result_timer(e) }).focus();
- $('#no_paginate').change(function() { self.update_results() });
+ $('#part_picker_filter').keypress(function(e) { self.result_timer(e); }).focus();
+ $('#no_paginate').change(function() { self.update_results(); });
this.update_results();
},
update_results: function() {
@@ -527,11 +603,10 @@ 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();
- return val === undefined ? '' : val
+ return val === undefined ? '' : val;
})),
success: function(data){
$('#part_picker_result').html(data);
@@ -547,20 +622,21 @@ namespace('kivi.Part', function(ns) {
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(),
+ ean: $(this).children('input.part_picker_ean').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.close_dialog();
self.pp.$dummy.focus();
return true;
});
});
$('#part_selection').keydown(function(e){
- if (e.which == KEY.ESCAPE) {
- self.close_popup();
- self.pp.$dummy.focus();
- }
+ if (e.which == KEY.ESCAPE) {
+ self.close_dialog();
+ self.pp.$dummy.focus();
+ }
});
},
result_timer: function(event) {
@@ -579,63 +655,152 @@ namespace('kivi.Part', function(ns) {
if (event.which == KEY.ENTER) {
self.update_results();
} else {
- this.timer = window.setTimeout(function() { self.update_results() }, 100);
+ 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,
+ show_pos_input: self.pp.o.multiple_pos_input,
+ }, 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 });
+ 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;
+ });
+ $.each(Object.keys(ppdata), function() {data.push({ name: 'multi_items.' + this, value: ppdata[this]});});
+ $.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() {
+ },
+ close_dialog: function() {
+ $('#jq_multi_items_dialog').dialog('close');
+ },
+ disable_continue: function() {
+ $('#multi_items_result input, #multi_items_position').off("keydown");
+ $('#continue_button').prop('disabled', true);
+ },
+ enable_continue: function() {
+ var self = this;
+ $('#multi_items_result input, #multi_items_position').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'))
$(elt).data('part_picker', new kivi.Part.Picker($(elt)));
});
- }
+
+ kivi.run_once_for('#customerprice_rows', 'customerprice_row_sort_renumber', function(elt) {
+ $(elt).on('sortstop', kivi.Part.customerprice_renumber_positions);
+ });
+
+ kivi.run_once_for('#makemodel_rows', 'makemodel_row_sort_renumber', function(elt) {
+ $(elt).on('sortstop', kivi.Part.makemodel_renumber_positions);
+ });
+ };
ns.init = function() {
ns.reinit_widgets();
- }
+ };
$(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) {
- if(event.keyCode == 13) {
- event.preventDefault();
- ns.add_makemodel_row();
- return false;
- }
+ ns.reformat_number(event);
});
$('#part_warehouse_id').change(kivi.Part.reload_bin_selection);