[Koha-cvs] koha/acqui acqui-home.pl

[Mason James]

CVSROOT:	/sources/koha
Module name:	koha
Changes by:	Mason James <sushi>	06/06/07 02:45:26

Modified files:
	acqui          : acqui-home.pl 

Log message:
	Merging Katipo changes.
	Got acqui homepage actually displaying suggestions - only displayed count before - need to get the suggestedby diplaying borrowers name rather than id number.
	Showing budget breakdowns.
	Slight alteration - let $status be an input parameter.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/acqui-home.pl?cvsroot=koha&r1=1.8&r2=1.9

Patches:
Index: acqui-home.pl
===================================================================
RCS file: /sources/koha/koha/acqui/acqui-home.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- acqui-home.pl	7 Jun 2006 02:36:24 -0000	1.8
+++ acqui-home.pl	7 Jun 2006 02:45:26 -0000	1.9
@@ -46,11 +46,15 @@
         $toggle = 0;
     }
     my ( $spent, $comtd ) = bookfundbreakdown( $results[$i]->{'bookfundid'} );
+
     my $avail = $results[$i]->{'budgetamount'} - ( $spent + $comtd );
     my %line;
-
     $line{bookfundname} = $results[$i]->{'bookfundname'};
     $line{budgetamount} = $results[$i]->{'budgetamount'};
+    $line{bookfundid}   = $results[$i]->{'bookfundid'};
+    $line{sdate}        = $results[$i]->{'startdate'};
+    $line{edate}        = $results[$i]->{'enddate'};
+    $line{aqbudgetid}   = $results[$i]->{'aqbudgetid'};
     $line{spent}        = sprintf( "%.2f", $spent );
     $line{comtd}        = sprintf( "%.2f", $comtd );
     $line{avail}        = sprintf( "%.2f", $avail );
@@ -74,7 +78,10 @@
 }
 
 # suggestions ?
-my $suggestion = countsuggestion("ASKED");
+my $status           = $query->param('status') || "ASKED";
+my $suggestion       = countsuggestion($status);
+my $suggestions_loop = &searchsuggestion( '', '', '', '', $status, '' );
+
 $template->param(
     classlist     => $classlist,
     type          => 'intranet',
@@ -82,6 +89,7 @@
     loop_currency => \@loop_currency,
     total         => sprintf( "%.2f", $total ),
     suggestion    => $suggestion,
+    suggestions_loop => $suggestions_loop,
     totspent      => sprintf( "%.2f", $totspent ),
     totcomtd      => sprintf( "%.2f", $totcomtd ),
     totavail      => sprintf( "%.2f", $totavail ),