From 2ca6d76e6feaf6f7508566fddfdb8636a5fa5f80 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 22 Feb 2012 15:30:38 +0100 Subject: [PATCH 1/1] Bug 7577: Adds a display page for suggestions --- .../prog/en/modules/acqui/neworderempty.tt | 2 +- .../prog/en/modules/acqui/orderreceive.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 4 +- .../prog/en/modules/suggestion/suggestion.tt | 141 ++++++++++++++++++-- suggestion/suggestion.pl | 17 ++- 5 files changed, 148 insertions(+), 18 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt index a27d151..e6464f2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -326,7 +326,7 @@ $(document).ready(function()
  1. Suggested by: - [% surnamesuggestedby %][% IF ( firstnamesuggestedby ) %], [% firstnamesuggestedby %][% END %] (suggestion #[% suggestionid %]) + [% surnamesuggestedby %][% IF ( firstnamesuggestedby ) %], [% firstnamesuggestedby %][% END %] (suggestion #[% suggestionid %])
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt index e238278..3eb3e23 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -42,7 +42,7 @@
  1. Suggested by: - [% surnamesuggestedby %][% IF ( firstnamesuggestedby ) %], [% firstnamesuggestedby %][% END %] (suggestion #[% suggestionid %]) + [% surnamesuggestedby %][% IF ( firstnamesuggestedby ) %], [% firstnamesuggestedby %][% END %] (suggestion #[% suggestionid %])
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt index afc9b65..786c5be 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -244,7 +244,7 @@ [% IF ( loop_order.suggestionid ) %]
Suggested by: [% loop_order.surnamesuggestedby %][% IF ( loop_order.firstnamesuggestedby ) %], [% loop_order.firstnamesuggestedby %] [% END %] - (suggestion #[% loop_order.suggestionid %]) + (suggestion #[% loop_order.suggestionid %]) [% END %] MARC | Card @@ -369,7 +369,7 @@ [% IF ( loop_receive.suggestionid ) %]
Suggested by: [% loop_receive.surnamesuggestedby %][% IF ( loop_receive.firstnamesuggestedby ) %], [% loop_receive.firstnamesuggestedby %] [% END %] - (suggestion #[% loop_receive.suggestionid %]) + (suggestion #[% loop_receive.suggestionid %]) [% END %] MARC | Card 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 47ee96a..1f72e4f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -1,5 +1,19 @@ -[% INCLUDE 'doc-head-open.inc' %]Koha › Acquisitions › -[% IF ( op_save ) %][% IF ( suttesionid ) %]Edit purchase suggestion #[% suggestionid %][% ELSE %]Enter a new purchase suggestion[% END %][% ELSE %]Suggestions Management[% END %] +[% INCLUDE 'doc-head-open.inc' %] +Koha › Acquisitions › + [% IF ( op_save ) %] + [% IF ( suggestionid) %] + [% IF ( op == 'show' ) %] + Show purchase suggestion #[% suggestionid %] + [% ELSE %] + Edit purchase suggestion #[% suggestionid %] + [% END %] + [% ELSE %] + Enter a new purchase suggestion + [% END %] + [% ELSE %] + Suggestions Management + [% END %] + [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'calendar.inc' %] [% IF ( op_else ) %] @@ -91,7 +105,114 @@ $(document).ready(function() { calcNewsuggTotal(); }); [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - + + +[% IF ( op == 'show' ) %] +
+
+
+
+ +
+ Bibliographic information +
    +
  1. [% title |html %]
  2. +
  3. [% author %]
  4. +
  5. [% copyrightdate %]
  6. +
  7. [% isbn %]
  8. +
  9. [% publishercode %]
  10. +
  11. [% place %]
  12. +
  13. [% collectiontitle %]
  14. +
  15. + [% FOREACH itemtypeloo IN itemtypeloop %] + [% IF ( itemtypeloo.selected ) %][% itemtypeloo.description %][% END %] + [% END %] +
  16. + [% IF ( patron_reason_loop ) %] +
  17. + [% FOREACH patron_reason_loo IN patron_reason_loop %] + [% IF ( patron_reason_loo.selected ) %][% patron_reason_loo.lib %][% END %] + [% END %] +
  18. + [% END %] +
  19. [% note %]
  20. +
+
+
Suggestion management +
    +
  1. + + [% IF ( STATUS == 'ASKED' ) %]Pending + [% ELSIF ( STATUS == 'ACCEPTED' ) %]Accepted + [% ELSIF ( STATUS == 'CHECKED' ) %]Checked + [% ELSIF ( STATUS == 'REJECTED' ) %]Rejected + [% ELSE %]No Status + [% END %] +
  2. +
  3. + + + + + + + + + + + + + + + + + + + +
     DateBy
    [% suggesteddate %][% IF ( suggestedby_borrowernumber ) %][% suggestedby_surname %], [% suggestedby_firstname %] [% suggestedby_branchcode %] ([% suggestedby_description %])[% END %] +
    [% manageddate %][% IF ( managedby_borrowernumber ) %][% managedby_surname %], [% managedby_firstname %] [% managedby_branchcode %] ([% managedby_description %])[% END %]
    [% accepteddate %][% IF ( acceptedby_borrowernumber ) %][% acceptedby_surname %], [% acceptedby_firstname %] [% acceptedby_branchcode %] ([% acceptedby_description %])[% END %]
+
+
Acquisition information +
    +
  1. + [% branchname %] +
  2. +
  3. + [% budgetname %] +
  4. +
  5. + [% quantity %] +
  6. +
  7. + [% currency %] +
  8. +
  9. + [% price %] +
  10. +
  11. + [% total %] +
  12. +
+
+ + <<Back to the list + +
+
+
+[% END %] [% IF ( op_save ) %]
[% ELSE %]
[% END %]
@@ -189,7 +310,7 @@ $(document).ready(function() { calcNewsuggTotal(); }); -
[% IF ( suggestionid ) %] Cancel[% ELSE %] Cancel[% END %] +
[% IF ( suggestionid ) %] Cancel[% ELSE %] Cancel[% END %]
[% END %] @@ -245,9 +366,9 @@ $(document).ready(function() { calcNewsuggTotal(); }); - - [% suggestions_loo.title |html %][% IF ( suggestions_loo.author ) %], by [% suggestions_loo.author %][% END %] - + + [% suggestions_loo.title |html %][% IF ( suggestions_loo.author ) %], by [% suggestions_loo.author %][% END %] + [edit]
[% IF ( suggestions_loo.copyrightdate ) %]© [% suggestions_loo.copyrightdate %] [% END %] [% IF ( suggestions_loo.volumedesc ) %]; Volume:[% suggestions_loo.volumedesc %] [% END %] @@ -314,7 +435,7 @@ $(document).ready(function() { calcNewsuggTotal(); });
- [% UNLESS ( op_save ) %]
+ [% UNLESS ( op_save ) %] [% UNLESS ( op == 'show' ) %]