Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 35044: Preparation:

Browse source 
get_additional_field_values_for_template method

New method to be utilized for retrieval of additional fields of any
class that implements it.
This is to be used when additional_fields are needed to be sent to .tt
files for renderering. Both for form entries and read-only 'show' pages.

Template files:

Updated additional-fields-entry.inc:
Now considers entry of repeatable fields.
Repeatable text fields will have a "+New" link to allow for adding of a
new instance of a repeatable field.
Repeatable AV fields will be shown as checkboxes instead of a dropdown

Update additional-fields-display.inc
When displaying non-editable additional-fields, multiple instances for
each field are now considered.
Label now only shows if field has a non-null value in it.
Option to show value_only
Option to set if its to be displayed on a table cell

Update histsearch.tt and filter-orders.inc
Now calls additional-fields-entry.inc with search_form=1 to prevent
repetable "+New" controls from showing on search inputs.

additional-fields-entry.js
New JS asset to be called by template files who require
additional-fields-entry.inc for repeatable fields controls.
This also handles the need for having the marcfield of type
'get' submitted if it is a disabled dropdown (AV marc field)

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
Pedro Amorim 2023-10-13 09:58:17 +00:00 committed by Katrin Fischer
parent e4ce13c945
commit 410654387e
Signed by: kfischer
GPG key ID: 0EF6E2C03357A834
6 changed files with 192 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
Koha/Object/Mixin/AdditionalFields.pm
View file

@ -91,6 +91,49 @@ sub set_additional_fields {
}
}
=head3 get_additional_field_values_for_template
Returns additional field values in the format expected by the .tt file
my $fields = Koha::Acquisition::Baskets->find($basketno)->get_additional_field_values_for_template;
Expected format is a hash of arrays, where the hash key is the field id and its respective array contains
the field values 'value' for that field. Example where field_id = 2 is the only repeatable field:
{
'3' => ['first value for field 3'],
'1' => ['first value for field 1'],
'4' => ['first value for field 4'],
'2' => [
'first value for field 2',
'second value for field 2',
'third value for field 2'
]
};
=cut
sub get_additional_field_values_for_template {
my ($self) = @_;
my $additional_field_ids = $self->additional_field_values->search(
{},
{
columns => ['field_id'],
distinct => 1,
}
);
my %fields;
while ( my $additional_field_value = $additional_field_ids->next ) {
my @values = map ( $_->value,
$self->additional_field_values->search( { field_id => $additional_field_value->field_id } )->as_list );
$fields{ $additional_field_value->field_id } = \@values;
}
return \%fields;
}
=head3 additional_field_values
Returns additional field values

28
koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-display.inc
View file

@ -1,11 +1,25 @@
[% USE AuthorisedValues %]
[% FOR field IN available %]
<li>
<span class="label"> [% field.name | html %]: </span>
[% IF field.authorised_value_category %]
[% AuthorisedValues.GetByCode( field.authorised_value_category, values.${field.name} ) | html %]
[% ELSE %]
[% values.${field.name} | html %]
[% IF is_table_cell %]
<td>
[% END %]
[% SET values_list = [] %]
[% FOR value IN values.${field.id} %]
[% IF field.authorised_value_category %]
[% values_list.push(AuthorisedValues.GetByCode( field.authorised_value_category, value )) %]
[% ELSE %]
[% values_list.push(value) %]
[% END %]
[% END %]
[% IF value_only %]
[% values_list.join(', ') | html %]
[% ELSIF !values_list.empty %]
<li>
<span class="label"> [% field.name | html %]: </span>
[% values_list.join(', ') | html %]
</li>
[% END %]
[% IF is_table_cell %]
</td>
[% END %]
</li>
[% END %]

139
koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc
View file

