[Koha-cvs] CVS: koha/admin aqbudget.pl,1.6,1.7

David Strainchamps lavide at users.sourceforge.net
Sat Nov 16 22:40:55 CET 2002


Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv29394

Modified Files:
	aqbudget.pl 
Log Message:
templating this file and modify it so that all the budgets are on the screen
but for this moment only on budget by bookfund because there is primary key for bookfundid in aqbookfund and in aqbudget tables


Index: aqbudget.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/aqbudget.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** aqbudget.pl	5 Oct 2002 10:01:58 -0000	1.6
--- aqbudget.pl	16 Nov 2002 21:40:53 -0000	1.7
***************
*** 43,46 ****
--- 43,49 ----
  use C4::Output;
  use C4::Search;
+ use HTML::Template;
+ 
+ 
  
  sub StringSearch  {
***************
*** 50,54 ****
  	my @data=split(' ',$searchstring);
  	my $count=@data;
! 	my $query="Select aqbudget.bookfundid,startdate,enddate,budgetamount,bookfundname from aqbudget,aqbookfund where aqbudget.bookfundid=aqbookfund.bookfundid and (aqbudget.bookfundid like \"$data[0]%\") order by bookfundid";
  	my $sth=$dbh->prepare($query);
  	$sth->execute;
--- 53,57 ----
  	my @data=split(' ',$searchstring);
  	my $count=@data;
! 	my $query="Select bookfundid,startdate,enddate,budgetamount from aqbudget where bookfundid and (bookfundid like \"$data[0]%\") order by bookfundid";
  	my $sth=$dbh->prepare($query);
  	$sth->execute;
***************
*** 72,173 ****
  my $op = $input->param('op');
  $searchfield=~ s/\,//g;
- print $input->header;
  
! #start the page and read in includes
! print startpage();
! print startmenu('admin');
  
  ################## ADD_FORM ##################################
  # called by default. Used to create form to add or  modify a record
  if ($op eq 'add_form') {
  	#---- if primkey exists, it's a modify action, so read values to modify...
! 	my $data;
  	if ($bookfundid) {
  		my $dbh = C4::Context->dbh;
! 	        my $query="select aqbookfund.bookfundid,startdate,enddate,budgetamount,bookfundname from aqbudget,aqbookfund where aqbudget.bookfundid=aqbookfund.bookfundid and aqbookfund.bookfundid='$bookfundid'";
  #	        print $query;
  		my $sth=$dbh->prepare($query);
  		$sth->execute;
! 		$data=$sth->fetchrow_hashref;
  		$sth->finish;
  	}
! 	print <<printend
! 	<script>
! 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
! 	function isNotNull(f,noalert) {
! 		if (f.value.length ==0) {
!    return false;
! 		}
! 		return true;
! 	}
! 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
! 	function toUC(f) {
! 		var x=f.value.toUpperCase();
! 		f.value=x;
! 		return true;
! 	}
! 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
! 	function isNum(v,maybenull) {
! 	var n = new Number(v.value);
! 	if (isNaN(n)) {
! 		return false;
! 		}
! 	if (maybenull==0 && v.value=='') {
! 		return false;
! 	}
! 	return true;
! 	}
! 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
! 	function isDate(f) {
! 		var t = Date.parse(f.value);
! 		if (isNaN(t)) {
! 			return false;
! 		}
! 	}
! 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
! 	function Check(f) {
! 		var ok=1;
! 		var _alertString="";
! 		var alertString2;
! 		if (f.bookfundid.value.length==0) {
! 			_alertString += "- bookfundid missing\\n";
! 		}
! 		if (!(isNotNull(window.document.Aform.budgetamount,1))) {
! 			_alertString += "- Budget missing\\n";
! 		}
! 		if (_alertString.length==0) {
! 			document.Aform.submit();
! 		} else {
! 			alertString2 = "Form not submitted because of the following problem(s)\\n";
! 			alertString2 += "------------------------------------------------------------------------------------\\n\\n";
! 			alertString2 += _alertString;
! 			alert(alertString2);
! 		}
! 	}
! 	</SCRIPT>
! printend
! ;#/
  	if ($bookfundid) {
! 		print "<h1>Modify budget</h1>";
  	} else {
! 		print "<h1>Add budget</h1>";
  	}
! 	print "<form action='$script_name' name=Aform method=post>";
! 	print "<input type=hidden name=op value='add_validate'>";
! 	print "<input type=hidden name=checked value=0>";
! 	print "<table>";
  	if ($bookfundid) {
! 		print "<tr><td>Book fund</td><td><input type=hidden name=bookfundid value=$bookfundid>$bookfundid</td></tr>";
! 	        print "<tr><td>Book fund</td><td>$data->{'bookfundname'}</td></tr>";
  	} else {
! 		print "<tr><td>Book fund</td><td><input type=text name=bookfundid size=5 maxlength=5 onBlur=toUC(this)></td></tr>";
  	}
! 	print "<tr><td>Start date</td><td><input type=text name=startdate size=40 maxlength=80 value='$data->{'startdate'}'>&nbsp;</td></tr>";
! 	print "<tr><td>End date</td><td><input type=text name=enddate value='$data->{'enddate'}'></td></tr>";
! 	print "<tr><td>Budget amount</td><td><input type=text name=budgetamount value='$data->{'budgetamount'}'></td></tr>";
! 	print "<tr><td>&nbsp;</td><td><INPUT type=button value='OK' onClick='Check(this.form)'></td></tr>";
! print "</table>";
! 	print "</form>";
! ;
  													# END $OP eq ADD_FORM
  ################## ADD_VALIDATE ##################################
--- 75,127 ----
  my $op = $input->param('op');
  $searchfield=~ s/\,//g;
  
! my $template = gettemplate("parameters/aqbudget.tmpl",0);
! if ($op) {
! $template->param(script_name => $script_name,
! 						$op              => 1); # we show only the TMPL_VAR names $op
! } else {
! $template->param(script_name => $script_name,
! 						else              => 1); # we show only the TMPL_VAR names $op
! }
  
+ $template->param(action => $script_name);
  ################## ADD_FORM ##################################
  # called by default. Used to create form to add or  modify a record
  if ($op eq 'add_form') {
  	#---- if primkey exists, it's a modify action, so read values to modify...
! 	my $dataaqbudget;
! 	my $dataaqbookfund;
  	if ($bookfundid) {
  		my $dbh = C4::Context->dbh;
! 	        my $query="select bookfundid,startdate,enddate,budgetamount from aqbudget where bookfundid='$bookfundid'";
  #	        print $query;
  		my $sth=$dbh->prepare($query);
  		$sth->execute;
! 		$dataaqbudget=$sth->fetchrow_hashref;
! 		$sth->finish;
! 		my $query="select bookfundid,bookfundname from aqbookfund where bookfundid='$bookfundid'";
! #	        print $query;
! 		my $sth=$dbh->prepare($query);
! 		$sth->execute;
! 		$dataaqbookfund=$sth->fetchrow_hashref;
  		$sth->finish;
  	}
! 	my $header;
  	if ($bookfundid) {
! 		$header = "Modify budget";
  	} else {
! 		$header = "Add budget";
  	}
! 	$template->param(header => $header);
  	if ($bookfundid) {
! 	    $template->param(modify => 1);
! 	    $template->param(bookfundid => $bookfundid);
! 	    $template->param(bookfundname => $dataaqbookfund->{bookfundname});
  	} else {
! 	    $template->param(adding => 1);
  	}
! 	$template->param(startdate => $dataaqbudget->{'startdate'});
! 	$template->param(enddate => $dataaqbudget->{'enddate'});
! 	$template->param(budgetamount => $dataaqbudget->{'budgetamount'});
  													# END $OP eq ADD_FORM
  ################## ADD_VALIDATE ##################################
***************
*** 183,190 ****
  	$sth->execute;
  	$sth->finish;
- 	print "data recorded";
- 	print "<form action='$script_name' method=post>";
- 	print "<input type=submit value=OK>";
- 	print "</form>";
  													# END $OP eq ADD_VALIDATE
  ################## DELETE_CONFIRM ##################################
--- 137,140 ----
***************
*** 200,216 ****
  	my $data=$sth->fetchrow_hashref;
  	$sth->finish;
! 	print mktablehdr;
! 	print mktablerow(2,'#99cc33',bold('Book fund'),bold("$bookfundid"),'/images/background-mem.gif');
! 	print "<form action='$script_name' method=post><input type=hidden name=op value=delete_confirmed><input type=hidden name=bookfundid value='$bookfundid'>";
! 	print "<tr><td>Start date</td><td>$data->{'startdate'}</td></tr>";
! 	print "<tr><td>End date</td><td>$data->{'enddate'}</td></tr>";
! 	print "<tr><td>budgetamount</td><td>$data->{'budgetamount'}</td></tr>";
! #	if ($total->{'total'} >0) {
! #		print "<tr><td colspan=2 align=center><b>This record is used $total->{'total'} times. Deletion not possible</b></td></tr>";
! #		print "<tr><td colspan=2></form><form action='$script_name' method=post><input type=submit value=OK></form></td></tr>";
! #	} else {
! 		print "<tr><td colspan=2 align=center>CONFIRM DELETION</td></tr>";
! 		print "<tr><td><INPUT type=submit value='YES'></form></td><td><form action='$script_name' method=post><input type=submit value=NO></form></td></tr>";
! #	}
  													# END $OP eq DELETE_CONFIRM
  ################## DELETE_CONFIRMED ##################################
--- 150,157 ----
  	my $data=$sth->fetchrow_hashref;
  	$sth->finish;
! 	$template->param(bookfundid => $bookfundid);
! 	$template->param(startdate => $data->{'startdate'});
! 	$template->param(enddate => $data->{'enddate'});
! 	$template->param(budgetamount => $data->{'budgetamount'});
  													# END $OP eq DELETE_CONFIRM
  ################## DELETE_CONFIRMED ##################################
***************
*** 223,254 ****
  	$sth->execute;
  	$sth->finish;
- 	print "data deleted";
- 	print "<form action='$script_name' method=post>";
- 	print "<input type=submit value=OK>";
- 	print "</form>";
  													# END $OP eq DELETE_CONFIRMED
  ################## DEFAULT ##################################
  } else { # DEFAULT
- 	my @inputs=(["text","searchfield",$searchfield],
- 		["reset","reset","clr"]);
- 	print mkheadr(2,'Budget admin');
- 	print mkformnotable("$script_name", at inputs);
- 	print <<printend
- 
- printend
- 	;
  	if  ($searchfield ne '') {
! 		print "You Searched for <b>$searchfield<b><p>";
  	}
- 	print mktablehdr;
- 	print mktablerow(6,'#99cc33',bold('Book fund'),bold('Start date'),bold('End date'),bold('Budget amount'),
- 	'&nbsp;','&nbsp;','/images/background-mem.gif');
  	my $env;
  	my ($count,$results)=StringSearch($env,$searchfield,'web');
  	my $toggle="white";
  	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
  		#find out stats
  	#  	my ($od,$issue,$fines)=categdata2($env,$results->[$i]{'borrowernumber'});
  	#  	$fines=$fines+0;
  	  	if ($toggle eq 'white'){
  	    		$toggle="#ffffcc";
--- 164,202 ----
  	$sth->execute;
  	$sth->finish;
  													# END $OP eq DELETE_CONFIRMED
  ################## DEFAULT ##################################
  } else { # DEFAULT
  	if  ($searchfield ne '') {
! 	        $template->param(search => 1);
! 		$template->param(searchfield => $searchfield);
  	}
  	my $env;
  	my ($count,$results)=StringSearch($env,$searchfield,'web');
  	my $toggle="white";
+ 	my @loop_data =();
  	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
  		#find out stats
  	#  	my ($od,$issue,$fines)=categdata2($env,$results->[$i]{'borrowernumber'});
  	#  	$fines=$fines+0;
+ 	        my $dataaqbookfund;
+ 	        my $dbh = C4::Context->dbh;
+ 	        my $query="select bookfundid,bookfundname from aqbookfund where bookfundid=$results->[$i]{'bookfundid'}";
+ #	        print $query;
+ 		my $sth=$dbh->prepare($query);
+ 		$sth->execute;
+ 		$dataaqbookfund=$sth->fetchrow_hashref;
+ 		$sth->finish;
+ 	        my @toggle = ();
+ 	        my @bookfundid = ();
+ 		my @bookfundname = ();
+ 	        my @startdate = ();
+ 	        my @enddate = ();
+ 		my @budgetamount = ();
+ 		push(@toggle,$toggle);
+ 		push(@bookfundid,$results->[$i]{'bookfundid'});
+ 		push(@bookfundname,$dataaqbookfund->{'bookfundname'});
+ 		push(@startdate,$results->[$i]{'startdate'});
+ 		push(@enddate,$results->[$i]{'enddate'});
+ 		push(@budgetamount,$results->[$i]{'budgetamount'});
  	  	if ($toggle eq 'white'){
  	    		$toggle="#ffffcc";
***************
*** 256,280 ****
  	    		$toggle="white";
  	  	}
! 		print mktablerow(6,$toggle,$results->[$i]{'bookfundid'}.' ('.$results->[$i]{'bookfundname'}.')',
! 		$results->[$i]{'startdate'},$results->[$i]{'enddate'},
! 		$results->[$i]{'budgetamount'},
! 		mklink("$script_name?op=add_form&bookfundid=".$results->[$i]{'bookfundid'},'Edit'),
! 		mklink("$script_name?op=delete_confirm&bookfundid=".$results->[$i]{'bookfundid'},'Delete',''));	# FIXME - Too many arguments. Drop the 3d one?
! 	}
! 	print mktableft;
! 	print "<form action='$script_name' method=post>";
! 	print "<input type=hidden name=op value=add_form>";
! 	if ($offset>0) {
! 		my $prevpage = $offset-$pagesize;
! 		print mklink("$script_name?offset=".$prevpage,'&lt;&lt; Prev');
! 	}
! 	print "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
! 	if ($offset+$pagesize<$count) {
! 		my $nextpage =$offset+$pagesize;
! 		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
! 	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add budget\" BORDER=0 ></a><br>";
! 	print "</form>";
  } #---- END $OP eq DEFAULT
! print endmenu('admin');
! print endpage();
--- 204,220 ----
  	    		$toggle="white";
  	  	}
! 		while (@toggle and @bookfundid and @bookfundname and @startdate and @enddate and @budgetamount) { 
! 	   my %row_data;
! 	   $row_data{toggle} = shift @toggle;
! 	   $row_data{bookfundid} = shift @bookfundid;
! 	   $row_data{bookfundname} = shift @bookfundname;
! 	   $row_data{startdate} = shift @startdate;
! 	   $row_data{enddate} = shift @enddate;
! 	   $row_data{budgetamount} = shift @budgetamount;
! 	   push(@loop_data, \%row_data);
!        }
!        }
!        $template->param(budget => \@loop_data);
  } #---- END $OP eq DEFAULT
! 
! print "Content-Type: text/html\n\n", $template->output;





More information about the Koha-cvs mailing list