@@ -, +, @@
- A fix for Bug 18154, Show card number in suggestion details view.
- Changes for brevity to labels in the suggestion details & edit view.
- Addition of the datepicker class to date fields in the suggestion edit
view.
---
.../prog/en/modules/suggestion/suggestion.tt | 48 ++++++++++++++--------
suggestion/suggestion.pl | 1 +
2 files changed, 32 insertions(+), 17 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -262,20 +262,34 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o
Date By
- Suggestion creation
+ Created by:
[% suggesteddate | $KohaDates %]
- [% IF ( suggestedby_borrowernumber ) %][% suggestedby_surname %], [% suggestedby_firstname %] [% Branches.GetName( suggestedby_branchcode ) %] ([% suggestedby_description %])[% END %]
+
+ [% IF ( suggestedby_borrowernumber ) %]
+ [% suggestedby_surname %], [% suggestedby_firstname %] ([% suggestedby_cardnumber %])
+ [% Branches.GetName( suggestedby_branchcode ) %] ([% suggestedby_description %])
+ [% END %]
- Suggestion management
+ Managed by:
[% manageddate | $KohaDates %]
- [% IF ( managedby_borrowernumber ) %][% managedby_surname %], [% managedby_firstname %] [% Branches.GetName( managedby_branchcode ) %] ([% managedby_description %])[% END %]
+
+ [% IF ( managedby_borrowernumber ) %]
+ [% managedby_surname %], [% managedby_firstname %] ([% suggestedby_cardnumber %])
+ [% Branches.GetName( managedby_branchcode ) %] ([% managedby_description %])
+ [% END %]
+
- Suggestion accepted
+ Accepted on:
[% accepteddate | $KohaDates %]
- [% IF ( acceptedby_borrowernumber ) %][% acceptedby_surname %], [% acceptedby_firstname %] [% Branches.GetName( acceptedby_branchcode ) %] ([% acceptedby_description %])[% END %]
+
+ [% IF ( acceptedby_borrowernumber ) %]
+ [% acceptedby_surname %], [% acceptedby_firstname %] ([% suggestedby_cardnumber %])
+ [% Branches.GetName( acceptedby_branchcode ) %] ([% acceptedby_description %])
+ [% END %]
+
@@ -405,20 +419,20 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o
Date By
- Suggestion creation
-
- [% IF ( suggestedby_borrowernumber ) %][% suggestedby_surname %], [% suggestedby_firstname %] [% Branches.GetName( suggestedby_branchcode ) %] ([% suggestedby_description %])[% END %]
+ Created by:
+ [% INCLUDE 'date-format.inc' %]
+ [% IF ( suggestedby_borrowernumber ) %][% suggestedby_surname %], [% suggestedby_firstname %] ([% suggestedby_cardnumber %]) [% Branches.GetName( suggestedby_branchcode ) %] ([% suggestedby_description %])[% END %]
- Suggestion management
-
- [% IF ( managedby_borrowernumber ) %][% managedby_surname %], [% managedby_firstname %] [% Branches.GetName( managedby_branchcode ) %] ([% managedby_description %])[% END %]
+ Managed by:
+ [% INCLUDE 'date-format.inc' %]
+ [% IF ( managedby_borrowernumber ) %][% managedby_surname %], [% managedby_firstname %] ([% suggestedby_cardnumber %]) [% Branches.GetName( managedby_branchcode ) %] ([% managedby_description %])[% END %]
- Suggestion accepted
-
- [% IF ( acceptedby_borrowernumber ) %][% acceptedby_surname %], [% acceptedby_firstname %] [% Branches.GetName( acceptedby_branchcode ) %] ([% acceptedby_description %])[% END %]
+ Accepted on:
+ [% INCLUDE 'date-format.inc' %]
+ [% IF ( acceptedby_borrowernumber ) %][% acceptedby_surname %], [% acceptedby_firstname %] ([% suggestedby_cardnumber %]) [% Branches.GetName( acceptedby_branchcode ) %] ([% acceptedby_description %])[% END %]
@@ -553,11 +567,11 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o
[% IF ( suggestions_loo.isbn ) %]; ISBN:[% suggestions_loo.isbn |html %] [% END %][% IF ( suggestions_loo.publishercode ) %]; Published by [% suggestions_loo.publishercode |html %] [% END %][% IF ( suggestions_loo.publicationyear ) %] in [% suggestions_loo.publicationyear |html %] [% END %][% IF ( suggestions_loo.place ) %] in [% suggestions_loo.place |html %] [% END %][% IF ( suggestions_loo.collectiontitle ) %]; [% suggestions_loo.collectiontitle |html %] [% END %][% IF ( suggestions_loo.itemtype ) %]; [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', suggestions_loo.itemtype, 0 ) %] [% END %] [% IF ( suggestions_loo.note ) %][% suggestions_loo.note |html%] [% END %]
- [% IF ( suggestions_loo.emailsuggestedby ) %][% END %][% suggestions_loo.surnamesuggestedby %][% IF ( suggestions_loo.firstnamesuggestedby ) %], [% suggestions_loo.firstnamesuggestedby %][% END %] [% IF (suggestions_loo.cardnumbersuggestedby ) %]([% suggestions_loo.cardnumbersuggestedby %])[% END %] [% IF ( suggestions_loo.emailsuggestedby ) %] [% END %]
+ [% suggestions_loo.surnamesuggestedby %][% IF ( suggestions_loo.firstnamesuggestedby ) %], [% suggestions_loo.firstnamesuggestedby %][% END %] [% IF (suggestions_loo.cardnumbersuggestedby ) %]([% suggestions_loo.cardnumbersuggestedby %])[% END %]
[% IF ( suggestions_loo.suggesteddate ) %] - [% suggestions_loo.suggesteddate | $KohaDates %][% END %]
- [% IF ( suggestions_loo.emailmanagedby ) %][% END %][% suggestions_loo.surnamemanagedby %][% IF ( suggestions_loo.firstnamemanagedby ) %], [% suggestions_loo.firstnamemanagedby %][% END %] [% IF ( suggestions_loo.emailmanagedby ) %] [% END %]
+ [% suggestions_loo.surnamemanagedby %][% IF ( suggestions_loo.firstnamemanagedby ) %], [% suggestions_loo.firstnamemanagedby %][% END %]
[% IF ( suggestions_loo.manageddate ) %] - [% suggestions_loo.manageddate | $KohaDates %][% END %]
--- a/suggestion/suggestion.pl
+++ a/suggestion/suggestion.pl
@@ -286,6 +286,7 @@ foreach my $element ( qw(managedby suggestedby acceptedby) ) {
$element."_borrowernumber"=>$$member{borrowernumber},
$element."_firstname"=>$$member{firstname},
$element."_surname"=>$$member{surname},
+ $element."_cardnumber"=>$$member{cardnumber},
$element."_branchcode"=>$$member{branchcode},
$element."_description"=>$$member{description},
$element."_category_type"=>$$member{category_type}
--