This patch add 2 columns in "Use Saved" page whith creation date, and the creator id. It fix the creation of a report, to save the borrowernumber in reports table(to show it after). --- C4/Reports/Guided.pm | 12 +++++++++--- .../en/modules/reports/guided_reports_start.tmpl | 4 +++- reports/guided_reports.pl | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/C4/Reports/Guided.pm b/C4/Reports/Guided.pm index ff51ecb..03ee9ff 100644 --- a/C4/Reports/Guided.pm +++ b/C4/Reports/Guided.pm @@ -24,6 +24,7 @@ use Carp; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); use C4::Context; +use C4::Dates qw/format_date/; use C4::Output; use C4::Dates; use XML::Simple; @@ -437,13 +438,13 @@ Given some sql and a name this will saved it so that it can resued =cut sub save_report { - my ( $sql, $name, $type, $notes ) = @_; + my ( $borrowernumber, $sql, $name, $type, $notes ) = @_; my $dbh = C4::Context->dbh(); $sql =~ s/(\s*\;\s*)$//; # removes trailing whitespace and /;/ my $query = "INSERT INTO saved_sql (borrowernumber,date_created,last_modified,savedsql,report_name,type,notes) VALUES (?,now(),now(),?,?,?,?)"; my $sth = $dbh->prepare($query); - $sth->execute( 0, $sql, $name, $type, $notes ); + $sth->execute( $borrowernumber, $sql, $name, $type, $notes ); } sub update_sql { @@ -516,7 +517,12 @@ sub get_saved_reports { ORDER by date_created"; my $sth = $dbh->prepare($query); $sth->execute(); - return $sth->fetchall_arrayref({}); + + my $result = $sth->fetchall_arrayref({}); + foreach (@$result){ + $_->{date_created} = format_date($_->{date_created}); + } + return $result; } sub get_saved_report { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl index 67dc404..051a870 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl @@ -103,11 +103,13 @@ canned reports and writing custom SQL reports.</p> <p>Choose the report to run from the list</p> <form action="/cgi-bin/koha/reports/guided_reports.pl"> <table> -<tr><th>Report Name</th><th>Type</th><th>Notes</th><th>Saved Results</th><th>Saved SQL</th><th colspan="3"> </th></tr> +<tr><th>Report Name</th><th>Type</th><th>Notes</th><th>Author</th><th>Creation Date</th><th>Saved Results</th><th>Saved SQL</th><th colspan="3"> </th></tr> <!-- TMPL_LOOP NAME="savedreports" --> <tr><td><!-- TMPL_VAR NAME="report_name" --></td> <td><!-- TMPL_VAR NAME="type" --></td> <td><!-- TMPL_VAR NAME="notes" --></td> +<td><!-- TMPL_VAR NAME="borrowernumber" --></td> +<td><!-- TMPL_VAR NAME="date_created" --></td> <td><!-- TMPL_IF NAME="date_run" --><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=retrieve%20results&id=<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR NAME="date_run" --></a><!-- /TMPL_IF --> </td> <td><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=<!-- TMPL_VAR NAME="id" -->&phase=Show%20SQL">Show SQL</a> diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl index bf20310..e9a31bf 100755 --- a/reports/guided_reports.pl +++ b/reports/guided_reports.pl @@ -332,7 +332,7 @@ elsif ( $phase eq 'Save Report' ) { ); } else { - save_report( $sql, $name, $type, $notes ); + save_report( $borrowernumber, $sql, $name, $type, $notes ); $template->param( 'save_successful' => 1, ); -- 1.6.0.4 _______________________________________________ Koha-patches mailing list Koha-patches@lists.koha.org http://lists.koha.org/mailman/listinfo/koha-patches