X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/219d88ab03186a74e5dd474175e49bd74dacf15f..8f7fe4a4:/SL/Presenter/Part.pm diff --git a/SL/Presenter/Part.pm b/SL/Presenter/Part.pm index d8491ecb5..26f296c7c 100644 --- a/SL/Presenter/Part.pm +++ b/SL/Presenter/Part.pm @@ -7,7 +7,7 @@ use SL::DB::PartClassification; use SL::Locale::String qw(t8); use Exporter qw(import); -our @EXPORT = qw(part_picker part select_classification classification_abbreviation type_abbreviation separate_abbreviation); +our @EXPORT = qw(part_picker part select_classification classification_abbreviation type_abbreviation separate_abbreviation typeclass_abbreviation); use Carp; @@ -30,19 +30,18 @@ sub part_picker { my ($self, $name, $value, %params) = @_; $value = SL::DB::Manager::Part->find_by(id => $value) if $value && !ref $value; - my $id = delete($params{id}) || $self->name_to_id($name); - my $fat_set_item = delete $params{fat_set_item}; + my $id = $params{id} || $self->name_to_id($name); my @classes = $params{class} ? ($params{class}) : (); push @classes, 'part_autocomplete'; - push @classes, 'partpicker_fat_set_item' if $fat_set_item; my $ret = - $self->input_tag($name, (ref $value && $value->can('id') ? $value->id : ''), class => "@classes", type => 'hidden', id => $id) . - join('', map { $params{$_} ? $self->input_tag("", delete $params{$_}, id => "${id}_${_}", type => 'hidden') : '' } qw(part_type unit convertible_unit)) . + $self->input_tag($name, (ref $value && $value->can('id') ? $value->id : ''), class => "@classes", type => 'hidden', id => $id, + 'data-part-picker-data' => JSON::to_json(\%params), + ) . $self->input_tag("", ref $value ? $value->displayable_name : '', id => "${id}_name", %params); - $::request->layout->add_javascripts('autocomplete_part.js'); + $::request->layout->add_javascripts('kivi.Part.js'); $::request->presenter->need_reinit_widgets($id); $self->html_tag('span', $ret, class => 'part_picker'); @@ -84,6 +83,12 @@ sub classification_abbreviation { $obj && $obj->abbreviation ? t8($obj->abbreviation) : ''; } +sub typeclass_abbreviation { + my ($self, $part) = @_; + return '' if !$part || !$part->isa('SL::DB::Part'); + return $self->type_abbreviation($part->part_type).$self->classification_abbreviation($part->classification_id); +} + # # shortcut for article type # @@ -215,10 +220,47 @@ accepted as default values and can persist during updates. As with other selectors though, they are not selectable once overridden. C will register it's javascript for inclusion in the next header -rendering. If you write a standard controller that only call C once, it -will just work. In case the header is generated in a different render call +rendering. If you write a standard controller that only calls C once, it +will just work. In case the header is generated in a different render call (multiple blocks, ajax, old C style controllers) you need to -include C yourself. +include C yourself. + +On pressing the picker will try to commit the current selection, +resulting in one of the following events, whose corresponding callbacks can be +set in C: + +=over 4 + +=item * C + +If exactly one element matches the input, the internal id will set to this id, +the internal state will be set to C and the C even on the +picker will be fired. Additionally, if C contain C +a special event C will be fired which is guaranteed to +contain a complete JSON representation of the part. + +After that the action C will be executed, which defaults to +clicking a button with id C for backward compatibility reasons. + +=item * C + +If more than one element matches the input, the internal state will be set to +undefined. + +After that the action C will be executed, which defaults to +opening a popup dialog for graphical interaction. If C contain +C an alternative popup will be opened, allowing multiple items to be +selected. Note however that this requires an additional callback +C to work. + +=item * C + +If no element matches the input, the internal state will be set to undefined. + +If an action for C exists, it will be called with the picker +object and current term. The caller can then implement creation of new parts. + +=back =back @@ -263,6 +305,14 @@ Should not require a feedback/check loop in the common case Should not be constrained to exact matches +=item * + +Must be atomic + +=item * + +Action should be overridable + =back The implementation consists of the following parts which will be referenced later: