diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl index aad488a3a2..35eeb102dd 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl @@ -1,7 +1,8 @@ -<!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog › -<!-- TMPL_IF name="op_save" --><!-- TMPL_IF name="suttesionid" -->Edit purchase suggestion #<!-- TMPL_VAR name="suggestionid" --><!--TMPL_ELSE-->Enter a new purchase suggestion<!-- /TMPL_IF --><!--TMPL_ELSE-->Suggestions<!-- /TMPL_IF --> +Koha › Acquisitions › +<!-- TMPL_IF name="op_save" --><!-- TMPL_IF name="suttesionid" -->Edit purchase suggestion #<!-- TMPL_VAR name="suggestionid" --><!--TMPL_ELSE-->Enter a new purchase suggestion<!-- /TMPL_IF --><!--TMPL_ELSE-->Suggestions Management<!-- /TMPL_IF --> + - + -
+
@@ -78,15 +99,15 @@ $(document).ready(function() {

Enter a new purchase suggestion

Bibliographic information
    -
  1. "/>
    2. -
  2. "/>
    3. -
  3. " />
    4. -
  4. "/>
    5. -
  5. "/>
    6. -
  6. "/>
    7. -
  7. "/>
    8. -
  8. - "/>
    9. +
  9. "/>
    10. +
  10. " />
    11. +
  11. "/>
    12. +
  12. "/>
    13. +
  13. "/>
    14. +
  14. "/>
    15. +
  15. +
    16. -
    17. +
-
Suggestion management
    - -
  1. - - - - + +
  2.  dateby
    + - - - + + - + - + - + - + -
     DateBy
    Suggestion Creation "/>"/>">, () + "/>"/>
    Suggestion Management " />"/>">, ()"/>
    Suggestion Accepted " />"/>">, ()"/>
    +
Acquisition information
    -
  1. +
  2. -
    3. +
-
" />">CancelCancel +
" /> ">Cancel Cancel
@@ -151,61 +171,9 @@ $(document).ready(function() {
- -
-Filters -
-
Bibliographic information : - " /> - " /> - " />
- " /> - " /> - " /> -
-
Suggestion information: -
- -
- -
- - -
-
Acquistion information : - - - - -
-
- -
- -
+ +

Suggestions Management

+
Sorting...
Loading tab...
@@ -223,16 +191,16 @@ $(document).ready(function() {
" method="post" action="/cgi-bin/koha/suggestion/suggestion.pl#"> - t" > +

" href="#">Check All | " href="#">Uncheck All

+
t"> - + - - + @@ -241,22 +209,21 @@ $(document).ready(function() { " /> -
" >Check All tab
  SuggestionNote Suggested by /on Managed by /on For BudgetStatusStatus
- &op=edit" title="suggestion" > + &op=edit" title="suggestion" > , by
© ; Volume: - ; ISBN : ; Published by in in ; ;
+ ; ISBN: ; Published by in in ; ;
">,
">, -
+ , 		@@ -271,29 +238,28 @@ $(document).ready(function() {
"> - "> + + + + + + -
-
"> - + "> " name="other_reason" value="please note your reason here..." /> ">Cancel + OR: delete" />
-
"> - Accept - Check - Reject -
-
"> - .op.value='delete';}else{document.f.op.value='change'}"/> Delete
- "/> - + + " /> +
@@ -303,8 +269,66 @@ $(document).ready(function() {
-
-
- +
- +
+ +
+ +
  1. +
+

Filter by: [clear]

+
+ +

Bibliographic information

+
  1. " />
    2. +
  2. " />
    3. +
  3. " />
    4. +
  4. " />
    5. +
  5. " />
    6. +
  6. " />
+
+

Suggestion information

+
    2. +
    3. +
    4. +
    5. +
    6. +
    7. +
+
+ +

Acquistion information

+
  1. +
    2. +
  2. +
+
+
+ +
+ + diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl index 36bdcbc8da..9811cc8604 100755 --- a/suggestion/suggestion.pl +++ b/suggestion/suggestion.pl @@ -50,7 +50,7 @@ sub Init{ sub GetCriteriumDesc{ my ($criteriumvalue,$displayby)=@_; - return ($criteriumvalue eq 'ASKED'?"pending":lc $criteriumvalue) if ($displayby =~/status/i); + return ($criteriumvalue eq 'ASKED'?"Pending":ucfirst(lc( $criteriumvalue))) if ($displayby =~/status/i); return (GetBranchName($criteriumvalue)) if ($displayby =~/branchcode/); return (GetSupportName($criteriumvalue)) if ($displayby =~/itemtype/); if ($displayby =~/managedby/||$displayby =~/acceptedby/){ @@ -163,7 +163,7 @@ if ($op=~/else/) { next if ($definedvalue && $$suggestion_ref{$displayby} ne $criteriumvalue); $$suggestion_ref{$displayby}=$criteriumvalue; - warn $$suggestion_ref{$displayby}."=$criteriumvalue; $displayby"; +# warn $$suggestion_ref{$displayby}."=$criteriumvalue; $displayby"; my $suggestions = &SearchSuggestion($suggestion_ref); foreach (@$suggestions){ @@ -180,7 +180,7 @@ if ($op=~/else/) { "suggestiontypelabel"=>GetCriteriumDesc($criteriumvalue,$displayby)||"", "suggestionscount"=>scalar(@$suggestions), 'suggestions_loop'=>$suggestions, - 'reasonsloop' => $reasonsloop, + 'reasonsloop' => $reasonsloop, }; delete $$suggestion_ref{$displayby} unless $definedvalue; @@ -190,12 +190,11 @@ if ($op=~/else/) { "displayby"=> $displayby, "notabs"=> $displayby eq "", suggestions => \@allsuggestions, - ); } foreach my $element qw(managedby suggestedby){ - $debug || warn $$suggestion_ref{$element}; +# $debug || warn $$suggestion_ref{$element}; if ($$suggestion_ref{$element}){ my $member=GetMember(borrowernumber=>$$suggestion_ref{$element}); $template->param(