@ -3,67 +3,124 @@
[% USE ClassSources %]
[% USE ItemTypes %]
[% IF wrap_fieldset != 0 %]
<fieldset class="rows">
<fieldset class="rows" id="additional_fields_form_section">
<legend>Additional fields</legend>
<ol>
[% END %]
[% FOR field IN available %]
[% authorised_value_category = field.effective_authorised_value_category %]
<li>
[% IF authorised_value_category %]
<li>
<label for="additional_field_[% field.id | html %]"> [% field.name | html %]: </label>
[% IF authorised_value_category %]
[% IF field.marcfield && field.marcfield_mode == 'get' %]
<select name="additional_field_[% field.id | html %]" id="additional_field_[% field.id | html %]" disabled>
[% ELSE %]
[% IF field.marcfield && field.marcfield_mode == 'get' %]
<select name="additional_field_[% field.id | html %]" id="additional_field_[% field.id | html %]" class="marcfieldget" disabled>
[% ELSE %]
[% IF !field.repeatable %]
<select name="additional_field_[% field.id | html %]" id="additional_field_[% field.id | html %]">
[% END %]
[% END %]
[% IF !field.repeatable %]
<option value=""></option>
[% IF authorised_value_category == 'branches' %]
[% FOREACH branch IN Branches.all() %]
[% IF branch.branchcode == values.${field.id} %]
<option value="[% branch.branchcode | html %]" selected="selected">[% branch.branchname | html %]</option>
[% ELSE %]
<option value="[% branch.branchcode | html %]">[% branch.branchname | html %]</option>
[% END %]
[% END %]
[% IF authorised_value_category == 'branches' %]
[% FOREACH branch IN Branches.all() %]
[% IF branch.branchcode == values.${field.id}.0 %]
<option value="[% branch.branchcode | html %]" selected="selected">[% branch.branchname | html %]</option>
[% ELSE %]
<option value="[% branch.branchcode | html %]">[% branch.branchname | html %]</option>
[% END %]
[% ELSIF authorised_value_category == 'cn_source' %]
[% FOREACH class_source IN ClassSources.all({ selected => values.${field.id} }) %]
[% IF class_source.cn_source == values.${field.id} %]
<option value="[% class_source.cn_source | html %]" selected="selected">[% class_source.description | html %]</option>
[% ELSE %]
<option value="[% class_source.cn_source | html %]">[% class_source.description | html %]</option>
[% END %]
[% END %]
[% ELSIF authorised_value_category == 'cn_source' %]
[% FOREACH class_source IN ClassSources.all({ selected => values.${field.id} }) %]
[% IF class_source.cn_source == values.${field.id}.0 %]
<option value="[% class_source.cn_source | html %]" selected="selected">[% class_source.description | html %]</option>
[% ELSE %]
<option value="[% class_source.cn_source | html %]">[% class_source.description | html %]</option>
[% END %]
[% ELSIF authorised_value_category == 'itemtypes' %]
[% FOREACH itemtype IN ItemTypes.Get() %]
[% IF itemtype.itemtype == values.${field.id} %]
<option value="[% itemtype.itemtype | html %]" selected="selected">[% itemtype.description | html %]</option>
[% ELSE %]
<option value="[% itemtype.itemtype | html %]">[% itemtype.description | html %]</option>
[% END %]
[% END %]
[% ELSIF authorised_value_category == 'itemtypes' %]
[% FOREACH itemtype IN ItemTypes.Get() %]
[% IF itemtype.itemtype == values.${field.id}.0 %]
<option value="[% itemtype.itemtype | html %]" selected="selected">[% itemtype.description | html %]</option>
[% ELSE %]
<option value="[% itemtype.itemtype | html %]">[% itemtype.description | html %]</option>
[% END %]
[% ELSE %]
[% FOREACH av IN AuthorisedValues.GetAuthValueDropbox( authorised_value_category ) %]
[% IF av.authorised_value == values.${field.id} %]
[% END %]
[% ELSE %]
[% FOREACH av IN AuthorisedValues.GetAuthValueDropbox( authorised_value_category ) %]
[% IF !field.repeatable %]
[% IF av.authorised_value == values.${field.id}.0 %]
<option value="[% av.authorised_value | html %]" selected="selected">[% av.lib | html %]</option>
[% ELSE %]
<option value="[% av.authorised_value | html %]">[% av.lib | html %]</option>
[% END %]
[% ELSE %]
[% SET av_field_value_rendered = 0 %]
[% FOR value IN values.${field.id} %]
[% IF av.authorised_value == value %]
<label class="radio">
<input type="checkbox" id="additional_field_[% field.id | html %]" checked name="additional_field_[% field.id | html %]" value="[% av.authorised_value | html %]">[% av.lib | html %]
</label>
[% SET av_field_value_rendered = 1 %]
[% END %]
[% END %]
[% IF !av_field_value_rendered %]
<label class="radio">
<input type="checkbox" id="additional_field_[% field.id | html %]" name="additional_field_[% field.id | html %]" value="[% av.authorised_value | html %]">[% av.lib | html %]
</label>
[% END %]
[% END %]
[% END %]
</select> <span>(Authorised values for [% authorised_value_category | html %])</span>
[% ELSIF field.marcfield && field.marcfield_mode == 'get' %]
<input type="text" value="[% values.${field.id} | html %]" id="additional_field_[% field.id | html %]" name="additional_field_[% field.id | html %]" readonly="readonly" />
[% ELSE %]
<input type="text" value="[% values.${field.id} | html %]" id="additional_field_[% field.id | html %]" name="additional_field_[% field.id | html %]" />
[% END %]
[% IF field.marcfield && field.marcfield_mode == 'get' %]
This value will be filled with the [% field.marcfield | html %] subfield of the selected bibliographic record.
[% ELSIF field.marcfield && field.marcfield_mode == 'set' %]
This value will be saved to the [% field.marcfield | html %] subfield of the selected bibliographic record.
[% END %]
</select>
[% IF !search_form %]
<span>(Authorised values for [% authorised_value_category | html %])</span>
[% IF field.marcfield && field.marcfield_mode == 'get' %]
This value will be filled with the [% field.marcfield | html %] subfield of the selected bibliographic record.
[% ELSIF field.marcfield && field.marcfield_mode == 'set' %]
This value will be saved to the [% field.marcfield | html %] subfield of the selected bibliographic record.
[% END %]
[% END %]
</li>
[% ELSIF field.marcfield && field.marcfield_mode == 'get' %]
<li>
<label for="additional_field_[% field.id | html %]"> [% field.name | html %]: </label>
<input type="text" value="[% values.${field.id}.0 | html %]" id="additional_field_[% field.id | html %]" name="additional_field_[% field.id | html %]" readonly="readonly" />
[% IF !search_form %]
This value will be filled with the [% field.marcfield | html %] subfield of the selected bibliographic record.
[% END %]
</li>
[% ELSE %]
[% SET text_field_value_rendered = 0 %]
[% FOR value IN values.${field.id} %]
<li>
<label for="additional_field_[% field.id | html %]"> [% field.name | html %]: </label>
<input type="text" value="[% value | html %]" id="additional_field_[% field.id | html %]" name="additional_field_[% field.id | html %]" />
[% UNLESS search_form == 1 %]
<a href="#" class="clear_attribute"><i class="fa fa-fw fa-trash-can"></i> Clear</a>
[% END %]
[% IF field.repeatable && !search_form %]
<a href="#" class="clone_attribute"><i class="fa fa-fw fa-plus"></i> New</a>
[% END %]
[% SET text_field_value_rendered = 1 %]
[% END %]
[% IF !text_field_value_rendered %]
<li>
<label for="additional_field_[% field.id | html %]"> [% field.name | html %]: </label>
<input type="text" id="additional_field_[% field.id | html %]" name="additional_field_[% field.id | html %]" />
[% UNLESS search_form == 1 %]
<a href="#" class="clear_attribute"><i class="fa fa-fw fa-trash-can"></i> Clear</a>
[% END %]
[% IF field.repeatable && !search_form %]
<a href="#" class="clone_attribute"><i class="fa fa-fw fa-plus"></i> New</a>
[% END %]
[% END %]
[% IF field.marcfield && field.marcfield_mode == 'set' && !search_form %]
This value will be saved to the [% field.marcfield | html %] subfield of the selected bibliographic record.
[% END %]
</li>
[% END %]
[% END %]
[% IF wrap_fieldset != 0 %]
</ol>

