@@ -, +, @@ - Filter by groups using tabs - Filter by subgroups using a dropdown list under each tab - Allow to create new group and subgroups when building a new report or editing an existing report (no need to go through admin AV interface) + Possibility to duplicate a report (new link in the table) --- C4/Koha.pm | 21 + .../en/modules/reports/guided_reports_start.tt | 459 +++++++++++--------- reports/guided_reports.pl | 42 ++- 3 files changed, 315 insertions(+), 207 deletions(-) --- a/C4/Koha.pm +++ a/C4/Koha.pm @@ -63,6 +63,7 @@ BEGIN { &GetAuthorisedValueByCode &GetKohaImageurlFromAuthorisedValues &GetAuthValCode + &AddAuthorisedValue &GetNormalizedUPC &GetNormalizedISBN &GetNormalizedEAN @@ -1202,6 +1203,26 @@ sub GetKohaAuthorisedValueLib { return $value; } +=head2 AddAuthorisedValue + + AddAuthorisedValue($category, $authorised_value, $lib, $lib_opac); + +Create a new authorised value. + +=cut + +sub AddAuthorisedValue { + my ($category, $authorised_value, $lib, $lib_opac) = @_; + + my $dbh = C4::Context->dbh; + my $query = qq{ + INSERT INTO authorised_values (category, authorised_value, lib, lib_opac) + VALUES (?,?,?,?) + }; + my $sth = $dbh->prepare($query); + $sth->execute($category, $authorised_value, $lib, $lib_opac); +} + =head2 display_marc_indicators my $display_form = C4::Koha::display_marc_indicators($field); --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt @@ -14,36 +14,107 @@ [% END %] [% END %] + [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'calendar.inc' %] - - - + +[% INCLUDE 'datatables-strings.inc' %] + @@ -148,65 +250,78 @@ canned reports and writing custom SQL reports.
[% IF ( saved1 ) %] [% IF ( savedreports ) %]ID | -Report name | -Type | -Area | -Group | -Subgroup | -Notes | -Author | -Creation date | -Public | - [% IF (usecache) %]Cache expiry (seconds) | [% END %] -Saved results | -Saved SQL | -- | - | |
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
[% savedreport.id %] | -[% savedreport.report_name %] | -[% savedreport.type %] | -[% savedreport.areaname %] | -[% savedreport.groupname %] | -[% savedreport.subgroupname %] | -[% savedreport.notes %] | -[% savedreport.borrowersurname %][% IF ( savedreport.borrowerfirstname ) %], [% savedreport.borrowerfirstname %][% END %] ([% savedreport.borrowernumber %]) | -[% savedreport.date_created %] | -[% IF (savedreport.public) %] -Yes | -[% ELSE %] -No | -[% END %] -[% IF (usecache) %][% savedreport.cache_expiry %] | [% END %] -[% IF ( savedreport.date_run ) %][% savedreport.date_run %][% END %] - | -
- Show
- [% IF ( CAN_user_reports_create_reports ) %]
- Edit
+
+
|
-Run -Schedule | - [% IF ( CAN_user_reports_create_reports ) %] -Delete | - [% END %] -
ID | +Report name | +Type | +Group | +Subgroup | +Notes | +Author | +Creation date | +Public | + [% IF (usecache) %]Cache expiry (seconds) | [% END %] +Saved results | +Saved SQL | ++ | + | |
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
[% savedreport.id %] | +[% savedreport.report_name %] | +[% savedreport.type %] | +[% savedreport.groupname %] | +[% savedreport.subgroupname %] | +[% savedreport.notes %] | +[% savedreport.borrowersurname %][% IF ( savedreport.borrowerfirstname ) %], [% savedreport.borrowerfirstname %][% END %] ([% savedreport.borrowernumber %]) | +[% savedreport.date_created %] | + [% IF (savedreport.public) %] +Yes | + [% ELSE %] +No | + [% END %] + [% IF (usecache) %][% savedreport.cache_expiry %] | [% END %] +[% IF ( savedreport.date_run ) %][% savedreport.date_run %][% END %] + | ++ Show + [% IF ( CAN_user_reports_create_reports ) %] + Edit + Duplicate + [% END %] + | ++ Run + Schedule + | + [% IF ( CAN_user_reports_create_reports ) %] +Delete | + [% END %] +