removing warn and reindenting
+ \\n fixes (for error message better display)
This commit is contained in:
Paul Poulain
parent
a4662fd614
commit
ad1e018667
2 changed files with 153 additions and 151 deletions
|
|
@ -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->{$_});
|
||||
}
|
||||
$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
|
||||
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;
|
||||
$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);
|
||||
}
|
||||
if ($total->{'total'} >0) {
|
||||
$template->param(totalgtzero => 1);
|
||||
}
|
||||
|
||||
$template->param(rate => $data->{'rate'},
|
||||
total => $total);
|
||||
# END $OP eq DELETE_CONFIRM
|
||||
$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);
|
||||
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>0) {
|
||||
$template->param(offsetgtzero => 1,
|
||||
prevpage => $offset-$pagesize);
|
||||
}
|
||||
|
||||
if ($offset+$pagesize < scalar @$results) {
|
||||
$template->param(ltcount => 1,
|
||||
nextpage => $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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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 @@
|
|||
</div>
|
||||
|
||||
<div id="doc3" class="yui-t2">
|
||||
|
||||
<div id="bd">
|
||||
<div id="yui-main">
|
||||
<div class="yui-b">
|
||||
|
||||
|
||||
<div id="bd">
|
||||
<div id="yui-main">
|
||||
<div class="yui-b">
|
||||
|
||||
<!-- TMPL_IF NAME="else" -->
|
||||
<div id="toolbar">
|
||||
<ul class="toolbar">
|
||||
<li><a id="newcurrency" href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form">New Currency</a></li>
|
||||
<ul class="toolbar">
|
||||
<li><a id="newcurrency" href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form">New Currency</a></li>
|
||||
</ul></div>
|
||||
<!-- /TMPL_IF -->
|
||||
|
||||
|
|
@ -68,43 +71,43 @@
|
|||
|
||||
<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
|
||||
<input type="hidden" name="op" value="add_validate" />
|
||||
<fieldset class="rows">
|
||||
<legend><!-- TMPL_IF NAME="searchfield" -->
|
||||
Modify currency
|
||||
<!-- TMPL_ELSE -->
|
||||
New currency
|
||||
<!-- /TMPL_IF --></legend>
|
||||
<ol>
|
||||
<li>
|
||||
<!-- TMPL_IF NAME="searchfield" -->
|
||||
<span class="label">Currency: </span>
|
||||
<input type="hidden" name="currency" id="currency" value="<!-- TMPL_VAR NAME="searchfield" -->" /><!-- TMPL_VAR NAME="searchfield" -->
|
||||
<!-- TMPL_ELSE -->
|
||||
<label for="currency">Currency: </label>
|
||||
<input type="text" name="currency" id="currency" size="50" maxlength="50" onblur="toUC(this);" />
|
||||
<!-- /TMPL_IF -->
|
||||
</li>
|
||||
<fieldset class="rows">
|
||||
<legend><!-- TMPL_IF NAME="searchfield" -->
|
||||
Modify currency
|
||||
<!-- TMPL_ELSE -->
|
||||
New currency
|
||||
<!-- /TMPL_IF --></legend>
|
||||
<ol>
|
||||
<li>
|
||||
<label for="rate">Rate: </label>
|
||||
<input type="text" name="rate" id="rate" size="10" maxlength="10" value="<!-- TMPL_VAR NAME="rate" -->" />
|
||||
</li>
|
||||
<!-- TMPL_IF NAME="searchfield" -->
|
||||
<span class="label">Currency: </span>
|
||||
<input type="hidden" name="currency" id="currency" value="<!-- TMPL_VAR NAME="searchfield" -->" /><!-- TMPL_VAR NAME="searchfield" -->
|
||||
<!-- TMPL_ELSE -->
|
||||
<label for="currency">Currency: </label>
|
||||
<input type="text" name="currency" id="currency" size="50" maxlength="50" onblur="toUC(this);" />
|
||||
<!-- /TMPL_IF -->
|
||||
</li>
|
||||
<li>
|
||||
<label for="symbol">Symbol: </label>
|
||||
<input type="text" name="symbol" id="symbol" size="5" maxlength="5" value="<!-- TMPL_VAR NAME="symbol" -->" />
|
||||
</li>
|
||||
<label for="rate">Rate: </label>
|
||||
<input type="text" name="rate" id="rate" size="10" maxlength="10" value="<!-- TMPL_VAR NAME="rate" -->" />
|
||||
</li>
|
||||
<li>
|
||||
<label for="symbol">Symbol: </label>
|
||||
<input type="text" name="symbol" id="symbol" size="5" maxlength="5" value="<!-- TMPL_VAR NAME="symbol" -->" />
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<label for="currency">Last Updated: </label><!-- TMPL_VAR NAME="timestamp" -->
|
||||
</li>
|
||||
<label for="currency">Last Updated: </label><!-- TMPL_VAR NAME="timestamp" -->
|
||||
</li>
|
||||
<li>
|
||||
<label for="currency">Active: </label>
|
||||
<label for="currency">Active: </label>
|
||||
<input type="checkbox" id="active" name="active" value="1"
|
||||
<!-- TMPL_IF NAME="active" --> checked <!-- /TMPL_IF --> />
|
||||
</li>
|
||||
</li>
|
||||
|
||||
</ol>
|
||||
</ol>
|
||||
</fieldset>
|
||||
|
||||
|
||||
<fieldset class="action">
|
||||
<input type="submit" value="Submit" onclick="Check(this.form)" /> <a class="cancel" href="<!-- TMPL_VAR NAME="script_name" -->">Cancel</a>
|
||||
</fieldset>
|
||||
|
|
@ -163,51 +166,51 @@
|
|||
<!-- TMPL_IF NAME="else" -->
|
||||
|
||||
<h2>Currencies and Exchange Rates</h2>
|
||||
<!-- TMPL_IF NAME="searchfield" -->
|
||||
You searched for <!-- TMPL_VAR NAME="searchfield" --></span>
|
||||
<!-- /TMPL_IF -->
|
||||
<!-- TMPL_IF NAME="searchfield" -->
|
||||
You searched for <!-- TMPL_VAR NAME="searchfield" --></span>
|
||||
<!-- /TMPL_IF -->
|
||||
|
||||
<table>
|
||||
<tr>
|
||||
<th>Currency</th>
|
||||
<th>Rate</th>
|
||||
<th>Symbol</th>
|
||||
<th>Last Updated</th>
|
||||
<th>Active</th>
|
||||
<th colspan="2">Actions </th>
|
||||
</tr>
|
||||
<!-- TMPL_LOOP NAME="loop" -->
|
||||
<!-- TMPL_UNLESS NAME="__odd__" -->
|
||||
<tr class="highlight">
|
||||
<!-- TMPL_ELSE -->
|
||||
<tr>
|
||||
<!-- /TMPL_UNLESS -->
|
||||
<td><!-- TMPL_VAR NAME="currency" --></td>
|
||||
<td><!-- TMPL_VAR NAME="rate" --></td>
|
||||
<td><!-- TMPL_VAR NAME="symbol" ESCAPE="HTML" --></td>
|
||||
<td><!-- TMPL_VAR NAME="timestamp" --></td>
|
||||
<table>
|
||||
<tr>
|
||||
<th>Currency</th>
|
||||
<th>Rate</th>
|
||||
<th>Symbol</th>
|
||||
<th>Last Updated</th>
|
||||
<th>Active</th>
|
||||
<th colspan="2">Actions </th>
|
||||
</tr>
|
||||
<!-- TMPL_LOOP NAME="loop" -->
|
||||
<!-- TMPL_UNLESS NAME="__odd__" -->
|
||||
<tr class="highlight">
|
||||
<!-- TMPL_ELSE -->
|
||||
<tr>
|
||||
<!-- /TMPL_UNLESS -->
|
||||
<td><!-- TMPL_VAR NAME="currency" --></td>
|
||||
<td><!-- TMPL_VAR NAME="rate" --></td>
|
||||
<td><!-- TMPL_VAR NAME="symbol" ESCAPE="HTML" --></td>
|
||||
<td><!-- TMPL_VAR NAME="timestamp" --></td>
|
||||
|
||||
<td><!-- TMPL_IF NAME="active" -->
|
||||
<td><!-- TMPL_IF NAME="active" -->
|
||||
<font COLOR="#00FF00">✓</font>
|
||||
<!-- /TMPL_IF -->
|
||||
</td>
|
||||
|
||||
<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&searchfield=<!-- TMPL_VAR NAME="currency" -->">Edit</a></td>
|
||||
<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&searchfield=<!-- TMPL_VAR NAME="currency" -->">Edit</a></td>
|
||||
<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&searchfield=<!-- TMPL_VAR NAME="currency" -->">Delete</a></td>
|
||||
</tr>
|
||||
<!-- /TMPL_LOOP -->
|
||||
</table>
|
||||
</tr>
|
||||
<!-- /TMPL_LOOP -->
|
||||
</table>
|
||||
<br>
|
||||
<p><b>Hint:</b> Your 'active' currency should have it's exchange rate set to '1.00000'</p>
|
||||
|
||||
|
||||
<!-- TMPL_IF NAME="offsetgtzero" -->
|
||||
<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->"><< Previous</a>
|
||||
<!-- /TMPL_IF -->
|
||||
|
||||
<!-- TMPL_IF NAME="offsetgtzero" -->
|
||||
<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->"><< Previous</a>
|
||||
<!-- /TMPL_IF -->
|
||||
|
||||
<!-- TMPL_IF NAME="ltcount" -->
|
||||
<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">Next >></a>
|
||||
<!-- /TMPL_IF -->
|
||||
<!-- TMPL_IF NAME="ltcount" -->
|
||||
<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">Next >></a>
|
||||
<!-- /TMPL_IF -->
|
||||
|
||||
<!-- /TMPL_IF -->
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue