[Koha-cvs] koha/opac opac-user.pl [dev_week]

[Owen Leonard]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Owen Leonard <oleonard>	06/09/20 20:22:06

Modified files:
	opac           : opac-user.pl 

Log message:
	First swing at reformatting opac-user information. Moving sections into tabs.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-user.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.14.2.9.2.4&r2=1.14.2.9.2.5

Patches:
Index: opac-user.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-user.pl,v
retrieving revision 1.14.2.9.2.4
retrieving revision 1.14.2.9.2.5
diff -u -b -r1.14.2.9.2.4 -r1.14.2.9.2.5
--- opac-user.pl	19 Sep 2006 04:46:31 -0000	1.14.2.9.2.4
+++ opac-user.pl	20 Sep 2006 20:22:06 -0000	1.14.2.9.2.5
@@ -40,7 +40,7 @@
 	$borr->{'flagged'} =1;
 }
 
-if ($borr->{'amountoutstanding'} > 5) {
+if ($borr->{'amountoutstanding'} > C4::Context->preference("noissuescharge")) {
     $borr->{'amountoverfive'} = 1;
 }
 if (5 >= $borr->{'amountoutstanding'} && $borr->{'amountoutstanding'} > 0 ) {
@@ -134,16 +134,31 @@
 foreach my $res (@$reserves) {
     if ($res->{'itemnumber'}) {
 	my $item = getiteminformation('',$res->{'itemnumber'},'');
+	$res->{'ccode'} = $item->{'ccode'};
 	$res->{'holdingbranch'} = $branches->{$item->{'holdingbranch'}}->{'branchname'};
 	$res->{'branch'} = $branches->{$res->{'branchcode'}}->{'branchname'};
 	if($res->{'holdingbranch'} eq $res->{'branch'}){
 			$res->{'atdestination'} = 1;
+	$wcount++;
 		}
 	push @waiting, $res;
-	$wcount++;
     }
 }
 
+	# set the default tab, etc.
+	my $list_type = $query->param('display');
+	if ((!$list_type) || ($list_type eq 'issues'))  {
+		$template->param(showissues => 1);
+	} elsif ($list_type eq 'fines') {
+		$template->param(showfines => 1);
+	} elsif ($list_type eq 'waiting') {
+		$template->param(showwaiting => 1);
+	} elsif ($list_type eq 'overdues') {
+		$template->param(showoverdues => 1);
+	} elsif ($list_type eq 'reserves') {
+		$template->param(showreserves => 1);
+	}
+
 $template->param(WAITING => \@waiting);
 $template->param(waiting_count => $wcount,
 				textmessaging => $borr->{textmessaging},