MT 1801 : Opac shelves and basket are displayed the same way

[koha_ffzg] / C4 / VirtualShelves / Page.pm

diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm
index b624073..658b9ac 100644 (file)
--- a/C4/VirtualShelves/Page.pm
+++ b/C4/VirtualShelves/Page.pm
@@ -33,6 +33,7 @@ use C4::Output;
 use C4::Dates qw/format_date/;
 use Exporter;
 use Data::Dumper;
+use C4::Csv;
 
 use vars qw($debug @EXPORT @ISA $VERSION);
 
@@ -151,7 +152,7 @@ SWITCH: {
 
                } elsif ( $op eq 'modif' ) {
                        my ( $shelfnumber2, $shelfname, $owner, $category, $sortfield ) =GetShelf( $shelfnumber );
-                       my $member = GetMember($owner,'borrowernumber');
+                       my $member = GetMember('borrowernumber'=>$owner);
                        my $ownername = defined($member) ? $member->{firstname} . " " . $member->{surname} : '';
                        $template->param(
                                edit                => 1,
@@ -170,26 +171,42 @@ SWITCH: {
         #check that the user can view the shelf
                if ( ShelfPossibleAction( $loggedinuser, $shelfnumber, 'view' ) ) {
                        my $items;
+                       my $authorsort;
+                       my $yearsort;
+                       my $sortfield = ($query->param('sortfield') ? $query->param('sortfield') : 'title');
+                       if ($sortfield eq 'author') {
+                               $authorsort = 'author';
+                       }
+                       if ($sortfield eq 'year'){
+                               $yearsort = 'year';
+                       }
                        ($items, $totitems) = GetShelfContents($shelfnumber, $shelflimit, $shelfoffset);
                        for my $this_item (@$items) {
+                               my $record = GetMarcBiblio($this_item->{'biblionumber'});
                                # the virtualshelfcontents table does not store these columns nor are they retrieved from the items
                                # and itemtypes tables, so I'm commenting them out for now to quiet the log -crn
                                #$this_item->{imageurl} = $imgdir."/".$itemtypes->{ $this_item->{itemtype}  }->{'imageurl'};
                                #$this_item->{'description'} = $itemtypes->{ $this_item->{itemtype} }->{'description'};
                                $this_item->{'dateadded'} = format_date($this_item->{'dateadded'});
                 $this_item->{'imageurl'} = getitemtypeinfo($this_item->{'itemtype'})->{'imageurl'};
+                $this_item->{'coins'} = GetCOinSBiblio($this_item->{'biblionumber'});
+                               $this_item->{'subtitle'} = C4::Biblio::get_koha_field_from_marc('bibliosubtitle', 'subtitle', $record, '');
+                               
+                               # Getting items infos for location display
+                               my @items_infos = &GetItemsInfo($this_item->{'biblionumber'}, $type);
+                               $this_item->{'ITEM_RESULTS'} = \@items_infos;
+
                        }
                        push @paramsloop, {display => 'privateshelves'} if $category == 1;
                        $showadd = 1;
                        my $i = 0;
-                       foreach (grep {$i++ % 2} @$items) {     # every other item
-                               $_->{toggle} = 1;
-                       }
                        my $manageshelf = ShelfPossibleAction( $loggedinuser, $shelfnumber, 'manage' );
                        $template->param(
                                shelfname   => $shelflist->{$shelfnumber}->{'shelfname'} || $privshelflist->{$shelfnumber}->{'shelfname'},
                                shelfnumber => $shelfnumber,
                                viewshelf   => $shelfnumber,
+                               authorsort   => $authorsort,
+                               yearsort => $yearsort,
                                manageshelf => $manageshelf,
                                itemsloop => $items,
                        );
@@ -281,21 +298,19 @@ foreach my $element (sort { lc($shelflist->{$a}->{'shelfname'}) cmp lc($shelflis
        if ($owner eq $loggedinuser or $canmanage) {
                $shelflist->{$element}->{'mine'} = 1;
        } 
-       my $member = GetMember($owner,'borrowernumber');
+       my $member = GetMember('borrowernumber' => $owner);
        $shelflist->{$element}->{ownername} = defined($member) ? $member->{firstname} . " " . $member->{surname} : '';
        $numberCanManage++ if $canmanage;       # possibly outmoded
        if ($shelflist->{$element}->{'category'} eq '1') {
-               (scalar(@shelveslooppriv) % 2) and $shelflist->{$element}->{toggle} = 1;
                push (@shelveslooppriv, $shelflist->{$element});
        } else {
-               (scalar(@shelvesloop)     % 2) and $shelflist->{$element}->{toggle} = 1;
                push (@shelvesloop, $shelflist->{$element});
        }
 }
 
 my $url = $type eq 'opac' ? "/cgi-bin/koha/opac-shelves.pl" : "/cgi-bin/koha/virtualshelves/shelves.pl";
 my %qhash = ();
-foreach (qw(display viewshelf)) {
+foreach (qw(display viewshelf sortfield)) {
     $qhash{$_} = $query->param($_) if $query->param($_);
 }
 (scalar keys %qhash) and $url .= '?' . join '&', map {"$_=$qhash{$_}"} keys %qhash;
@@ -310,6 +325,7 @@ $template->param(
     shelvesloopall  => [(@shelvesloop, @shelveslooppriv)],
     numberCanManage => $numberCanManage,
        "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
+    csv_profiles => GetCsvProfilesLoop()
 );
 if ($template->param('viewshelf') or
        $template->param( 'shelves' ) or