[Koha-cvs] CVS: koha/admin itemtypes.pl,1.16.2.1,1.16.2.2

[Owen Leonard]

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12281/admin

Modified Files:
      Tag: rel_2_2
	itemtypes.pl 
Log Message:
- formatting currency values
- fixing table row color toggle, and moving color values to the template (requires update to template)

Index: itemtypes.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/itemtypes.pl,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -C2 -r1.16.2.1 -r1.16.2.2
*** itemtypes.pl	17 Feb 2005 12:41:52 -0000	1.16.2.1
--- itemtypes.pl	17 Feb 2005 17:55:56 -0000	1.16.2.2
***************
*** 105,109 ****
  							description => $data->{'description'},
  							renewalsallowed => $data->{'renewalsallowed'},
! 							rentalcharge => $data->{'rentalcharge'},
  							notforloan => $data->{'notforloan'}
  							);
--- 105,109 ----
  							description => $data->{'description'},
  							renewalsallowed => $data->{'renewalsallowed'},
! 							rentalcharge => sprintf("%.2f",$data->{'rentalcharge'}),
  							notforloan => $data->{'notforloan'}
  							);
***************
*** 146,150 ****
  							description => $data->{'description'},
  							renewalsallowed => $data->{'renewalsallowed'},
! 							rentalcharge => $data->{'rentalcharge'},
  							total => $total);
  													# END $OP eq DELETE_CONFIRM
--- 146,150 ----
  							description => $data->{'description'},
  							renewalsallowed => $data->{'renewalsallowed'},
! 							rentalcharge => sprintf("%.2f",$data->{'rentalcharge'}),
  							total => $total);
  													# END $OP eq DELETE_CONFIRM
***************
*** 167,184 ****
  	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++){
  		my %row_data;
! 		if ($toggle eq 'white'){
! 			$row_data{toggle}="#ffffcc";
  		} else {
! 			$row_data{toggle}="white";
  		}
  		$row_data{itemtype} = $results->[$i]{'itemtype'};
  		$row_data{description} = $results->[$i]{'description'};
- 		$row_data{notforloan} = $results->[$i]{'notforloan'};
  		$row_data{renewalsallowed} = $results->[$i]{'renewalsallowed'};
! 		$row_data{rentalcharge} = $results->[$i]{'rentalcharge'};
  		push(@loop_data, \%row_data);
  	}
--- 167,184 ----
  	my $env;
  	my ($count,$results)=StringSearch($env,$searchfield,'web');
! 	my $toggle=0;
  	my @loop_data;
  	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
  		my %row_data;
! 		if ($toggle eq 0){
! 			$toggle=1;
  		} else {
! 			$toggle=0;
  		}
+ 		$row_data{toggle} = $toggle;
  		$row_data{itemtype} = $results->[$i]{'itemtype'};
  		$row_data{description} = $results->[$i]{'description'};
  		$row_data{renewalsallowed} = $results->[$i]{'renewalsallowed'};
! 		$row_data{rentalcharge} = sprintf("%.2f",$results->[$i]{'rentalcharge'});
  		push(@loop_data, \%row_data);
  	}