2
koha-tmpl/intranet-tmpl/prog/en/includes/filter-orders.inc
View file

@ -31,7 +31,7 @@
<label for="basketgroupname">Basket group:</label>
<input type="text" name="basketgroupname" id="basketgroupname" value="[% filters.basketgroupname | html %]" />
</li>
[% INCLUDE 'additional-fields-entry.inc' available=available_additional_fields values=additional_field_filters wrap_fieldset=0 %]
[% INCLUDE 'additional-fields-entry.inc' available=available_additional_fields values=additional_field_filters wrap_fieldset=0 search_form=1 %]
<li>
<label for="ordernumber">Order line:</label>
<input type="text" name="ordernumber" id="ordernumber" value="[% filters.ordernumber | html %]" />

2
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
View file

@ -210,7 +210,7 @@
<fieldset class="rows">
<legend>Search orders</legend>
[% END %]
[% INCLUDE 'filter-orders.inc' %]
[% INCLUDE 'filter-orders.inc' search_form=1 %]
<input type="hidden" name="do_search" value="1" />
</fieldset>
<fieldset class="action">

28
koha-tmpl/intranet-tmpl/prog/js/additional-fields-entry.js Normal file
View file

@ -0,0 +1,28 @@
$(document).ready(function() {
$("#additional_fields_form_section").on("click", ".clone_attribute", function(e){
e.preventDefault();
clone_entry( this );
});
$("#additional_fields_form_section").on("click", ".clear_attribute", function(e){
e.preventDefault();
clear_entry( this );
});
$('#additional_fields_form_section').parents('form ').submit(function() {
$('.marcfieldget').prop("disabled", false);
return true;
});
});
function clone_entry(node) {
var original = $(node).parent();
var clone = $(node).parent().clone();
$(original).after(clone);
return false;
}
function clear_entry(node) {
var original = $(node).parent();
$("input", original).val('');
}