[Koha-cvs] CVS: koha/admin currency.pl,1.5,1.6

[Mike Hansen]

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv11964/koha/admin

Modified Files:
        currency.pl 
Log Message:
Templating...


Index: currency.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/currency.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** currency.pl 5 Oct 2002 10:02:39 -0000       1.5
--- currency.pl 5 Apr 2003 00:12:43 -0000       1.6
***************
*** 43,46 ****
--- 43,49 ----
  use C4::Output;
  use C4::Search;
+ use HTML::Template;
+ use C4::Auth;
+ use C4::Interface::CGI::Output;
  
  sub StringSearch  {
***************
*** 76,88 ****
  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;
--- 79,99 ----
  my $op = $input->param('op');
  $searchfield=~ s/\,//g;
  
! my ($template, $loggedinuser, $cookie) 
!     = get_template_and_user({template_name => "parameters/currency.tmpl",
!                              query => $input,
!                              type => "intranet",
!                              authnotrequired => 0,
!                              debug => 1,
!                              });
! 
! $template->param(searchfield => $searchfield,
!                script_name => $script_name);
! 
  
  ################## ADD_FORM ##################################
  # called by default. Used to create form to add or  modify a record
  if ($op eq 'add_form') {
+       $template->param(add_form => 1);
        #---- if primkey exists, it's a modify action, so read values to 
modify...
        my $data;
***************
*** 94,175 ****
                $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.currency.value.length==0) {
!                       _alertString += "- currency missing\\n";
!               }
!               if (!isNum(f.rate)) {
!                       _alertString += "- Rate not numeric\\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 ($searchfield) {
!               print "<h1>Modify currency</h1>";
!       } else {
!               print "<h1>Add currency</h1>";
!       }
!       print "<form action='$script_name' name=Aform method=post>";
!       print "<input type=hidden name=op value='add_validate'>";
!       print "<table>";
!       if ($searchfield) {
!               print "<tr><td>Currency</td><td><input type=hidden 
name=currency value=$searchfield>$searchfield</td></tr>";
!       } else {
!               print "<tr><td>Currency</td><td><input type=text name=currency 
size=5 maxlength=5 onBlur=toUC(this)></td></tr>";
!       }
!       print "<tr><td>Rate</td><td><input type=text name=rate size=10 
maxlength=10 value='$data->{'rate'}'>&nbsp;</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 ##################################
  # called by add_form, used to insert/modify data in DB
  } elsif ($op eq 'add_validate') {
        my $dbh = C4::Context->dbh;
        my $query = "replace currency (currency,rate) values (";
--- 105,116 ----
                $sth->finish;
        }
! 
!       $template->param(currency => $data->{'currency'},
!                        rate => $data->{'rate'});
                                                                                
                        # END $OP eq ADD_FORM
  ################## ADD_VALIDATE ##################################
  # called by add_form, used to insert/modify data in DB
  } elsif ($op eq 'add_validate') {
+       $template->param(add_validate => 1);
        my $dbh = C4::Context->dbh;
        my $query = "replace currency (currency,rate) values (";
***************
*** 179,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 ##################################
  # called by default form, used to confirm deletion of data in DB
  } elsif ($op eq 'delete_confirm') {
        my $dbh = C4::Context->dbh;
        my $sth=$dbh->prepare("select count(*) as total from aqbooksellers 
where currency='$searchfield'");
--- 120,128 ----
        $sth->execute;
        $sth->finish;
                                                                                
                        # END $OP eq ADD_VALIDATE
  ################## DELETE_CONFIRM ##################################
  # called by default form, used to confirm deletion of data in DB
  } elsif ($op eq 'delete_confirm') {
+       $template->param(delete_confirm => 1);
        my $dbh = C4::Context->dbh;
        my $sth=$dbh->prepare("select count(*) as total from aqbooksellers 
where currency='$searchfield'");
***************
*** 192,272 ****
        my $total = $sth->fetchrow_hashref;
        $sth->finish;
!       # FIXME - There's already a $sth in this scope.
!       my $sth=$dbh->prepare($reqsel);
!       $sth->execute;
!       my $data=$sth->fetchrow_hashref;
!       $sth->finish;
!       print mktablehdr;
!       print 
mktablerow(2,'#99cc33',bold('Currency'),bold("$searchfield"),'/images/background-mem.gif');
!       print "<form action='$script_name' method=post><input type=hidden 
name=op value=delete_confirmed><input type=hidden name=searchfield 
value='$searchfield'>";
!       print "<tr><td>Rate</td><td>$data->{'rate'}</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 ##################################
  # called by delete_confirm, used to effectively confirm deletion of data in DB
  } elsif ($op eq 'delete_confirmed') {
        my $dbh = C4::Context->dbh;
- #     my $searchfield=$input->param('branchcode');
        my $sth=$dbh->prepare($reqdel);
        $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,'Currencies admin');
!       print mkformnotable("$script_name",@inputs);
!       print <<printend
! 
! printend
!       ;
!       if  ($searchfield ne '') {
!               print "You Searched for <b>$searchfield<b><p>";
!       }
!       print mktablehdr;
!       print mktablerow(4,'#99cc33',bold('Currency'),bold('Rate'),
!       '&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";
!               } else {
!                       $toggle="white";
!               }
!               print 
mktablerow(4,$toggle,$results->[$i]{'currency'},$results->[$i]{'rate'},
!               
mklink("$script_name?op=add_form&searchfield=".$results->[$i]{'currency'},'Edit'),
!               
mklink("$script_name?op=delete_confirm&searchfield=".$results->[$i]{'currency'},'Delete'));
!       }
!       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();
--- 130,179 ----
        my $total = $sth->fetchrow_hashref;
        $sth->finish;
!       my $sth2=$dbh->prepare($reqsel);
!       $sth2->execute;
!       my $data=$sth2->fetchrow_hashref;
!       $sth2->finish;
! 
        if ($total->{'total'} >0) {
!               $template->param(totalgtzero => 1);
        }
+ 
+       $template->param(rate => $data->{'rate'},
+                        total => $total);
                                                                                
                        # END $OP eq DELETE_CONFIRM
  ################## DELETE_CONFIRMED ##################################
  # called by delete_confirm, used to effectively confirm deletion of data in DB
  } elsif ($op eq 'delete_confirmed') {
+       $template->param(delete_confirmed => 1);
        my $dbh = C4::Context->dbh;
        my $sth=$dbh->prepare($reqdel);
        $sth->execute;
        $sth->finish;
                                                                                
                        # END $OP eq DELETE_CONFIRMED
  ################## DEFAULT ##################################
  } else { # DEFAULT
!       $template->param(else => 1);
! 
        my $env;
        my ($count,$results)=StringSearch($env,$searchfield,'web');
!       my @loop;
        for (my $i=$offset; $i < 
($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
!               my %row = ( currency => $results->[$i]{'currency'},
!                           rate => $results->[$i]{'rate'});
!               push @loop, \%row;
!       }
!       $template->param(loop => address@hidden);
! 
        if ($offset>0) {
!               $template->param(offsetgtzero => 1,
!                                prevpage => $offset-$pagesize);
        }
! 
        if ($offset+$pagesize<$count) {
!               $template->param(ltcount => 1,
!                                nextpage => $offset+$pagesize);
        }
  } #---- END $OP eq DEFAULT
! 
! output_html_with_http_headers $input, $cookie, $template->output;
!