From 82c6fd5642aee1fc2d3fae1d9835d680b4b79c2a Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 3 Dec 2014 11:35:36 +0100 Subject: [PATCH] Bug 13378: Add a filter to search suggestions not linked to a fund This patch adds a "None" option for the fund filter. Test plan: 1/ Go on the suggestion search page 2/ Search suggestions not linked to a fund using the "None" option. 3/ Search all suggestions (linked or not to a fund) using the "Any" option. Works as expected. Signed-off-by: Marc Veron Signed-off-by: Kyle M Hall Signed-off-by: Mason James --- C4/Suggestions.pm | 17 +- .../prog/en/modules/suggestion/suggestion.tt | 9 +- t/db_dependent/Suggestions.t | 286 +++++++++++++++++- 3 files changed, 289 insertions(+), 23 deletions(-) diff --git a/C4/Suggestions.pm b/C4/Suggestions.pm index b543293bbc..b5ca114564 100644 --- a/C4/Suggestions.pm +++ b/C4/Suggestions.pm @@ -157,16 +157,17 @@ sub SearchSuggestion { qw( STATUS itemtype suggestedby managedby acceptedby budgetid biblionumber ) ) { - if ( exists $suggestion->{$field} ) { - if ( defined $suggestion->{$field} and $suggestion->{$field} ne '' ) - { - push @sql_params, $suggestion->{$field}; - push @query, qq{ AND suggestions.$field=? }; + if ( exists $suggestion->{$field} + and defined $suggestion->{$field} + and $suggestion->{$field} ne '__ANY__' + and $suggestion->{$field} ne q|| + ) { + if ( $suggestion->{$field} eq '__NONE__' ) { + push @query, qq{ AND (suggestions.$field = '' OR suggestions.$field IS NULL) }; } else { - push @query, qq{ - AND (suggestions.$field='' OR suggestions.$field IS NULL) - }; + push @sql_params, $suggestion->{$field}; + push @query, qq{ AND suggestions.$field = ? }; } } } 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 a0d9468137..af7e3820a9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -724,7 +724,14 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o

Acquisition information

  1. - + + [% IF budgetid == '__NONE__' %] + + [% ELSE %] + + [% END %] + [% FOREACH budgetid_loo IN budgetid_loop %] [% IF ( budgetid_loo.selected ) %] [% ELSE %][% END %] [% END %]
    2. diff --git a/t/db_dependent/Suggestions.t b/t/db_dependent/Suggestions.t index f352ff529d..35507c3825 100644 --- a/t/db_dependent/Suggestions.t +++ b/t/db_dependent/Suggestions.t @@ -17,9 +17,14 @@ use Modern::Perl; -use C4::Suggestions; +use C4::Context; +use C4::Members; +use C4::Letters; +use C4::Budgets; -use Test::More tests => 14; +use Koha::DateUtils qw( dt_from_string ); + +use Test::More tests => 101; use Test::Warn; BEGIN { @@ -33,19 +38,272 @@ my $dbh = C4::Context->dbh; $dbh->{AutoCommit} = 0; $dbh->{RaiseError} = 1; -my ($suggestionid, $suggestion, $status, $biblionumber); -$biblionumber = 1; -ok($suggestionid= NewSuggestion( {title=>'Petit traité de philosohpie',author=>'Hubert de Chardassé',publishercode=>'Albin Michel'} ), "NewSuggestion OK"); -ok($suggestion= GetSuggestion( $suggestionid), "GetSuggestion OK"); -ok($status= ModSuggestion( {title=>'test Modif Simple', suggestionid=>$suggestionid} ), "ModSuggestion Simple OK"); -warning_is { $status = ModSuggestion( {STATUS=>'STALLED', suggestionid=>$suggestionid} )} +$dbh->do(q|DELETE FROM suggestions|); +$dbh->do(q|DELETE FROM issues|); +$dbh->do(q|DELETE FROM borrowers|); +$dbh->do(q|DELETE FROM letter|); +$dbh->do(q|DELETE FROM message_queue|); +$dbh->do(q|INSERT INTO letter(module, code, content) VALUES ('suggestions', 'CHECKED', 'my content')|); + +my $member = { + firstname => 'my firstname', + surname => 'my surname', + categorycode => 'S', + branchcode => 'CPL', +}; +my $borrowernumber = AddMember(%$member); + +my $biblionumber1 = 1; +my $my_suggestion = { + title => 'my title', + author => 'my author', + publishercode => 'my publishercode', + suggestedby => $borrowernumber, + biblionumber => $biblionumber1, + managedby => '', + manageddate => '', + accepteddate => dt_from_string, + note => 'my note', +}; + +my $budgetperiod_id = AddBudgetPeriod({ + budget_period_startdate => '2008-01-01', + budget_period_enddate => '2008-12-31', + budget_period_description => 'MAPERI', + budget_period_active => 1, +}); + +my $budget_id = AddBudget({ + budget_code => 'ABCD', + budget_amount => '123.132000', + budget_name => 'ABCD', + budget_notes => 'This is a note', + budget_period_id => $budgetperiod_id, +}); +my $my_suggestion_with_budget = { + title => 'my title 2', + author => 'my author 2', + publishercode => 'my publishercode 2', + suggestedby => $borrowernumber, + biblionumber => $biblionumber1, + managedby => '', + manageddate => '', + accepteddate => dt_from_string, + note => 'my note', + budgetid => $budget_id, +}; + + +is( CountSuggestion(), 0, 'CountSuggestion without the status returns 0' ); +is( CountSuggestion('ASKED'), 0, 'CountSuggestion returns the correct number of suggestions' ); +is( CountSuggestion('CHECKED'), 0, 'CountSuggestion returns the correct number of suggestions' ); +is( CountSuggestion('ACCEPTED'), 0, 'CountSuggestion returns the correct number of suggestions' ); +is( CountSuggestion('REJECTED'), 0, 'CountSuggestion returns the correct number of suggestions' ); + +my $my_suggestionid = NewSuggestion($my_suggestion); +isnt( $my_suggestionid, 0, 'NewSuggestion returns an not null id' ); +my $my_suggestionid_with_budget = NewSuggestion($my_suggestion_with_budget); + +is( GetSuggestion(), undef, 'GetSuggestion without the suggestion id returns undef' ); +my $suggestion = GetSuggestion($my_suggestionid); +is( $suggestion->{title}, $my_suggestion->{title}, 'NewSuggestion stores the title correctly' ); +is( $suggestion->{author}, $my_suggestion->{author}, 'NewSuggestion stores the author correctly' ); +is( $suggestion->{publishercode}, $my_suggestion->{publishercode}, 'NewSuggestion stores the publishercode correctly' ); +is( $suggestion->{suggestedby}, $my_suggestion->{suggestedby}, 'NewSuggestion stores the borrower number correctly' ); +is( $suggestion->{biblionumber}, $my_suggestion->{biblionumber}, 'NewSuggestion stores the biblio number correctly' ); +is( $suggestion->{STATUS}, 'ASKED', 'NewSuggestion stores a suggestion with the status ASKED by default' ); +is( $suggestion->{managedby}, undef, 'NewSuggestion stores empty string as undef for non existent foreign key (integer)' ); +is( $suggestion->{manageddate}, undef, 'NewSuggestion stores empty string as undef for date' ); +is( CountSuggestion('ASKED'), 2, 'CountSuggestion returns the correct number of suggestions' ); + + +is( ModSuggestion(), undef, 'ModSuggestion without the suggestion returns undef' ); +my $mod_suggestion1 = { + title => 'my modified title', + author => 'my modified author', + publishercode => 'my modified publishercode', + managedby => '', + manageddate => '', +}; +my $status = ModSuggestion($mod_suggestion1); +is( $status, undef, 'ModSuggestion without the suggestion id returns undef' ); + +$mod_suggestion1->{suggestionid} = $my_suggestionid; +$status = ModSuggestion($mod_suggestion1); +is( $status, 1, 'ModSuggestion modifies one entry' ); +$suggestion = GetSuggestion($my_suggestionid); +is( $suggestion->{title}, $mod_suggestion1->{title}, 'ModSuggestion modifies the title correctly' ); +is( $suggestion->{author}, $mod_suggestion1->{author}, 'ModSuggestion modifies the author correctly' ); +is( $suggestion->{publishercode}, $mod_suggestion1->{publishercode}, 'ModSuggestion modifies the publishercode correctly' ); +is( $suggestion->{managedby}, undef, 'ModSuggestion stores empty string as undef for non existent foreign key (integer)' ); +is( $suggestion->{manageddate}, undef, 'ModSuggestion stores empty string as undef for date' ); +isnt( $suggestion->{accepteddate}, undef, 'ModSuggestion does not update a non given date value' ); +is( $suggestion->{note}, 'my note', 'ModSuggestion should not erase data if not given' ); + +my $messages = C4::Letters::GetQueuedMessages({ + borrowernumber => $borrowernumber, +}); +is( @$messages, 0, 'ModSuggestions does not send an email if the status is not updated' ); + +my $mod_suggestion2 = { + STATUS => 'STALLED', + suggestionid => $my_suggestionid, +}; +warning_is { $status = ModSuggestion($mod_suggestion2) } "No suggestions STALLED letter transported by email", "ModSuggestion status warning is correct"; -ok( $status, "ModSuggestion Status OK"); -ok($status= ModSuggestion( {suggestionid => $suggestionid, biblionumber => $biblionumber } ), "ModSuggestion, set biblionumber OK" ); -ok($suggestion= GetSuggestionFromBiblionumber( $biblionumber ), "GetSuggestionFromBiblionumber OK"); -ok($suggestion= GetSuggestionInfoFromBiblionumber( $biblionumber ), "GetSuggestionInfoFromBiblionumber OK"); -ok(@{SearchSuggestion( {STATUS=>'STALLED'} )}>0, "SearchSuggestion Status OK"); +is( $status, 1, "ModSuggestion Status OK"); + +my $mod_suggestion3 = { + STATUS => 'CHECKED', + suggestionid => $my_suggestionid, +}; +$status = ModSuggestion($mod_suggestion3); + +is( $status, 1, 'ModSuggestion modifies one entry' ); +$suggestion = GetSuggestion($my_suggestionid); +is( $suggestion->{STATUS}, $mod_suggestion3->{STATUS}, 'ModSuggestion modifies the status correctly' ); +$messages = C4::Letters::GetQueuedMessages({ + borrowernumber => $borrowernumber, +}); +is( @$messages, 1, 'ModSuggestion sends an email if the status is updated' ); + +is( CountSuggestion('CHECKED'), 1, 'CountSuggestion returns the correct number of suggestions' ); + + +is( GetSuggestionInfo(), undef, 'GetSuggestionInfo without the suggestion id returns undef' ); +$suggestion = GetSuggestionInfo($my_suggestionid); +is( $suggestion->{suggestionid}, $my_suggestionid, 'GetSuggestionInfo returns the suggestion id correctly' ); +is( $suggestion->{title}, $mod_suggestion1->{title}, 'GetSuggestionInfo returns the title correctly' ); +is( $suggestion->{author}, $mod_suggestion1->{author}, 'GetSuggestionInfo returns the author correctly' ); +is( $suggestion->{publishercode}, $mod_suggestion1->{publishercode}, 'GetSuggestionInfo returns the publisher code correctly' ); +is( $suggestion->{suggestedby}, $my_suggestion->{suggestedby}, 'GetSuggestionInfo returns the borrower number correctly' ); +is( $suggestion->{biblionumber}, $my_suggestion->{biblionumber}, 'GetSuggestionInfo returns the biblio number correctly' ); +is( $suggestion->{STATUS}, $mod_suggestion3->{STATUS}, 'GetSuggestionInfo returns the status correctly' ); +is( $suggestion->{surnamesuggestedby}, $member->{surname}, 'GetSuggestionInfo returns the surname correctly' ); +is( $suggestion->{firstnamesuggestedby}, $member->{firstname}, 'GetSuggestionInfo returns the firstname correctly' ); +is( $suggestion->{borrnumsuggestedby}, $my_suggestion->{suggestedby}, 'GetSuggestionInfo returns the borrower number correctly' ); + + +is( GetSuggestionFromBiblionumber(), undef, 'GetSuggestionFromBiblionumber without the biblio number returns undef' ); +is( GetSuggestionFromBiblionumber(2), undef, 'GetSuggestionFromBiblionumber with an invalid biblio number returns undef' ); +is( GetSuggestionFromBiblionumber($biblionumber1), $my_suggestionid, 'GetSuggestionFromBiblionumber functions correctly' ); + + +is( GetSuggestionInfoFromBiblionumber(), undef, 'GetSuggestionInfoFromBiblionumber without the biblio number returns undef' ); +is( GetSuggestionInfoFromBiblionumber(2), undef, 'GetSuggestionInfoFromBiblionumber with an invalid biblio number returns undef' ); +$suggestion = GetSuggestionInfoFromBiblionumber($biblionumber1); +is( $suggestion->{suggestionid}, $my_suggestionid, 'GetSuggestionInfoFromBiblionumber returns the suggestion id correctly' ); +is( $suggestion->{title}, $mod_suggestion1->{title}, 'GetSuggestionInfoFromBiblionumber returns the title correctly' ); +is( $suggestion->{author}, $mod_suggestion1->{author}, 'GetSuggestionInfoFromBiblionumber returns the author correctly' ); +is( $suggestion->{publishercode}, $mod_suggestion1->{publishercode}, 'GetSuggestionInfoFromBiblionumber returns the publisher code correctly' ); +is( $suggestion->{suggestedby}, $my_suggestion->{suggestedby}, 'GetSuggestionInfoFromBiblionumber returns the borrower number correctly' ); +is( $suggestion->{biblionumber}, $my_suggestion->{biblionumber}, 'GetSuggestionInfoFromBiblionumber returns the biblio number correctly' ); +is( $suggestion->{STATUS}, $mod_suggestion3->{STATUS}, 'GetSuggestionInfoFromBiblionumber returns the status correctly' ); +is( $suggestion->{surnamesuggestedby}, $member->{surname}, 'GetSuggestionInfoFromBiblionumber returns the surname correctly' ); +is( $suggestion->{firstnamesuggestedby}, $member->{firstname}, 'GetSuggestionInfoFromBiblionumber returns the firstname correctly' ); +is( $suggestion->{borrnumsuggestedby}, $my_suggestion->{suggestedby}, 'GetSuggestionInfoFromBiblionumeber returns the borrower number correctly' ); + + +my $suggestions = GetSuggestionByStatus(); +is( @$suggestions, 0, 'GetSuggestionByStatus without the status returns an empty array' ); +$suggestions = GetSuggestionByStatus('CHECKED'); +is( @$suggestions, 1, 'GetSuggestionByStatus returns the correct number of suggestions' ); +is( $suggestions->[0]->{suggestionid}, $my_suggestionid, 'GetSuggestionByStatus returns the suggestion id correctly' ); +is( $suggestions->[0]->{title}, $mod_suggestion1->{title}, 'GetSuggestionByStatus returns the title correctly' ); +is( $suggestions->[0]->{author}, $mod_suggestion1->{author}, 'GetSuggestionByStatus returns the author correctly' ); +is( $suggestions->[0]->{publishercode}, $mod_suggestion1->{publishercode}, 'GetSuggestionByStatus returns the publisher code correctly' ); +is( $suggestions->[0]->{suggestedby}, $my_suggestion->{suggestedby}, 'GetSuggestionByStatus returns the borrower number correctly' ); +is( $suggestions->[0]->{biblionumber}, $my_suggestion->{biblionumber}, 'GetSuggestionByStatus returns the biblio number correctly' ); +is( $suggestions->[0]->{STATUS}, $mod_suggestion3->{STATUS}, 'GetSuggestionByStatus returns the status correctly' ); +is( $suggestions->[0]->{surnamesuggestedby}, $member->{surname}, 'GetSuggestionByStatus returns the surname correctly' ); +is( $suggestions->[0]->{firstnamesuggestedby}, $member->{firstname}, 'GetSuggestionByStatus returns the firstname correctly' ); +is( $suggestions->[0]->{branchcodesuggestedby}, $member->{branchcode}, 'GetSuggestionByStatus returns the branch code correctly' ); +is( $suggestions->[0]->{borrnumsuggestedby}, $my_suggestion->{suggestedby}, 'GetSuggestionByStatus returns the borrower number correctly' ); +is( $suggestions->[0]->{categorycodesuggestedby}, $member->{categorycode}, 'GetSuggestionByStatus returns the category code correctly' ); + + +is( ConnectSuggestionAndBiblio(), '0E0', 'ConnectSuggestionAndBiblio without arguments returns 0E0' ); +my $biblionumber2 = 2; +my $connect_suggestion_and_biblio = ConnectSuggestionAndBiblio($my_suggestionid, $biblionumber2); +is( $connect_suggestion_and_biblio, '1', 'ConnectSuggestionAndBiblio returns 1' ); +$suggestion = GetSuggestion($my_suggestionid); +is( $suggestion->{biblionumber}, $biblionumber2, 'ConnectSuggestionAndBiblio updates the biblio number correctly' ); + +my $search_suggestion = SearchSuggestion(); +is( @$search_suggestion, 2, 'SearchSuggestion without arguments returns all suggestions' ); + +$search_suggestion = SearchSuggestion({ + title => $mod_suggestion1->{title}, +}); +is( @$search_suggestion, 1, 'SearchSuggestion returns the correct number of suggestions' ); +$search_suggestion = SearchSuggestion({ + title => 'another title', +}); +is( @$search_suggestion, 0, 'SearchSuggestion returns the correct number of suggestions' ); + +$search_suggestion = SearchSuggestion({ + author => $mod_suggestion1->{author}, +}); +is( @$search_suggestion, 1, 'SearchSuggestion returns the correct number of suggestions' ); +$search_suggestion = SearchSuggestion({ + author => 'another author', +}); +is( @$search_suggestion, 0, 'SearchSuggestion returns the correct number of suggestions' ); + +$search_suggestion = SearchSuggestion({ + publishercode => $mod_suggestion1->{publishercode}, +}); +is( @$search_suggestion, 1, 'SearchSuggestion returns the correct number of suggestions' ); +$search_suggestion = SearchSuggestion({ + publishercode => 'another publishercode', +}); +is( @$search_suggestion, 0, 'SearchSuggestion returns the correct number of suggestions' ); + +$search_suggestion = SearchSuggestion({ + STATUS => $mod_suggestion3->{STATUS}, +}); +is( @$search_suggestion, 1, 'SearchSuggestion returns the correct number of suggestions' ); +$search_suggestion = SearchSuggestion({ + STATUS => 'REJECTED', +}); +is( @$search_suggestion, 0, 'SearchSuggestion returns the correct number of suggestions' ); + +$search_suggestion = SearchSuggestion({ + budgetid => '', +}); +is( @$search_suggestion, 2, 'SearchSuggestion (budgetid = "") returns the correct number of suggestions' ); +$search_suggestion = SearchSuggestion({ + budgetid => $budget_id, +}); +is( @$search_suggestion, 1, 'SearchSuggestion (budgetid = $budgetid) returns the correct number of suggestions' ); +$search_suggestion = SearchSuggestion({ + budgetid => '__NONE__', +}); +is( @$search_suggestion, 1, 'SearchSuggestion (budgetid = "__NONE__") returns the correct number of suggestions' ); +$search_suggestion = SearchSuggestion({ + budgetid => '__ANY__', +}); +is( @$search_suggestion, 2, 'SearchSuggestion (budgetid = "__ANY__") returns the correct number of suggestions' ); + +my $del_suggestion = { + title => 'my deleted title', + STATUS => 'CHECKED', + suggestedby => $borrowernumber, +}; +my $del_suggestionid = NewSuggestion($del_suggestion); + +is( CountSuggestion('CHECKED'), 2, 'CountSuggestion returns the correct number of suggestions' ); + +is( DelSuggestion(), '0E0', 'DelSuggestion without arguments returns 0E0' ); +is( DelSuggestion($borrowernumber), '', 'DelSuggestion without the suggestion id returns an empty string' ); +is( DelSuggestion(undef, $my_suggestionid), '', 'DelSuggestion with an invalid borrower number returns an empty string' ); +$suggestion = DelSuggestion($borrowernumber, $my_suggestionid); +is( $suggestion, 1, 'DelSuggestion deletes one suggestion' ); + +$suggestions = GetSuggestionByStatus('CHECKED'); +is( @$suggestions, 1, 'DelSuggestion deletes one suggestion' ); +is( $suggestions->[0]->{title}, $del_suggestion->{title}, 'DelSuggestion deletes the correct suggestion' ); ## Bug 11466, making sure GetSupportList() returns itemtypes, even if AdvancedSearchTypes has multiple values C4::Context->set_preference("AdvancedSearchTypes", 'itemtypes|loc|ccode'); @@ -60,4 +318,4 @@ is_deeply($itemtypes1, $itemtypes2, 'same set of purchase suggestion formats ret $dbh->rollback; -1; +done_testing; -- 2.39.5