[Koha-cvs] CVS: koha/opac opac-moredetail.pl,1.4,1.5 opac-reserve.pl,1.12,1.13 opac-user.pl,1.8,1.9 opac-userdetails.pl,1.5,1.6 opac-userupdate.pl,1.9,1.10

[Mike Hansen]

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1:/tmp/cvs-serv16759/koha/opac

Modified Files:
	opac-moredetail.pl opac-reserve.pl opac-user.pl 
	opac-userdetails.pl opac-userupdate.pl 
Log Message:


Index: opac-moredetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-moredetail.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** opac-moredetail.pl	19 Dec 2002 11:04:15 -0000	1.4
--- opac-moredetail.pl	26 Mar 2003 04:42:56 -0000	1.5
***************
*** 11,14 ****
--- 11,15 ----
  use C4::Acquisitions;
  use C4::Biblio;
+ use C4::Date;
  use HTML::Template;
  
***************
*** 140,145 ****
  $items[$i]->{'timestamp0'}="$day/$mon/$year";
  
! $items[$i]->{'dateaccessioned'} = slashifyDate($items[$i]->{'dateaccessioned'});
! $items[$i]->{'datelastseen'} = slashifyDate($items[$i]->{'datelastseen'});
  
  print <<printend
--- 141,146 ----
  $items[$i]->{'timestamp0'}="$day/$mon/$year";
  
! $items[$i]->{'dateaccessioned'} = format_date($items[$i]->{'dateaccessioned'});
! $items[$i]->{'datelastseen'} = format_date($items[$i]->{'datelastseen'});
  
  print <<printend

Index: opac-reserve.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-reserve.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** opac-reserve.pl	19 Mar 2003 15:14:42 -0000	1.12
--- opac-reserve.pl	26 Mar 2003 04:42:56 -0000	1.13
***************
*** 13,16 ****
--- 13,17 ----
  use C4::Interface::CGI::Output;
  use HTML::Template;
+ use C4::Date;
  
  my $MAXIMUM_NUMBER_OF_RESERVES = 5;
***************
*** 123,127 ****
  my @duedates;
  foreach my $itm (@items) {
!     push @duedates, {date_due => slashifyDate($itm->{'date_due'})} if defined $itm->{'date_due'};
      $itm->{$itm->{'publictype'}} = 1;
      # FIXME CalcReserveFee is supposed to be internal-use-only
--- 124,128 ----
  my @duedates;
  foreach my $itm (@items) {
!     push @duedates, {date_due => format_date($itm->{'date_due'})} if defined $itm->{'date_due'};
      $itm->{$itm->{'publictype'}} = 1;
      # FIXME CalcReserveFee is supposed to be internal-use-only

Index: opac-user.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-user.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** opac-user.pl	3 Feb 2003 21:42:42 -0000	1.8
--- opac-user.pl	26 Mar 2003 04:42:56 -0000	1.9
***************
*** 12,15 ****
--- 12,16 ----
  use C4::Interface::CGI::Output;
  use HTML::Template;
+ use C4::Date;
  
  my $query = new CGI;
***************
*** 26,32 ****
  my ($borr, $flags) = getpatroninformation(undef, $borrowernumber);
  
! $borr->{'dateenrolled'} = slashifyDate($borr->{'dateenrolled'});
! $borr->{'expiry'}       = slashifyDate($borr->{'expiry'});
! $borr->{'dateofbirth'}  = slashifyDate($borr->{'dateofbirth'});
  $borr->{'ethnicity'}    = fixEthnicity($borr->{'ethnicity'});
  
--- 27,33 ----
  my ($borr, $flags) = getpatroninformation(undef, $borrowernumber);
  
! $borr->{'dateenrolled'} = format_date($borr->{'dateenrolled'});
! $borr->{'expiry'}       = format_date($borr->{'expiry'});
! $borr->{'dateofbirth'}  = format_date($borr->{'dateofbirth'});
  $borr->{'ethnicity'}    = fixEthnicity($borr->{'ethnicity'});
  
***************
*** 59,63 ****
  foreach my $key (keys %$issues) {
      my $issue = $issues->{$key};
!     $issue->{'date_due'}  = slashifyDate($issue->{'date_due'});
  
      # check for reserves
--- 60,64 ----
  foreach my $key (keys %$issues) {
      my $issue = $issues->{$key};
!     $issue->{'date_due'}  = format_date($issue->{'date_due'});
  
      # check for reserves
***************
*** 110,114 ****
  my ($rcount, $reserves) = FindReserves(undef, $borrowernumber);
  foreach my $res (@$reserves) {
!     $res->{'reservedate'}  = slashifyDate($res->{'reservedate'});
      my $publictype = $res->{'publictype'};
      $res->{$publictype} = 1;
--- 111,115 ----
  my ($rcount, $reserves) = FindReserves(undef, $borrowernumber);
  foreach my $res (@$reserves) {
!     $res->{'reservedate'}  = format_date($res->{'reservedate'});
      my $publictype = $res->{'publictype'};
      $res->{$publictype} = 1;

Index: opac-userdetails.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-userdetails.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** opac-userdetails.pl	19 Mar 2003 15:14:42 -0000	1.5
--- opac-userdetails.pl	26 Mar 2003 04:42:56 -0000	1.6
***************
*** 10,13 ****
--- 10,14 ----
  use HTML::Template;
  use C4::Interface::CGI::Output;
+ use C4::Date;
  
  my $query = new CGI;
***************
*** 24,30 ****
  my ($borr, $flags) = getpatroninformation(undef, $borrowernumber);
  
! $borr->{'dateenrolled'} = slashifyDate($borr->{'dateenrolled'});
! $borr->{'expiry'}       = slashifyDate($borr->{'expiry'});
! $borr->{'dateofbirth'}  = slashifyDate($borr->{'dateofbirth'});
  $borr->{'ethnicity'}    = fixEthnicity($borr->{'ethnicity'});
  
--- 25,31 ----
  my ($borr, $flags) = getpatroninformation(undef, $borrowernumber);
  
! $borr->{'dateenrolled'} = format_date($borr->{'dateenrolled'});
! $borr->{'expiry'}       = format_date($borr->{'expiry'});
! $borr->{'dateofbirth'}  = format_date($borr->{'dateofbirth'});
  $borr->{'ethnicity'}    = fixEthnicity($borr->{'ethnicity'});
  

Index: opac-userupdate.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-userupdate.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** opac-userupdate.pl	4 Feb 2003 06:40:05 -0000	1.9
--- opac-userupdate.pl	26 Mar 2003 04:42:56 -0000	1.10
***************
*** 11,15 ****
  use C4::Interface::CGI::Output;
  use HTML::Template;
! 
  
  my $query = new CGI;
--- 11,15 ----
  use C4::Interface::CGI::Output;
  use HTML::Template;
! use C4::Date;
  
  my $query = new CGI;
***************
*** 79,85 ****
  
  
! $borr->{'dateenrolled'} = slashifyDate($borr->{'dateenrolled'});
! $borr->{'expiry'}       = slashifyDate($borr->{'expiry'});
! $borr->{'dateofbirth'}  = slashifyDate($borr->{'dateofbirth'});
  $borr->{'ethnicity'}    = fixEthnicity($borr->{'ethnicity'});
  
--- 79,85 ----
  
  
! $borr->{'dateenrolled'} = format_date($borr->{'dateenrolled'});
! $borr->{'expiry'}       = format_date($borr->{'expiry'});
! $borr->{'dateofbirth'}  = format_date($borr->{'dateofbirth'});
  $borr->{'ethnicity'}    = fixEthnicity($borr->{'ethnicity'});