X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=tools%2Foverduerules.pl;h=a7d65102ad993eaf2fe6a9c0f396c618707f1da0;hb=a9ef88fdb4cdff8343bc358bc905bc64b2fef908;hp=8378496c2732ce1e72702720aa69f152c90c5cbe;hpb=6cb546ecab6429480202f292b4310abc14035eec;p=koha.git

diff --git a/tools/overduerules.pl b/tools/overduerules.pl
index 8378496c27..a7d65102ad 100755
--- a/tools/overduerules.pl
+++ b/tools/overduerules.pl
@@ -18,25 +18,52 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
+use warnings;
 use CGI;
 use C4::Context;
 use C4::Output;
 use C4::Auth;
 use C4::Koha;
-use C4::Branch; # GetBranches
+use C4::Branch;
 use C4::Letters;
 use C4::Members;
 
 my $input = new CGI;
 my $dbh = C4::Context->dbh;
 
+my @categories = @{$dbh->selectall_arrayref(
+    'SELECT description, categorycode FROM categories WHERE overduenoticerequired > 0',
+    { Slice => {} }
+)};
+my @category_codes  = map { $_->{categorycode} } @categories;
+my @rule_params     = qw(delay letter debarred);
+
+# blank_row($category_code) - return true if the entire row is blank.
+sub blank_row {
+    my ($category_code) = @_;
+    for my $rp (@rule_params) {
+        for my $n (1 .. 3) {
+            my $key   = "${rp}${n}-$category_code";
+            
+            if (utf8::is_utf8($key)) {
+              utf8::encode($key);
+            }
+            
+            my $value = $input->param($key);
+            if ($value) {
+                return 0;
+            }
+        }
+    }
+    return 1;
+}
+
 my $type=$input->param('type');
 my $branch = $input->param('branch');
-$branch="" unless $branch;
+$branch ||= q{};
 my $op = $input->param('op');
+$op ||= q{};
 
-# my $flagsrequired;
-# $flagsrequired->{circulation}=1;
 my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "tools/overduerules.tmpl",
                             query => $input,
@@ -63,9 +90,19 @@ if ($op eq 'save') {
                     my $type = $1; # data type
                     my $num = $2; # From 1 to 3
                     my $bor = $3; # borrower category
-                    $temphash{$bor}->{"$type$num"}=$input->param("$key") if (($input->param("$key") ne "") or ($input->param("$key")>0));
+                    my $value = $input->param($key);
+                    if ($type eq 'delay') {
+                        $temphash{$bor}->{"$type$num"} = ($value =~ /^\d+$/ && int($value) > 0) ? int($value) : '';
+                    } else {
+                        # type is letter
+                        $temphash{$bor}->{"$type$num"} = $value if $value ne '';
+                    }
             }
     }
+
+    # figure out which rows need to be deleted
+    my @rows_to_delete = grep { blank_row($_) } @category_codes;
+
     foreach my $bor (keys %temphash){
         # get category name if we need it for an error message
         my $bor_category = GetBorrowercategory($bor);
@@ -133,40 +170,26 @@ if ($op eq 'save') {
         }
     }
     unless ($err) {
-        $template->param(datasaved=>1);
+        for my $category_code (@rows_to_delete) {
+            $sth_delete->execute($branch, $category_code);
+        }
+        $template->param(datasaved => 1);
         $input_saved = 1;
     }
 }
-my $branches = GetBranches();
-my @branchloop;
-foreach my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
-        my $selected = 1 if $thisbranch eq $branch;
-        my %row =(value => $thisbranch,
-                                selected => $selected,
-                                branchname => $branches->{$thisbranch}->{'branchname'},
-                        );
-        push @branchloop, \%row;
-}
+my $branchloop = GetBranchesLoop($branch);
 
 my $letters = GetLetters("circulation");
 
-my $countletters = scalar $letters;
+my $countletters = keys %{$letters};
 
-my $sth=$dbh->prepare("SELECT description,categorycode FROM categories WHERE overduenoticerequired>0 ORDER BY description");
-$sth->execute;
 my @line_loop;
-my $toggle= 1;
-# my $i=0;
-while (my $data=$sth->fetchrow_hashref){
-    if ( $toggle eq 1 ) {
-        $toggle = 0;
-    } else {
-        $toggle = 1;
-    }
-    my %row = ( overduename => $data->{'categorycode'},
-                toggle => $toggle,
-                line => $data->{'description'}
-                );
+
+for my $data (@categories) {
+    my %row = (
+        overduename => $data->{'categorycode'},
+        line        => $data->{'description'}
+    );
     if (%temphash and not $input_saved){
         # if we managed to save the form submission, don't
         # reuse %temphash, but take the values from the
@@ -178,7 +201,11 @@ while (my $data=$sth->fetchrow_hashref){
             if ($countletters){
                 my @letterloop;
                 foreach my $thisletter (sort { $letters->{$a} cmp $letters->{$b} } keys %$letters) {
-                    my $selected = 1 if $thisletter eq $temphash{$data->{'categorycode'}}->{"letter$i"};
+                    my $selected;
+                    if ( $temphash{$data->{categorycode}}->{"letter$i"} &&
+                        $thisletter eq $temphash{$data->{'categorycode'}}->{"letter$i"}) {
+                        $selected = 1;
+                    }
                     my %letterrow =(value => $thisletter,
                                     selected => $selected,
                                     lettername => $letters->{$thisletter},
@@ -200,7 +227,10 @@ while (my $data=$sth->fetchrow_hashref){
             if ($countletters){
                 my @letterloop;
                 foreach my $thisletter (sort { $letters->{$a} cmp $letters->{$b} } keys %$letters) {
-                    my $selected = 1 if $thisletter eq $dat->{"letter$i"};
+                    my $selected;
+                    if ($dat->{"letter$i"} && $thisletter eq $dat->{"letter$i"}) {
+                        $selected = 1;
+                    }
                     my %letterrow =(value => $thisletter,
                                     selected => $selected,
                                     lettername => $letters->{$thisletter},
@@ -215,13 +245,11 @@ while (my $data=$sth->fetchrow_hashref){
             if ($dat->{"delay$i"}){$row{"delay$i"}=$dat->{"delay$i"};}
             if ($dat->{"debarred$i"}){$row{"debarred$i"}=$dat->{"debarred$i"};}
         }
-        $sth2->finish;
     }
     push @line_loop,\%row;
 }
-$sth->finish;
 
 $template->param(table=> \@line_loop,
-                branchloop => \@branchloop,
+                branchloop => $branchloop,
                 branch => $branch);
 output_html_with_http_headers $input, $cookie, $template->output;