Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

fixes for #395

Browse source
This commit is contained in:
tipaul 2003-06-13 14:41:32 +00:00
parent 28ed8b7b24
commit 5e3ed3cbad
3 changed files with 19 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
admin/categorie.pl
View file

@ -96,7 +96,7 @@ if ($op eq 'add_form') {
my $data;
if ($categorycode) {
my $dbh = C4::Context->dbh;
my $sth=$dbh->prepare("select categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,finetype,bulk,enrolmentfee,issuelimit,reservefee,overduenoticerequired from categories where categorycode='$categorycode'");
my $sth=$dbh->prepare("select categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,overduenoticerequired from categories where categorycode='$categorycode'");
$sth->execute;
$data=$sth->fetchrow_hashref;
$sth->finish;
@ -106,8 +106,6 @@ if ($op eq 'add_form') {
enrolmentperiod => $data->{'enrolmentperiod'},
upperagelimit => $data->{'upperagelimit'},
dateofbirthrequired => $data->{'dateofbirthrequired'},
finetype => $data->{'finetype'},
bulk => $data->{'bulk'},
enrolmentfee => $data->{'enrolmentfee'},
overduenoticerequired => $data->{'overduenoticerequired'},
issuelimit => $data->{'issuelimit'},
@ -118,14 +116,12 @@ if ($op eq 'add_form') {
} 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 (";
my $query = "replace categories (categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,overduenoticerequired) values (";
$query.= $dbh->quote($input->param('categorycode')).",";
$query.= $dbh->quote($input->param('description')).",";
$query.= $dbh->quote($input->param('enrolmentperiod')).",";
$query.= $dbh->quote($input->param('upperagelimit')).",";
$query.= $dbh->quote($input->param('dateofbirthrequired')).",";
$query.= $dbh->quote($input->param('finetype')).",";
$query.= $dbh->quote($input->param('bulk')).",";
$query.= $dbh->quote($input->param('enrolmentfee')).",";
$query.= $dbh->quote($input->param('issuelimit')).",";
$query.= $dbh->quote($input->param('reservefee')).",";
@ -146,7 +142,7 @@ if ($op eq 'add_form') {
$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'");
my $sth2=$dbh->prepare("select categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,overduenoticerequired from categories where categorycode='$categorycode'");
$sth2->execute;
my $data=$sth2->fetchrow_hashref;
$sth2->finish;
@ -158,8 +154,6 @@ if ($op eq 'add_form') {
enrolmentperiod => $data->{'enrolmentperiod'},
upperagelimit => $data->{'upperagelimit'},
dateofbirthrequired => $data->{'dateofbirthrequired'},
finetype => $data->{'finetype'},
bulk => $data->{'bulk'},
enrolmentfee => $data->{'enrolmentfee'},
overduenoticerequired => $data->{'overduenoticerequired'},
issuelimit => $data->{'issuelimit'},
@ -190,8 +184,6 @@ if ($op eq 'add_form') {
enrolmentperiod => $results->[$i]{'enrolmentperiod'},
upperagelimit => $results->[$i]{'upperagelimit'},
dateofbirthrequired => $results->[$i]{'dateofbirthrequired'},
finetype => $results->[$i]{'finetype'},
bulk => $results->[$i]{'bulk'},
enrolmentfee => $results->[$i]{'enrolmentfee'},
overduenoticerequired => $results->[$i]{'overduenoticerequired'},
issuelimit => $results->[$i]{'issuelimit'},

25
koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl
View file

@ -97,7 +97,7 @@
<tr>
<td>Enrollment period</td>
<td>
<input type=text name=enrolmentperiod size=2 maxlength=2 value=<TMPL_VAR NAME=enrolmentperiod>>
<input type=text name=enrolmentperiod size=3 maxlength=2 value=<TMPL_VAR NAME=enrolmentperiod>>
</td>
</tr>
<tr>
@ -109,19 +109,7 @@
<tr>
<td>Age Required</td>
<td>
<input type=text name=dateofbirthrequired value=<TMPL_VAR NAME=dateofbirthrequired>>
</td>
</tr>
<tr>
<td>Fine type</td>
<td>
<input type=text name=finetype size=30 maxlength=30 value=<TMPL_VAR NAME=finetype>>
</td>
</tr>
<tr>
<td>Bulk</td>
<td>
<input type=text name=bulk value=<TMPL_VAR NAME=bulk>>
<input type=text name=dateofbirthrequired value=<TMPL_VAR NAME=dateofbirthrequired> size=3 maxlength=2>
</td>
</tr>
<tr>
@ -133,7 +121,10 @@
<tr>
<td>Overdue notice required</td>
<td>
<input type=text name=overduenoticerequired value=<TMPL_VAR NAME=overduenoticerequired>>
<select name="overduenoticerequired">
<option <TMPL_UNLESS name="overduenoticerequired">selected</TMPL_UNLESS> value="0">No</option>
<option <TMPL_IF name="overduenoticerequired">selected</TMPL_IF> value="1">Yes</option>
</select>
</td>
</tr>
<tr>
@ -211,7 +202,7 @@
</tr>
<tr>
<td>Overdue notice required</td>
<td><TMPL_VAR NAME=overduenoticerequired></td>
<td><TMPL_IF NAME=overduenoticerequired>Yes<TMPL_ELSE>No</TMPL_IF></td>
</tr>
<tr>
<td>Issue limit</td>
@ -289,7 +280,7 @@
<td><TMPL_VAR NAME=finetype></td>
<td><TMPL_VAR NAME=bulk></td>
<td><TMPL_VAR NAME=enrolmentfee></td>
<td><TMPL_VAR NAME=overduenoticerequired></td>
<td><TMPL_IF NAME=overduenoticerequired>Yes<TMPL_ELSE>No</TMPL_IF></td>
<td><TMPL_VAR NAME=issuelimit></td>
<td><TMPL_VAR NAME=reservefee></td>
<td><a href="<TMPL_VAR NAME=script_name>?op=add_form&categorycode=<TMPL_VAR NAME=categorycode>">Edit</a></td>

25
koha-tmpl/intranet-tmpl/default/fr/parameters/categorie.tmpl
View file

@ -96,7 +96,7 @@
<tr>
<td>Enrollment</td>
<td>
<input type=text name=enrolmentperiod size=2 maxlength=2 value=<TMPL_VAR NAME=enrolmentperiod>>
<input type=text name=enrolmentperiod size=3 maxlength=2 value=<TMPL_VAR NAME=enrolmentperiod>>
</td>
</tr>
<tr>
@ -108,19 +108,7 @@
<tr>
<td>Age Minimum</td>
<td>
<input type=text name=dateofbirthrequired value=<TMPL_VAR NAME=dateofbirthrequired>>
</td>
</tr>
<tr>
<td>Profil</td>
<td>
<input type=text name=finetype size=30 maxlength=30 value=<TMPL_VAR NAME=finetype>>
</td>
</tr>
<tr>
<td>??</td>
<td>
<input type=text name=bulk value=<TMPL_VAR NAME=bulk>>
<input type=text name=dateofbirthrequired value=<TMPL_VAR NAME=dateofbirthrequired> size=3 maxlength=2>
</td>
</tr>
<tr>
@ -132,7 +120,10 @@
<tr>
<td>D&eacute;passement</td>
<td>
<input type=text name=overduenoticerequired value=<TMPL_VAR NAME=overduenoticerequired>>
<select name="overduenoticerequired">
<option <TMPL_UNLESS name="overduenoticerequired">selected</TMPL_UNLESS> value="0">Non</option>
<option <TMPL_IF name="overduenoticerequired">selected</TMPL_IF> value="1">Oui</option>
</select>
</td>
</tr>
<tr>
@ -210,7 +201,7 @@
</tr>
<tr>
<td>D&eacute;passement</td>
<td><TMPL_VAR NAME=overduenoticerequired></td>
<td><TMPL_IF NAME=overduenoticerequired>Oui<TMPL_ELSE>Non</TMPL_IF></td>
</tr>
<tr>
<td>Nb maxi emprunts</td>
@ -288,7 +279,7 @@
<td><TMPL_VAR NAME=finetype></td>
<td><TMPL_VAR NAME=bulk></td>
<td><TMPL_VAR NAME=enrolmentfee></td>
<td><TMPL_VAR NAME=overduenoticerequired></td>
<td><TMPL_IF NAME=overduenoticerequired>Oui<TMPL_ELSE>Non</TMPL_IF></td>
<td><TMPL_VAR NAME=issuelimit></td>
<td><TMPL_VAR NAME=reservefee></td>
<td><a href="<TMPL_VAR NAME=script_name>?op=add_form&categorycode=<TMPL_VAR NAME=categorycode>">Edit</a></td>