Lowering truncation threshold for display of system preference values to better accom...

[koha.git] / admin / finesrules.pl

diff --git a/admin/finesrules.pl b/admin/finesrules.pl
index b5fdeb7..e89e7ad 100755 (executable)
--- a/admin/finesrules.pl
+++ b/admin/finesrules.pl
@@ -31,47 +31,44 @@ my $dbh = C4::Context->dbh;
 
 my $type=$input->param('type');
 my $branch = $input->param('branch');
-$branch="" unless $branch;
+$branch="*" unless $branch;
 my $op = $input->param('op');
 
 # my $flagsrequired;
 # $flagsrequired->{circulation}=1;
 my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "admin/finesrules.tmpl",
-                             query => $input,
-                             type => "intranet",
-                             authnotrequired => 0,
-                            flagsrequired => {parameters => 1},
-                             debug => 1,
+                            query => $input,
+                            type => "intranet",
+                            authnotrequired => 0,
+                            flagsrequired => {parameters => 1},
+                            debug => 1,
                              });
 # save the values entered
 if ($op eq 'save') {
   my @names=$input->param();
-  my $sth_search = $dbh->prepare("select count(*) as total from issuingrules where branchcode=? and categorycode=? and itemtype=?");
+  my $sth_search = $dbh->prepare("SELECT count(*) AS total FROM issuingrules WHERE branchcode=? AND categorycode=? AND itemtype=?");
 
-  my $sth_Finsert = $dbh->prepare("insert into issuingrules (branchcode,categorycode,itemtype,fine,firstremind,chargeperiod) values (?,?,?,?,?,?)");
-  my $sth_Fupdate=$dbh->prepare("Update issuingrules set fine=?,firstremind=?,chargeperiod=? where branchcode=? and categorycode=? and itemtype=?");
-  my $sth_Fdelete=$dbh->prepare("delete from issuingrules where branchcode=? and categorycode=? and itemtype=? and issuelength=0");
+  my $sth_Finsert = $dbh->prepare("INSERT INTO issuingrules (branchcode,categorycode,itemtype,fine,firstremind,chargeperiod) VALUES (?,?,?,?,?,?)");
+  my $sth_Fupdate=$dbh->prepare("UPDATE issuingrules SET fine=?,firstremind=?,chargeperiod=? WHERE branchcode=? AND categorycode=? AND itemtype=?");
+  my $sth_Fdelete=$dbh->prepare("DELETE FROM issuingrules WHERE branchcode=? AND categorycode=? AND itemtype=? AND issuelength=0");
 
   foreach my $key (@names){
     # FINES
-    if ($key =~ /F-(.*)-(.*)\.(.*)/) {
-      my $br = $1; # branch
-      my $bor = $2; # borrower category
-      my $cat = $3; # item type
+    if ($key =~ /F-(.*)-(.*)-(.*)/) {
+      my $br = base64_to_str($1); # branch
+      my $bor = base64_to_str($2); # borrower category
+      my $cat = base64_to_str($3); # item type
       my $data=$input->param($key);
       my ($fine,$firstremind,$chargeperiod)=split(',',$data);
-#       warn "$br $bor $cat $fine $firstremind $chargeperiod";
-#                      if ($fine >0) {
-#       $br="*" unless ($br);
       $bor="*" unless ($bor);
       $cat="*" unless ($cat);
       $sth_search->execute($br,$bor,$cat);
       my $res = $sth_search->fetchrow_hashref();
-      if ($res->{total}) {
-              $sth_Fupdate->execute($fine,$firstremind,$chargeperiod,$br,$bor,$cat);
+      if ($res->{total} >0) {
+        $sth_Fupdate->execute($fine,$firstremind,$chargeperiod,$br,$bor,$cat);
       } else {
-              $sth_Finsert->execute($br,$bor,$cat,$fine,$firstremind,$chargeperiod);
+        $sth_Finsert->execute($br,$bor,$cat,$fine,$firstremind,$chargeperiod);
       }
     }
   }
@@ -80,12 +77,12 @@ if ($op eq 'save') {
 my $branches = GetBranches;
 my @branchloop;
 foreach my $thisbranch (keys %$branches) {
-       my $selected = 1 if $thisbranch eq $branch;
-       my %row =(value => $thisbranch,
-                               selected => $selected,
-                               branchname => $branches->{$thisbranch}->{'branchname'},
-                       );
-       push @branchloop, \%row;
+    my $selected = 1 if $thisbranch eq $branch;
+    my %row =(value => $thisbranch,
+            selected => $selected,
+            branchname => $branches->{$thisbranch}->{'branchname'},
+    );
+    push @branchloop, \%row;
 }
 
 my $sth=$dbh->prepare("Select description,categorycode from categories order by description");
@@ -94,10 +91,9 @@ my @trow3;
 my @title_loop;
 # my $i=0;
 while (my $data=$sth->fetchrow_hashref){
-       my %row = (in_title => $data->{'description'});
-       push @title_loop,\%row;
-       push @trow3,$data->{'categorycode'};
-#      $i++;
+    my %row = (in_title => $data->{'description'});
+    push @title_loop,\%row;
+    push @trow3,$data->{'categorycode'};
 }
 
 my %row = (in_title => "*");
@@ -114,36 +110,36 @@ my @itemtypes;
 while (my $row=$sth->fetchrow_hashref){
        push @itemtypes,\$row;
 }
-my $line;
-$line->{itemtype} = "*";
-$line->{description} = "*";
-push @itemtypes,\$line;
 
 foreach my $data (@itemtypes) {
-       my @trow2;
-       my @cell_loop;
-       if ( $toggle eq 1 ) {
-               $toggle = 0;
-       } else {
-               $toggle = 1;
-       }
-       for (my $i=0;$i<=$#trow3;$i++){
-               my $sth2=$dbh->prepare("select * from issuingrules where branchcode=? and categorycode=? and itemtype=?");
-               $sth2->execute($branch,$trow3[$i],$$data->{'itemtype'});
-               my $dat=$sth2->fetchrow_hashref;
-               $sth2->finish;
-               my $fine=$dat->{'fine'}+0;
-               my $finesvalue;
-               $finesvalue= "$fine,$dat->{'firstremind'},$dat->{'chargeperiod'}" if $fine+$dat->{'firstremind'}+$dat->{'chargeperiod'}>0;
-               my %row = (finesname=> "F-$branch-$trow3[$i].$$data->{'itemtype'}",
-                                       finesvalue => $finesvalue,
-                                       toggle => $toggle,
-                                       );
-               push @cell_loop,\%row;
-       }
-       my %row = (categorycode => $$data->{description},
-                                       cell =>\@cell_loop);
-       push @row_loop, \%row;
+    my @trow2;
+    my @cell_loop;
+    if ( $toggle eq 1 ) {
+        $toggle = 0;
+    } else {
+        $toggle = 1;
+    }
+    for (my $i=0;$i<=$#trow3;$i++){
+        my $sth2=$dbh->prepare("SELECT * FROM issuingrules WHERE branchcode=? AND categorycode=? AND itemtype=?");
+        $sth2->execute($branch,$trow3[$i],$$data->{'itemtype'});
+        my $dat=$sth2->fetchrow_hashref;
+        $sth2->finish;
+        my $fine=$dat->{'fine'};
+        # remove trailing 0s
+        $fine =~ s/\.*0*$//g;
+        my $finesvalue;
+        $finesvalue= "$fine,$dat->{'firstremind'},$dat->{'chargeperiod'}" if $fine ne '';
+        my $finesname = join("-", "F", map { str_to_base64($_) } ($branch, $trow3[$i], $$data->{'itemtype'}));
+        my %row = (finesname=> $finesname,
+                    finesvalue => $finesvalue,
+                    toggle => $toggle,
+                    );
+        push @cell_loop,\%row;
+    }
+    my %row = (categorycode => $$data->{description},
+                cell =>\@cell_loop,
+                );
+    push @row_loop, \%row;
 }
 
 $sth->finish;
@@ -151,8 +147,5 @@ $template->param(title => \@title_loop,
                 row => \@row_loop,
                 branchloop => \@branchloop,
                 branch => $branch,
-                intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-               intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-               IntranetNav => C4::Context->preference("IntranetNav"),
-                                               );
+                );
 output_html_with_http_headers $input, $cookie, $template->output;