cb01b25330
Includes: * code factorization Some code from subscription & Mana-KB has been factorized in order to speed-up next developments * SytemPreferences: Mana Activation: - add a value "no, let me think about it", that is the default value. - as long as this value is selected, messages ask if user want to activate it ( in Administration and Add-subscription(page 2) ) AutoShareWithMana - Add the syspref AutoShareWithMana: user can automatically share infos with Mana-KB (not set by default) * Interface : - On mana-search, rows are now sorted by date of last import, then by number of users - Windows redesigned to improve the user experience * New Feature : report a mistake. - people can now report an invalid data (wrong, obsolete,...) - if a data is reported as invalid many time, it will appear differently - Added few tooltip (to explain the fields last import, nb of users, to explain the new feature) - When reporting a data as invalid, a comment can also be added. Koha will then display comments related to data in result lists * API (svc/mana) - add svc/mana/addvaluetofield: allows to ask mana incrementing a field of a resource - no hardcoding for resources in the code of api (api needs to be called with a ressourcename) * New feature : SQL report sharing - Create Koha::Report.pm and Koha::Reports.pm, objects class for Reports - New feature: share reports with Mana-KB - New feature: search report in Mana-KB with keywords - New feature: load reports from Mana-KB Test plan: 1 - Apply Patch + update database 2 - Copy the three lines about mana config in etc/koha-conf.xml in ../etc/koha-conf.xml (after <backupdir> for example) <!-- URL of the mana KB server --> <!-- alternative value http://mana-test.koha-community.org to query the test server --> <mana_config>https://mana-kb.koha-community.org</mana_config> 3 - Check Mana syspref and AutoShareWithMana syspref are not activated 4 - Search the syspref ManaToken and follow the instructions 5 - subscriptions - Try create a new subscription for a first serial => Mana-KB shouldn't show you anything (except if the base hase been filled) - Share this serial with Mana-KB (on the serial individual's page there must be a Share button) - Try to create a new subscription for serial nr1 => a message should appear when you click on "next", click on "use", the fields should automaticaly appear - Activate AutoShareWithMana => Subscriptions - Create a new subscription for a second serial - There shouldn't be any Share button - Create a second subscription => the message should appear, click again on use 6 - SQL Report - Create a new SQL report, without notes. - On the table with all report (reports > use saved), there should be the action "Share" - If you click on share, you have an error message - Create a new report, with a title and notes longer than 20 characters - You can share it with mana => you will have a success message - On (report > use saved), there must be a message inviting you to search on Mana-KB for more results, enter a few word from title, notes, type of the report you shared, it should appear. You can use it, it will load it into your report list. 7 - Report mistakes. - On any table containing Mana-KB search results, you can report a mistake and add a comment. 8 - For each previous test, try to send wrong data, to delete the security token, to send nothing: it should show a correct warning message. Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Rebased-by: Alex Arnaud <alex.arnaud@biblibre.com> (2018-07-04) Signed-off-by: Michal Denar <black23@gmail.com> Signed-off-by: Michal Denar <black23@gmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
189 lines
7.9 KiB
Perl
Executable file
189 lines
7.9 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Copyright 2000-2002 Katipo Communications
|
|
# Parts Copyright 2010 Biblibre
|
|
#
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
|
|
use Modern::Perl;
|
|
use CGI qw ( -utf8 );
|
|
use C4::Auth;
|
|
use C4::Koha;
|
|
use C4::Serials;
|
|
use C4::Letters;
|
|
use C4::Output;
|
|
use C4::Context;
|
|
|
|
use Koha::DateUtils qw( dt_from_string );
|
|
|
|
use List::MoreUtils qw/uniq/;
|
|
|
|
|
|
my $query = new CGI;
|
|
my $op = $query->param('op') || q{};
|
|
my $nbissues=$query->param('nbissues');
|
|
my $date_received_today = $query->param('date_received_today') || 0;
|
|
my $dbh = C4::Context->dbh;
|
|
|
|
my ($template, $loggedinuser, $cookie)
|
|
= get_template_and_user({template_name => "serials/serials-collection.tt",
|
|
query => $query,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => {serials => '*'},
|
|
debug => 1,
|
|
});
|
|
my $biblionumber = $query->param('biblionumber');
|
|
my @subscriptionid = $query->multi_param('subscriptionid');
|
|
|
|
@subscriptionid= uniq @subscriptionid;
|
|
@subscriptionid= sort @subscriptionid;
|
|
my $subscriptiondescs;
|
|
my $subscriptions;
|
|
|
|
if($op eq 'gennext' && @subscriptionid){
|
|
my $subscriptionid = $subscriptionid[0];
|
|
my $sth = $dbh->prepare("
|
|
SELECT publisheddate, publisheddatetext, serialid, serialseq,
|
|
planneddate
|
|
FROM serial
|
|
WHERE status = 1 AND subscriptionid = ?
|
|
");
|
|
my $status = defined( $nbissues ) ? 2 : 3;
|
|
$nbissues ||= 1;
|
|
for ( my $i = 0; $i < $nbissues; $i++ ){
|
|
$sth->execute($subscriptionid);
|
|
# modify actual expected issue, to generate the next
|
|
if ( my $issue = $sth->fetchrow_hashref ) {
|
|
my $planneddate = $date_received_today ? dt_from_string : $issue->{planneddate};
|
|
ModSerialStatus( $issue->{serialid}, $issue->{serialseq},
|
|
$planneddate, $issue->{publisheddate},
|
|
$issue->{publisheddatetext}, $status, "" );
|
|
} else {
|
|
require C4::Serials::Numberpattern;
|
|
my $subscription = GetSubscription($subscriptionid);
|
|
my $pattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subscription->{numberpattern});
|
|
my $frequency = C4::Serials::Frequency::GetSubscriptionFrequencies($subscription->{periodicity});
|
|
my $expected = GetNextExpected($subscriptionid);
|
|
my (
|
|
$newserialseq, $newlastvalue1, $newlastvalue2, $newlastvalue3,
|
|
$newinnerloop1, $newinnerloop2, $newinnerloop3
|
|
) = GetNextSeq($subscription, $pattern, $frequency, $expected->{publisheddate});
|
|
|
|
## We generate the next publication date
|
|
$frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subscription->{periodicity});
|
|
my $nextpublisheddate = GetNextDate($subscription, $expected->{publisheddate}, $frequency, 1);
|
|
my $planneddate = $date_received_today ? dt_from_string : $nextpublisheddate;
|
|
## Creating the new issue
|
|
NewIssue( $newserialseq, $subscriptionid, $subscription->{'biblionumber'},
|
|
1, $planneddate, $nextpublisheddate );
|
|
|
|
## Updating the subscription seq status
|
|
my $squery = "UPDATE subscription SET lastvalue1=?, lastvalue2=?, lastvalue3=?, innerloop1=?, innerloop2=?, innerloop3=?
|
|
WHERE subscriptionid = ?";
|
|
my $seqsth = $dbh->prepare($squery);
|
|
$seqsth->execute(
|
|
$newlastvalue1, $newlastvalue2, $newlastvalue3, $newinnerloop1,
|
|
$newinnerloop2, $newinnerloop3, $subscriptionid
|
|
);
|
|
|
|
}
|
|
last if $nbissues == 1;
|
|
last if HasSubscriptionExpired($subscriptionid) > 0;
|
|
}
|
|
print $query->redirect('/cgi-bin/koha/serials/serials-collection.pl?subscriptionid='.$subscriptionid);
|
|
exit;
|
|
}
|
|
|
|
my $subscriptioncount;
|
|
my ($location, $callnumber);
|
|
if (@subscriptionid){
|
|
my @subscriptioninformation=();
|
|
my $closed = 0;
|
|
foreach my $subscriptionid (@subscriptionid){
|
|
my $subs= GetSubscription($subscriptionid);
|
|
next unless $subs;
|
|
$closed = 1 if $subs->{closed};
|
|
|
|
$subs->{opacnote} =~ s/\n/\<br\/\>/g;
|
|
$subs->{missinglist} =~ s/\n/\<br\/\>/g;
|
|
$subs->{recievedlist} =~ s/\n/\<br\/\>/g;
|
|
|
|
##these are display information
|
|
$subs->{'abouttoexpire'}=abouttoexpire($subs->{'subscriptionid'});
|
|
$subs->{'subscriptionexpired'}=HasSubscriptionExpired($subs->{'subscriptionid'});
|
|
$subs->{'subscriptionid'} = $subscriptionid; # FIXME - why was this lost ?
|
|
$location = $subs->{'location'};
|
|
$callnumber = $subs->{callnumber};
|
|
my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subs->{periodicity});
|
|
my $numberpattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subs->{numberpattern});
|
|
$subs->{frequency} = $frequency;
|
|
$subs->{numberpattern} = $numberpattern;
|
|
$subs->{'hasRouting'} = check_routing($subscriptionid);
|
|
push @$subscriptiondescs,$subs;
|
|
my $tmpsubscription= GetFullSubscription($subscriptionid);
|
|
@subscriptioninformation=(@$tmpsubscription,@subscriptioninformation);
|
|
}
|
|
|
|
output_and_exit( $query, $cookie, $template, 'unknown_subscription') unless @subscriptioninformation;
|
|
|
|
$template->param(closed => $closed);
|
|
$subscriptions=PrepareSerialsData(\@subscriptioninformation);
|
|
$subscriptioncount = CountSubscriptionFromBiblionumber($subscriptiondescs->[0]{'biblionumber'});
|
|
} else {
|
|
$subscriptiondescs = GetSubscriptionsFromBiblionumber($biblionumber);
|
|
foreach my $s (@$subscriptiondescs) {
|
|
my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($s->{periodicity});
|
|
my $numberpattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($s->{numberpattern});
|
|
$s->{frequency} = $frequency;
|
|
$s->{numberpattern} = $numberpattern;
|
|
}
|
|
my $subscriptioninformation = GetFullSubscriptionsFromBiblionumber($biblionumber);
|
|
$subscriptions=PrepareSerialsData($subscriptioninformation);
|
|
}
|
|
|
|
my $title = $subscriptiondescs->[0]{bibliotitle};
|
|
my $yearmax=($subscriptions->[0]{year} eq "manage" && scalar(@$subscriptions)>1)? $subscriptions->[1]{year} :$subscriptions->[0]{year};
|
|
my $yearmin=$subscriptions->[scalar(@$subscriptions)-1]{year};
|
|
my $subscriptionidlist="";
|
|
foreach my $subscription (@$subscriptiondescs){
|
|
$subscriptionidlist.=$subscription->{'subscriptionid'}."," ;
|
|
$biblionumber = $subscription->{'bibnum'} unless ($biblionumber);
|
|
$subscription->{'hasRouting'} = check_routing($subscription->{'subscriptionid'});
|
|
}
|
|
|
|
chop $subscriptionidlist;
|
|
$template->param(
|
|
subscriptionidlist => $subscriptionidlist,
|
|
biblionumber => $biblionumber,
|
|
subscriptions => $subscriptiondescs,
|
|
years => $subscriptions,
|
|
yearmin => $yearmin,
|
|
yearmax =>$yearmax,
|
|
bibliotitle => $title,
|
|
suggestion => C4::Context->preference("suggestion"),
|
|
virtualshelves => C4::Context->preference("virtualshelves"),
|
|
routing => C4::Context->preference("RoutingSerials"),
|
|
subscr=>scalar $query->param('subscriptionid'),
|
|
subscriptioncount => $subscriptioncount,
|
|
location => $location,
|
|
callnumber => $callnumber,
|
|
uc(C4::Context->preference("marcflavour")) => 1,
|
|
serialsadditems => $subscriptiondescs->[0]{'serialsadditems'},
|
|
);
|
|
|
|
output_html_with_http_headers $query, $cookie, $template->output;
|