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

Bug 10938: Item columns displayed in random order - OPAC

Browse source 
Same as before for the OPAC.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Good result, no errors

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
This commit is contained in:
Jonathan Druart 2015-04-21 16:24:15 +02:00 committed by Tomas Cohen Arazi
parent 5b554d1a86
commit 5a02cf9b48
2 changed files with 29 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt
View file

@ -136,15 +136,15 @@
<table id="items" class="table table-bordered table-condensed table-striped"> <table id="items" class="table table-bordered table-condensed table-striped">
<caption>Holdings</caption> <caption>Holdings</caption>
<tr> <tr>
[% FOREACH item_header_loo IN item_header_loop %] [% FOREACH header IN item_header_loop %]
<th> <th>[% header %]</th>
[% item_header_loo.header_value %]
</th>
[% END %] [% END %]
</tr> </tr>
[% FOREACH item_loo IN item_loop %] [% FOREACH item IN item_loop %]
<tr> <tr>
[% item_loo.item_value %] [% FOREACH sf_code IN item_subfield_codes %]
<td>[% item.$sf_code %]</td>
[% END %]
</tr> </tr>
[% END %] [% END %]
</table> </table>

62
opac/opac-MARCdetail.pl
View file

@ -56,7 +56,7 @@ use C4::Reserves;
use C4::Members; use C4::Members;
use C4::Acquisition; use C4::Acquisition;
use C4::Koha; use C4::Koha;
use List::MoreUtils qw/any/; use List::MoreUtils qw( any uniq );
my $query = new CGI; my $query = new CGI;
@ -253,67 +253,50 @@ for ( my $tabloop = 0 ; $tabloop <= 9 ; $tabloop++ ) {
my @fields = $record->fields(); my @fields = $record->fields();
my %witness my %witness
; #---- stores the list of subfields used at least once, with the "meaning" of the code ; #---- stores the list of subfields used at least once, with the "meaning" of the code
my @big_array; my @item_subfield_codes;
my @item_loop;
foreach my $field (@fields) { foreach my $field (@fields) {
next if ( $field->tag() < 10 ); next if ( $field->tag() < 10 );
next if ( ( $field->tag() eq $tag_itemnumber ) && next if ( ( $field->tag() eq $tag_itemnumber ) &&
( any { $field->subfield($subtag_itemnumber) eq $_ } ( any { $field->subfield($subtag_itemnumber) eq $_ }
@items2hide) ); @items2hide) );
my @subf = $field->subfields; my @subf = $field->subfields;
my %this_row; my $item;
# loop through each subfield # loop through each subfield
for my $i ( 0 .. $#subf ) { for my $i ( 0 .. $#subf ) {
my $sf_def = $tagslib->{ $field->tag() }->{ $subf[$i][0] }; my $sf_def = $tagslib->{ $field->tag() }->{ $subf[$i][0] };
next if ( ($sf_def->{tab}||0) != 10 ); next if ( ($sf_def->{tab}||0) != 10 );
next if ( ($sf_def->{hidden}||0) > 0 ); next if ( ($sf_def->{hidden}||0) > 0 );
push @item_subfield_codes, $subf[$i][0];
$witness{ $subf[$i][0] } = $sf_def->{lib}; $witness{ $subf[$i][0] } = $sf_def->{lib};
if ( $sf_def->{isurl} ) { if ( $sf_def->{isurl} ) {
$this_row{ $subf[$i][0] } = "<a href=\"$subf[$i][1]\">$subf[$i][1]</a>"; $item->{ $subf[$i][0] } = "<a href=\"$subf[$i][1]\">$subf[$i][1]</a>";
} }
elsif ( $sf_def->{kohafield} eq "biblioitems.isbn" ) { elsif ( $sf_def->{kohafield} eq "biblioitems.isbn" ) {
$this_row{ $subf[$i][0] } = $subf[$i][1]; $item->{ $subf[$i][0] } = $subf[$i][1];
} }
else { else {
$this_row{ $subf[$i][0] } = GetAuthorisedValueDesc( $field->tag(), $subf[$i][0], $item->{ $subf[$i][0] } = GetAuthorisedValueDesc( $field->tag(), $subf[$i][0],
$subf[$i][1], '', $tagslib, '', 'opac' ); $subf[$i][1], '', $tagslib, '', 'opac' );
} }
} }
if (%this_row) { push @item_loop, $item if $item;
push( @big_array, \%this_row );
}
} }
my ( $holdingbrtagf, $holdingbrtagsubf ) = my ( $holdingbrtagf, $holdingbrtagsubf ) =
&GetMarcFromKohaField( "items.holdingbranch", $itemtype ); &GetMarcFromKohaField( "items.holdingbranch", $itemtype );
@big_array = @item_loop =
sort { ($a->{$holdingbrtagsubf}||'') cmp ($b->{$holdingbrtagsubf}||'') } @big_array; sort { ($a->{$holdingbrtagsubf}||'') cmp ($b->{$holdingbrtagsubf}||'') } @item_loop;
#fill big_row with missing datas @item_subfield_codes = uniq @item_subfield_codes;
foreach my $subfield_code ( keys(%witness) ) { # fill item info
for ( my $i = 0 ; $i <= $#big_array ; $i++ ) { my @item_header_loop;
$big_array[$i]{$subfield_code} = "&nbsp;" for my $subfield_code ( @item_subfield_codes ) {
unless ( $big_array[$i]{$subfield_code} ); push @item_header_loop, $witness{$subfield_code};
} for my $item_data ( @item_loop ) {
} $item_data->{$subfield_code} ||= "&nbsp;"
}
# now, construct template !
my @item_value_loop;
my @header_value_loop;
for ( my $i = 0 ; $i <= $#big_array ; $i++ ) {
my $items_data;
foreach my $subfield_code ( keys(%witness) ) {
$items_data .= "<td>" . $big_array[$i]{$subfield_code} . "</td>";
}
my %row_data;
$row_data{item_value} = $items_data;
push( @item_value_loop, \%row_data );
}
foreach my $subfield_code ( keys(%witness) ) {
my %header_value;
$header_value{header_value} = $witness{$subfield_code};
push( @header_value_loop, \%header_value );
} }
if(C4::Context->preference("ISBD")) { if(C4::Context->preference("ISBD")) {
@ -346,9 +329,10 @@ if (my $search_for_title = C4::Context->preference('OPACSearchForTitleIn')){
} }
$template->param( $template->param(
item_loop => \@item_value_loop, item_loop => \@item_loop,
item_header_loop => \@header_value_loop, item_header_loop => \@item_header_loop,
biblionumber => $biblionumber, item_subfield_codes => \@item_subfield_codes,
biblionumber => $biblionumber,
); );
output_html_with_http_headers $query, $cookie, $template->output; output_html_with_http_headers $query, $cookie, $template->output;