[Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/tools/over...
Henri-Damien LAURENT
laurenthdl at alinto.com
Tue Feb 28 15:58:32 CET 2006
CVSROOT: /cvsroot/koha
Module name: koha
Branch:
Changes by: Henri-Damien LAURENT <hdl at savannah.gnu.org> 06/02/28 14:58:32
Modified files:
koha-tmpl/intranet-tmpl/prog/en/tools: overduerules.tmpl
tools : overduerules.pl
Log message:
Adding some checking and feedback.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/prog/en/tools/overduerules.tmpl.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/tools/overduerules.pl.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: koha/koha-tmpl/intranet-tmpl/prog/en/tools/overduerules.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/prog/en/tools/overduerules.tmpl:1.1 koha/koha-tmpl/intranet-tmpl/prog/en/tools/overduerules.tmpl:1.2
--- koha/koha-tmpl/intranet-tmpl/prog/en/tools/overduerules.tmpl:1.1 Mon Feb 27 18:15:41 2006
+++ koha/koha-tmpl/intranet-tmpl/prog/en/tools/overduerules.tmpl Tue Feb 28 14:58:32 2006
@@ -4,7 +4,12 @@
<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
<h1>Defining <!-- TMPL_IF NAME="branch" -->overdue rules for <!-- TMPL_VAR NAME="branch" --><!-- TMPL_ELSE -->default overdue rules<!-- /TMPL_IF --></h1>
-
+ <div class="help">
+ <p>Overdue will be taken into account provided that you input delays as numbers only.</p>
+ <p>Delay is a number of days for the older issue to be taken into account before doing an action (Sending a letter)</p>
+ <p>If you want Koha to do an action (send a letter or debar member), delay is needed.</p>
+ <p>Column 1 is supposed to be filled in first, then Second one then Third one.</p>
+ </div>
<form method="post" action="/cgi-bin/koha/tools/overduerules.pl">
<label for="branch">Select a branch :</label>
<select id="branch" name="branch">
@@ -13,11 +18,25 @@
<option value="<!-- TMPL_VAR NAME="value" -->"<!-- TMPL_IF NAME="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="branchname" --></option><!-- /TMPL_LOOP --></select>
<input type="submit" value="Select" />
</form>
+ <!--TMPL_IF Name="ERROR"-->
+ <h3>Data error</h3>
+ <p>The following fields have a forbidden value. Correct them and press OK again :</p><ul>
+ <!-- TMPL_IF NAME="ERRORDELAY" -->
+ <li>Delay <!--TMPL_VAR Name="ERRORDELAY"--> for <!--TMPL_VAR Name="bor"--> borrower category have some unexpected characters. There should be only numerical characters. </li>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="ERRORORDER" -->
+ <li>Delay1 should be less than Delay2 which should be less than Delay3 for <!--TMPL_VAR Name="bor"--> borrower category </li>
+ <!-- /TMPL_IF -->
+ </ul>
+ <!--/TMPL_IF -->
<form method="post" action="/cgi-bin/koha/tools/overduerules.pl">
<input type="hidden" name="op" value="save" />
<table>
- <caption>Defining Overdue rules for <!-- TMPL_VAR NAME="branch" --></caption>
+ <caption>Defining Overdue rules for <!--TMPL_IF Name="branch"--><!-- TMPL_VAR NAME="branch" --><!--TMPL_ELSE--> default branch <!--/TMPL_IF--> <!--TMPL_IF Name="datasaved"-->
+ <br /><h3 align="center">INPUT SAVED</h3>
+ <!--/TMPL_IF -->
+ </caption>
<tr>
<th> </th><th colspan="3" scope="col">First</th><th colspan="3" scope="col">Second</th><th colspan="3" scope="col">Third</th>
</tr>
Index: koha/tools/overduerules.pl
diff -u koha/tools/overduerules.pl:1.1 koha/tools/overduerules.pl:1.2
--- koha/tools/overduerules.pl:1.1 Mon Feb 27 18:15:41 2006
+++ koha/tools/overduerules.pl Tue Feb 28 14:58:32 2006
@@ -43,31 +43,54 @@
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => {parameters => 1, management => 1},
+ flagsrequired => {parameters => 1, tools => 1},
debug => 1,
});
-# save the values entered
+my $err=0;
+
+# save the values entered into tables
+my %temphash;
if ($op eq 'save') {
my @names=$input->param();
my $sth_search = $dbh->prepare("select count(*) as total from overduerules where branchcode=? and categorycode=?");
- my $sth_insert = $dbh->prepare("insert into overduerules (branchcode,categorycode, delay1,letter1,debarred1, delay2,letter2,debarred2, delay3,letter3,debarred3) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
+ my $sth_insert = $dbh->prepare("insert into overduerules (branchcode,categorycode, delay1,letter1,debarred1, delay2,letter2,debarred2, delay3,letter3,debarred3) values (?,?,?,?,?,?,?,?,?,?,?)");
my $sth_update=$dbh->prepare("Update overduerules set delay1=?, letter1=?, debarred1=?, delay2=?, letter2=?, debarred2=?, delay3=?, letter3=?, debarred3=? where branchcode=? and categorycode=?");
my $sth_delete=$dbh->prepare("delete from overduerules where branchcode=? and categorycode=?");
- my %temphash;
foreach my $key (@names){
# ISSUES
if ($key =~ /(.*)([1-3])-(.*)/) {
my $type = $1; # data type
my $num = $2; # From 1 to 3
my $bor = $3; # borrower category
- $temphash{$bor}->{"$type$num"}=$input->param("$key");
+ $temphash{$bor}->{"$type$num"}=$input->param("$key") if (($input->param("$key") ne "") or ($input->param("$key")>0));
}
}
foreach my $bor (keys %temphash){
- $sth_search->execute($branch,$bor);
- my $res = $sth_search->fetchrow_hashref();
- if ($res->{'total'}>0) {
+ # Do some Checking here : delay1 < delay2 <delay3 all of them being numbers
+ # Raise error if not true
+ if ($temphash{$bor}->{delay1}=~/[^0-9]/ and $temphash{$bor}->{delay1} ne ""){
+ $template->param("ERROR"=>1,"ERRORDELAY"=>"delay1","BORERR"=>$bor);
+ $err=1;
+ } elsif ($temphash{$bor}->{delay2}=~/[^0-9]/ and $temphash{$bor}->{delay2} ne ""){
+ $template->param("ERROR"=>1,"ERRORDELAY"=>"delay2","BORERR"=>$bor);
+ $err=1;
+ } elsif ($temphash{$bor}->{delay3}=~/[^0-9]/ and $temphash{$bor}->{delay3} ne ""){
+ $template->param("ERROR"=>1,"ERRORDELAY"=>"delay3","BORERR"=>$bor);
+ $err=1;
+ }elsif ($temphash{$bor}->{delay3} and ($temphash{$bor}->{delay3}<=$temphash{$bor}->{delay2}
+ or $temphash{$bor}->{delay3}<=$temphash{$bor}->{delay1})
+ or $temphash{$bor}->{delay2} and ($temphash{$bor}->{delay2}<=$temphash{$bor}->{delay1})){
+ $template->param("ERROR"=>1,"ERRORORDER"=>1,"BORERR"=>$bor);
+ $err=1;
+ }
+ unless ($err){
+ if (($temphash{$bor}->{delay1} and ($temphash{$bor}->{"letter1"} or $temphash{$bor}->{"debarred1"}))
+ or ($temphash{$bor}->{delay2} and ($temphash{$bor}->{"letter2"} or $temphash{$bor}->{"debarred2"}))
+ or ($temphash{$bor}->{delay3} and ($temphash{$bor}->{"letter3"} or $temphash{$bor}->{"debarred3"}))) {
+ $sth_search->execute($branch,$bor);
+ my $res = $sth_search->fetchrow_hashref();
+ if ($res->{'total'}>0) {
$sth_update->execute(
($temphash{$bor}->{"delay1"}?$temphash{$bor}->{"delay1"}:0),
($temphash{$bor}->{"letter1"}?$temphash{$bor}->{"letter1"}:""),
@@ -81,7 +104,6 @@
$branch ,$bor
);
} else {
-# warn "insert overduenotice1: $data[0],delay1: $data[1], letter1 : $data[2],debarred1 : $data[3], notice2 : $data[4], delay2 : $data[5], letter2 : $data[6],debarred2 : $data[7], 3 : $data[8],3 : $data[9],3 : $data[10],3 : $data[11], $br ,$bor ";
$sth_insert->execute($branch,$bor,
($temphash{$bor}->{"delay1"}?$temphash{$bor}->{"delay1"}:0),
($temphash{$bor}->{"letter1"}?$temphash{$bor}->{"letter1"}:""),
@@ -94,8 +116,10 @@
($temphash{$bor}->{"debarred3"}?$temphash{$bor}->{"debarred3"}:0)
);
}
+ }
+ }
}
-
+ unless ($err) {$template->param(datasaved=>1);}
}
my $branches = getbranches;
my @branchloop;
@@ -125,32 +149,52 @@
toggle => $toggle,
line => $data->{'description'}
);
- my $sth2=$dbh->prepare("SELECT * from overduerules WHERE branchcode=? and categorycode=?");
- $sth2->execute($branch,$data->{'categorycode'});
- my $dat=$sth2->fetchrow_hashref;
-# foreach my $test (keys %$dat){
-# warn "$test : ".$dat->{$test};
-# }
- for (my $i=1;$i<=3;$i++){
- if ($countletters){
- my @letterloop;
- foreach my $thisletter (keys %$letters) {
- my $selected = 1 if $thisletter eq $dat->{"letter$i"};
- my %letterrow =(value => $thisletter,
- selected => $selected,
- lettername => $letters->{$thisletter},
- );
- push @letterloop, \%letterrow;
+ if (%temphash){
+ for (my $i=1;$i<=3;$i++){
+ $row{"delay$i"}=$temphash{$data->{'categorycode'}}->{"delay$i"};
+ $row{"debarred$i"}=$temphash{$data->{'categorycode'}}->{"debarred$i"};
+ if ($countletters){
+ my @letterloop;
+ foreach my $thisletter (keys %$letters) {
+ my $selected = 1 if $thisletter eq $temphash{$data->{'categorycode'}}->{"letter$i"};
+ my %letterrow =(value => $thisletter,
+ selected => $selected,
+ lettername => $letters->{$thisletter},
+ );
+ push @letterloop, \%letterrow;
+ }
+ $row{"letterloop$i"}=\@letterloop;
+ } else {
+ $row{"noletter"}=1;
+ $row{"letter$i"}=$temphash{$data->{'categorycode'}}->{"letter$i"};
+ }
+ }
+ } else {
+ #getting values from table
+ my $sth2=$dbh->prepare("SELECT * from overduerules WHERE branchcode=? and categorycode=?");
+ $sth2->execute($branch,$data->{'categorycode'});
+ my $dat=$sth2->fetchrow_hashref;
+ for (my $i=1;$i<=3;$i++){
+ if ($countletters){
+ my @letterloop;
+ foreach my $thisletter (keys %$letters) {
+ my $selected = 1 if $thisletter eq $dat->{"letter$i"};
+ my %letterrow =(value => $thisletter,
+ selected => $selected,
+ lettername => $letters->{$thisletter},
+ );
+ push @letterloop, \%letterrow;
+ }
+ $row{"letterloop$i"}=\@letterloop;
+ } else {
+ $row{"noletter"}=1;
+ if ($dat->{"letter$i"}){$row{"letter$i"}=$dat->{"letter$i"};}
}
- $row{"letterloop$i"}=\@letterloop;
- } else {
- $row{"noletter"}=1;
- if ($dat->{"letter$i"}){$row{"letter$i"}=$dat->{"letter$i"};}
+ if ($dat->{"delay$i"}){$row{"delay$i"}=$dat->{"delay$i"};}
+ if ($dat->{"debarred$i"}){$row{"debarred$i"}=$dat->{"debarred$i"};}
}
- if ($dat->{"delay$i"}){$row{"delay$i"}=$dat->{"delay$i"};}
- if ($dat->{"debarred$i"}){$row{"debarred$i"}=$dat->{"debarred$i"};}
+ $sth2->finish;
}
- $sth2->finish;
push @line_loop,\%row;
}
$sth->finish;
More information about the Koha-cvs
mailing list