From 7b9140e8eff89fdad149023aa292f62462e07fae Mon Sep 17 00:00:00 2001 From: Alex Arnaud Date: Wed, 4 Oct 2017 15:04:15 +0000 Subject: [PATCH] Bug 18399: Add reasons in edit suggestion page Test plan: - Fill the authorised values's category 'SUGGEST' with reason - Edit a pending suggestion. Set the status to rejected and select a reason - Check the reason has been saved (i.e in the suggestions table of rejected tab) - Check in the corresponding message_queue that the reason is here - Re-edit the same suggestion - Check that the correct reason is selected by defaut - Edit an other pending suggetion. Set the status to rejected, select other reason and fill the input text - Re-edit the previews suggestion and make sure the input "other" is displayed by default with the correct value Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart --- .../prog/en/modules/suggestion/suggestion.tt | 41 +++++++++++++++++++ suggestion/suggestion.pl | 17 +++++++- 2 files changed, 57 insertions(+), 1 deletion(-) 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 89f92713b8..25e04b067b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -172,6 +172,24 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o $("#quantity,#price,#currency").on("change",function(){ calcNewsuggTotal(); }); + + [% IF other_reason %] + $(".select-reason").hide(); + $(".select-reason").find("option[value='other']").attr("selected","selected"); + $("#other_reason").show(); + [% ELSE %] + $("#other_reason").hide(); + [% END %] + $(".select-reason").change(function(){ + if($(this).val() == "other"){ + $(this).hide(); + $("#other_reason").show(); + } + }); + $("a[href*=back]").click(function(){ + $(".select-reason").show().find("option[value='']").attr("selected","selected"); + $("#other_reason").hide(); + }); }); // ]]> @@ -457,6 +475,29 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o [% END %] +
  • + + + + + [% IF other_reason %] + + [% ELSE %] + + [% END %] + Cancel + +
  • [% END %]
  • diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl index 929e65ad51..94e6eabd44 100755 --- a/suggestion/suggestion.pl +++ b/suggestion/suggestion.pl @@ -92,6 +92,7 @@ my $returnsuggested = $input->param('returnsuggested'); my $managedby = $input->param('managedby'); my $displayby = $input->param('displayby') || ''; my $tabcode = $input->param('tabcode'); +my $reasonsloop = GetAuthorisedValues("SUGGEST"); # filter informations which are not suggestion related. my $suggestion_ref = $input->Vars; @@ -133,6 +134,12 @@ if ( $op =~ /save/i ) { $suggestion_only->{manageddate} = dt_from_string; $suggestion_only->{"managedby"} = C4::Context->userenv->{number}; } + + my $otherreason = $input->param('other_reason'); + if ($suggestion_only->{reason} eq 'other' && $otherreason) { + $suggestion_only->{reason} = $otherreason; + } + if ( $suggestion_only->{'suggestionid'} > 0 ) { &ModSuggestion($suggestion_only); } else { @@ -169,6 +176,15 @@ elsif ($op=~/add/) { elsif ($op=~/edit/) { #Edit suggestion $suggestion_ref=&GetSuggestion($$suggestion_ref{'suggestionid'}); + $suggestion_ref->{reasonsloop} = $reasonsloop; + my $other_reason = 1; + foreach my $reason ( @{ $reasonsloop } ) { + if ($suggestion_ref->{reason} eq $reason->{lib}) { + $other_reason = 0; + } + } + $other_reason = 0 unless $suggestion_ref->{reason}; + $template->param(other_reason => $other_reason); Init($suggestion_ref); $op ='save'; } @@ -243,7 +259,6 @@ if ($op=~/else/) { push @criteria_dv, '' if $criteria_has_empty; my @allsuggestions; - my $reasonsloop = GetAuthorisedValues("SUGGEST"); foreach my $criteriumvalue ( @criteria_dv ) { # By default, display suggestions from current working branch unless ( exists $$suggestion_ref{'branchcode'} ) { -- 2.39.5
     DateBy