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

[Mike Hansen]

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

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


Index: categorie.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/categorie.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** categorie.pl        25 Mar 2003 05:23:36 -0000      1.5
--- categorie.pl        2 Apr 2003 09:47:52 -0000       1.6
***************
*** 69,80 ****
  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;
--- 69,92 ----
  my $op = $input->param('op');
  $searchfield=~ s/\,//g;
! 
! my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "parameters/categorie.tmpl",
!                            query => $input,
!                            type => "intranet",
!                            authnotrequired => 0,
!                            flagsrequired => {borrowers => 1},
!                            debug => 1,
!                            });
! 
! 
! $template->param(script_name => $script_name,
!                categorycode => $categorycode);
! 
  
  ################## 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;
***************
*** 86,181 ****
                $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.categorycode.value.length==0) {
!                       _alertString += "- categorycode missing\\n";
!               }
! //            alert(window.document.Aform.description.value);
!               if (!(isNotNull(window.document.Aform.description,1))) {
!                       _alertString += "- description missing\\n";
!               }
!               if (!isNum(f.upperagelimit,0)) {
!                       _alertString += "- upperagelimit is not a number\\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 ($categorycode) {
!               print "<h1>Modify category</h1>";
!       } else {
!               print "<h1>Add category</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 ($categorycode) {
!               print "<tr><td>Category code</td><td><input type=hidden 
name=categorycode value=$categorycode>$categorycode</td></tr>";
!       } else {
!               print "<tr><td>Category code</td><td><input type=text 
name=categorycode size=3 maxlength=2 onBlur=toUC(this)></td></tr>";
!       }
!       print "<tr><td>Description</td><td><input type=text name=description 
size=40 maxlength=80 value='$data->{'description'}'>&nbsp;</td></tr>";
!       print "<tr><td>Enrolment period</td><td><input type=text 
name=enrolmentperiod value='$data->{'enrolmentperiod'}'></td></tr>";
!       print "<tr><td>Upperage limit</td><td><input type=text 
name=upperagelimit value='$data->{'upperagelimit'}'></td></tr>";
!       print "<tr><td>Age Required</td><td><input type=text 
name=dateofbirthrequired value='$data->{'dateofbirthrequired'}'></td></tr>";
!       print "<tr><td>Fine type</td><td><input type=text name=finetype size=30 
maxlength=30 value='$data->{'finetype'}'></td></tr>";
!       print "<tr><td>Bulk</td><td><input type=text name=bulk 
value='$data->{'bulk'}'></td></tr>";
!       print "<tr><td>Enrolment fee</td><td><input type=text name=enrolmentfee 
value='$data->{'enrolmentfee'}'></td></tr>";
!       print "<tr><td>Overdue notice required</td><td><input type=text 
name=overduenoticerequired value='$data->{'overduenoticerequired'}'></td></tr>";
!       print "<tr><td>Issue limit</td><td><input type=text name=issuelimit 
value='$data->{'issuelimit'}'></td></tr>";
!       print "<tr><td>Reserve fee</td><td><input type=text name=reservefee 
value='$data->{'reservefee'}'></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 categories 
(categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,finetype,bulk,enrolmentfee,issuelimit,reservefee,overduenoticerequired)
 values (";
--- 98,118 ----
                $sth->finish;
        }
! 
!       $template->param(description             => $data->{'description'},
!                               enrolmentperiod         => 
$data->{'enrolmentperiod'},
!                               upperagelimit           => 
$data->{'upperagelimit'},
!                               dateofbirthrequired     => 
$data->{'dateofbirthrequired'},
!                               finetype                => $data->{'finetype'},
!                               bulk                    => $data->{'bulk'},
!                               enrolmentfee            => 
$data->{'enrolmentfee'},
!                               overduenoticerequired   => 
$data->{'overduenoticerequired'},
!                               issuelimit              => 
$data->{'issuelimit'},
!                               reservefee              => 
$data->{'reservefee'});
! }
                                                                                
                        # 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 categories 
(categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,finetype,bulk,enrolmentfee,issuelimit,reservefee,overduenoticerequired)
 values (";
***************
*** 194,216 ****
        $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 categoryitem where 
categorycode='$categorycode'");
        $sth->execute;
        my $total = $sth->fetchrow_hashref;
-       print "TOTAL : $categorycode : $total->{'total'}<br>";
-       $sth->finish;
-       # FIXME - there's already a $sth in this scope.
-       my $sth=$dbh->prepare("select 
categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,finetype,bulk,enrolmentfee,issuelimit,reservefee,overduenoticerequired
 from categories where categorycode='$categorycode'");
-       $sth->execute;
-       my $data=$sth->fetchrow_hashref;
        $sth->finish;
        print mktablehdr;
        print mktablerow(2,'#99cc33',bold('Category 
code'),bold("$categorycode"),'/images/background-mem.gif');
--- 131,151 ----
        $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 categoryitem where 
categorycode='$categorycode'");
        $sth->execute;
        my $total = $sth->fetchrow_hashref;
        $sth->finish;
+       $template->param(total => $total->{'total'});
+       
+       my $sth2=$dbh->prepare("select 
categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,finetype,bulk,enrolmentfee,issuelimit,reservefee,overduenoticerequired
 from categories where categorycode='$categorycode'");
+       $sth2->execute;
+       my $data=$sth2->fetchrow_hashref;
+       $sth2->finish;
        print mktablehdr;
        print mktablerow(2,'#99cc33',bold('Category 
code'),bold("$categorycode"),'/images/background-mem.gif');
***************
*** 281,293 ****
                
mklink("$script_name?op=delete_confirm&categorycode=".$results->[$i]{'categorycode'},'Delete'));
        }
!       print mktableft;
! print <<printend
!       <form action='$script_name' method=post>
!       <input type=hidden name=op value=add_form>
!       <input type=image src="/images/button-add-new.gif"  WIDTH=188  
HEIGHT=44  ALT="Add Category" BORDER=0 ></a><br>
!       </form>
! printend
!       ;
  } #---- END $OP eq DEFAULT
! print endmenu('categorie');
! print endpage();
--- 216,226 ----
                
mklink("$script_name?op=delete_confirm&categorycode=".$results->[$i]{'categorycode'},'Delete'));
        }
! 
! 
! 
  } #---- END $OP eq DEFAULT
! 
! 
! 
! output_html_with_http_headers $input, $cookie, $template->output;
!