From e676d565da1cd4218cf823aea27667fa0288c075 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Sat, 6 May 2017 09:40:16 +0000 Subject: [PATCH] Bug 18154 - Show card number in detailled suggestion pages This patch modifies the main suggestion management page to link patron names to their details rather than with a "mailto:" link. This patch also includes the following changes: - 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. https://bugs.koha-community.org/show_bug.cgi?id=12349 --- .../prog/en/modules/suggestion/suggestion.tt | 48 ++++++++++++++-------- suggestion/suggestion.pl | 1 + 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt index 62335e8..7fd229f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ b/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  DateBy - 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  DateBy - - - [% IF ( suggestedby_borrowernumber ) %][% suggestedby_surname %], [% suggestedby_firstname %] [% Branches.GetName( suggestedby_branchcode ) %] ([% suggestedby_description %])[% END %] + + [% INCLUDE 'date-format.inc' %] + [% IF ( suggestedby_borrowernumber ) %][% suggestedby_surname %], [% suggestedby_firstname %] ([% suggestedby_cardnumber %]) [% Branches.GetName( suggestedby_branchcode ) %] ([% suggestedby_description %])[% END %] - - - [% IF ( managedby_borrowernumber ) %][% managedby_surname %], [% managedby_firstname %] [% Branches.GetName( managedby_branchcode ) %] ([% managedby_description %])[% END %] + + [% INCLUDE 'date-format.inc' %] + [% IF ( managedby_borrowernumber ) %][% managedby_surname %], [% managedby_firstname %] ([% suggestedby_cardnumber %]) [% Branches.GetName( managedby_branchcode ) %] ([% managedby_description %])[% END %] - - - [% IF ( acceptedby_borrowernumber ) %][% acceptedby_surname %], [% acceptedby_firstname %] [% Branches.GetName( acceptedby_branchcode ) %] ([% acceptedby_description %])[% END %] + + [% 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 %] diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl index fb97762..5c7fa0c 100755 --- a/suggestion/suggestion.pl +++ b/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} -- 2.1.4