From ad1e01866748203f1dcfd506bae5d6e365ce05f7 Mon Sep 17 00:00:00 2001 From: Paul Poulain Date: Wed, 28 Oct 2009 17:51:20 +0100 Subject: [PATCH] removing warn and reindenting + \\n fixes (for error message better display) --- admin/currency.pl | 165 +++++++++--------- .../prog/en/modules/admin/currency.tmpl | 153 ++++++++-------- 2 files changed, 160 insertions(+), 158 deletions(-) diff --git a/admin/currency.pl b/admin/currency.pl index ec0e198409..ecd7b91d76 100755 --- a/admin/currency.pl +++ b/admin/currency.pl @@ -46,11 +46,10 @@ use C4::Dates qw(format_date); use C4::Output; sub StringSearch { - my $query = "SELECT * FROM currency WHERE (currency LIKE ?) ORDER BY currency"; - warn "$query :: @_[0]"; - my $sth = C4::Context->dbh->prepare($query); - $sth->execute((shift || '') . '%'); - return $sth->fetchall_arrayref({}); + my $query = "SELECT * FROM currency WHERE (currency LIKE ?) ORDER BY currency"; + my $sth = C4::Context->dbh->prepare($query); + $sth->execute((shift || '') . '%'); + return $sth->fetchall_arrayref({}); } my $input = new CGI; @@ -63,8 +62,8 @@ my $pagesize = 20; my ($template, $loggedinuser, $cookie) = get_template_and_user({ template_name => "admin/currency.tmpl", query => $input, - type => "intranet", - flagsrequired => {parameters => 1}, + type => "intranet", + flagsrequired => {parameters => 1}, authnotrequired => 0, debug => 1, }); @@ -73,115 +72,115 @@ $searchfield=~ s/\,//g; $template->param(searchfield => $searchfield, - script_name => $script_name); + script_name => $script_name); my $dbh = C4::Context->dbh; ################## 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; - if ($searchfield) { - my $sth=$dbh->prepare("select * from currency where currency=?"); - $sth->execute($searchfield); - $data=$sth->fetchrow_hashref; - } - foreach (keys %$data) { - $template->param($_ => $data->{$_}); - } - - my $date = $template->param('timestamp'); - ($date) and $template->param('timestamp' => format_date($date)); - # END $OP eq ADD_FORM + $template->param(add_form => 1); + #---- if primkey exists, it's a modify action, so read values to modify... + my $data; + if ($searchfield) { + my $sth=$dbh->prepare("select * from currency where currency=?"); + $sth->execute($searchfield); + $data=$sth->fetchrow_hashref; + } + foreach (keys %$data) { + $template->param($_ => $data->{$_}); + } + + my $date = $template->param('timestamp'); + ($date) and $template->param('timestamp' => format_date($date)); + # 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 $check = $dbh->prepare("select count(*) as count from currency where currency = ?"); + $template->param(add_validate => 1); + my $dbh = C4::Context->dbh; + my $check = $dbh->prepare("select count(*) as count from currency where currency = ?"); - $dbh->do("UPDATE currency SET active = 0") if ( $input->param('active') == 1); + $dbh->do("UPDATE currency SET active = 0") if ( $input->param('active') == 1); - $check->execute($input->param('currency')); - my $count = $check->fetchrow ; - if ( $count > 0 ) - { - my $sth = $dbh->prepare(qq| + $check->execute($input->param('currency')); + my $count = $check->fetchrow ; + if ( $count > 0 ) + { + my $sth = $dbh->prepare(qq| UPDATE currency SET rate = ?, - symbol = ?, - active = ? - WHERE currency = ? | ); + symbol = ?, + active = ? + WHERE currency = ? | ); - $sth->execute( $input->param('rate'), + $sth->execute( $input->param('rate'), $input->param('symbol'), $input->param('active'), $input->param('currency'), ); - } - else - { - my $sth = $dbh->prepare(qq| + } + else + { + my $sth = $dbh->prepare(qq| INSERT INTO currency (currency, rate, symbol, active) VALUES (?,?,?,?) |); - $sth->execute( $input->param('currency'), + $sth->execute( $input->param('currency'), $input->param('rate'), $input->param('symbol'), $input->param('active'), ); - } - # END $OP eq ADD_VALIDATE + } + # 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 $sth=$dbh->prepare("select count(*) as total from aqbooksellers where currency=?"); - $sth->execute($searchfield); - my $total = $sth->fetchrow_hashref; - my $sth2=$dbh->prepare("select currency,rate from currency where currency=?"); - $sth2->execute($searchfield); - my $data=$sth2->fetchrow_hashref; - - if ($total->{'total'} >0) { - $template->param(totalgtzero => 1); - } - - $template->param(rate => $data->{'rate'}, - total => $total); - # END $OP eq DELETE_CONFIRM + $template->param(delete_confirm => 1); + my $sth=$dbh->prepare("select count(*) as total from aqbooksellers where currency=?"); + $sth->execute($searchfield); + my $total = $sth->fetchrow_hashref; + my $sth2=$dbh->prepare("select currency,rate from currency where currency=?"); + $sth2->execute($searchfield); + my $data=$sth2->fetchrow_hashref; + + if ($total->{'total'} >0) { + $template->param(totalgtzero => 1); + } + + $template->param(rate => $data->{'rate'}, + total => $total); + # END $OP eq DELETE_CONFIRM ################## DELETE_CONFIRMED ################################## # called by delete_confirm, used to effectively confirm deletion of data in DB } elsif ($op eq 'delete_confirmed') { - $template->param(delete_confirmed => 1); - my $sth=$dbh->prepare("delete from currency where currency=?"); - $sth->execute($searchfield); - # END $OP eq DELETE_CONFIRMED + $template->param(delete_confirmed => 1); + my $sth=$dbh->prepare("delete from currency where currency=?"); + $sth->execute($searchfield); + # END $OP eq DELETE_CONFIRMED ################## DEFAULT ################################## } else { # DEFAULT - $template->param(else => 1); + $template->param(else => 1); - my $results = StringSearch($searchfield); + my $results = StringSearch($searchfield); my $count = scalar(@$results); - my @loop; - for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){ + my @loop; + for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){ push @loop, { - currency => $results->[$i]{'currency'}, - rate => $results->[$i]{'rate'}, - symbol => $results->[$i]{'symbol'}, - timestamp => format_date($results->[$i]{'timestamp'}), - }; - } - $template->param(loop => \@loop); - - if ($offset>0) { - $template->param(offsetgtzero => 1, - prevpage => $offset-$pagesize); - } - - if ($offset+$pagesize < scalar @$results) { - $template->param(ltcount => 1, - nextpage => $offset+$pagesize); - } + currency => $results->[$i]{'currency'}, + rate => $results->[$i]{'rate'}, + symbol => $results->[$i]{'symbol'}, + timestamp => format_date($results->[$i]{'timestamp'}), + }; + } + $template->param(loop => \@loop); + + if ($offset>0) { + $template->param(offsetgtzero => 1, + prevpage => $offset-$pagesize); + } + + if ($offset+$pagesize < scalar @$results) { + $template->param(ltcount => 1, + nextpage => $offset+$pagesize); + } } #---- END $OP eq DEFAULT output_html_with_http_headers $input, $cookie, $template->output; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl index 9425f19ef4..eaaa8c4ca4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl @@ -17,16 +17,19 @@ var _alertString=""; var alertString2; if (f.currency.value.length==0) { - _alertString += "- Currency name missing\\n"; + _alertString += "- Currency name missing\n"; } if (f.rate.value.length==0) { - _alertString += "- Rate missing\\n"; + _alertString += "- Rate missing\n"; + } + if (f.symbol.value.length==0) { + _alertString += "- Symbol missing\n"; } if (_alertString.length==0) { document.Aform.submit(); } else { - alertString2 = "Form not submitted because of the following problem(s)\\n"; - alertString2 += "------------------------------------------------------------------------------------\\n\\n"; + alertString2 = "Form not submitted because of the following problem(s)\n"; + alertString2 += "------------------------------------------------------------------------------------\n"; alertString2 += _alertString; alert(alertString2); } @@ -52,15 +55,15 @@
- -
-
-
- + +
+
+
+ @@ -68,43 +71,43 @@
" name="Aform" method="post"> -
- - Modify currency - - New currency - -
    -
  1. - - Currency: - " /> - - - - -
    2. +
    + + Modify currency + + New currency + +
      +
    1. + + Currency: + " /> + + + + +
    2. - - " /> -
      3. + + " /> +
    3. - - " /> -
      4. + + " /> +
    4. - -
      5. + +
    5. - + checked /> -
      6. + -
    +
- +
">Cancel
@@ -163,51 +166,51 @@

Currencies and Exchange Rates

- - You searched for - - - - - - - - - - - - - - - - - - - - - - - + +
CurrencyRateSymbolLast UpdatedActiveActions 
+ + You searched for + + + + + + + + + + + + + + + + + + + + + + + - + - - -
CurrencyRateSymbolLast UpdatedActiveActions 
✓ ?op=add_form&searchfield=">Edit?op=add_form&searchfield=">Edit ?op=delete_confirm&searchfield=">Delete
+

Hint: Your 'active' currency should have it's exchange rate set to '1.00000'

- - - ?offset="><< Previous - + + + ?offset="><< Previous + - - ?offset=">Next >> - + + ?offset=">Next >> + -- 2.39.5