use C4::Auth qw(haspermission);
use C4::Context;
use C4::Dates qw(format_date format_date_in_iso);
+use DateTime;
use Date::Calc qw(:all);
-use POSIX qw(strftime setlocale LC_TIME);
+use POSIX qw(strftime);
use C4::Biblio;
use C4::Log; # logaction
use C4::Debug;
foreach my $subs (@{$lines}) {
for my $datefield ( qw(publisheddate planneddate) ) {
- # handle both undef and undef returned as 0000-00-00
- if (!defined $subs->{$datefield} or $subs->{$datefield}=~m/^00/) {
- $subs->{$datefield} = 'XXX';
+ # handle 0000-00-00 dates
+ if (defined $subs->{$datefield} and $subs->{$datefield} =~ m/^00/) {
+ $subs->{$datefield} = undef;
}
}
$subs->{ "status" . $subs->{'status'} } = 1;
for my $subscription ( @$results ) {
$subscription->{cannotedit} = not can_edit_subscription( $subscription );
- $subscription->{cannotdisplay} =
- ( C4::Context->preference("IndependentBranches") &&
- C4::Context->userenv &&
- $subscription->{branchcode} ne C4::Context->userenv->{'branch'} ) ? 1 : 0;
+ $subscription->{cannotdisplay} = not can_show_subscription( $subscription );
}
return @$results;
my @serials;
my $query = "SELECT serialid,serialseq, status, publisheddate, planneddate,notes, routingnotes
FROM serial
- WHERE subscriptionid = ? AND status NOT IN (2,4,5)
+ WHERE subscriptionid = ? AND status NOT IN (2, 4, 41, 42, 43, 44, 5)
ORDER BY IF(publisheddate<>'0000-00-00',publisheddate,planneddate) DESC";
my $sth = $dbh->prepare($query);
$sth->execute($subscriptionid);
$query = "SELECT serialid,serialseq, status, planneddate, publisheddate,notes, routingnotes
FROM serial
WHERE subscriptionid = ?
- AND (status in (2,4,5))
+ AND (status in (2, 4, 41, 42, 43, 44, 5))
ORDER BY IF(publisheddate<>'0000-00-00',publisheddate,planneddate) DESC
";
$sth = $dbh->prepare($query);
$line->{ "status" . $line->{status} } = 1; # fills a "statusX" value, used for template status select list
# Format dates for display
for my $datefield ( qw( planneddate publisheddate ) ) {
- if ($line->{$datefield} =~m/^00/) {
+ if (!defined($line->{$datefield}) || $line->{$datefield} =~m/^00/) {
$line->{$datefield} = q{};
}
else {
return $sth->rows;
}
-# Update missinglist field, used by ModSerialStatus
-sub _update_missinglist {
- my $subscriptionid = shift;
-
- my $dbh = C4::Context->dbh;
- my @missingserials = GetSerials2($subscriptionid, "4,5");
- my $missinglist;
- foreach (@missingserials) {
- if($_->{'status'} == 4) {
- $missinglist .= $_->{'serialseq'} . "; ";
- } elsif($_->{'status'} == 5) {
- $missinglist .= "not issued " . $_->{'serialseq'} . "; ";
- }
- }
- $missinglist =~ s/; $//;
- my $query = qq{
- UPDATE subscriptionhistory
- SET missinglist = ?
- WHERE subscriptionid = ?
- };
- my $sth = $dbh->prepare($query);
- $sth->execute($missinglist, $subscriptionid);
-}
-
-# Update recievedlist field, used by ModSerialStatus
-sub _update_receivedlist {
- my $subscriptionid = shift;
-
- my $dbh = C4::Context->dbh;
- my @receivedserials = GetSerials2($subscriptionid, "2");
- my $receivedlist;
- foreach (@receivedserials) {
- $receivedlist .= $_->{'serialseq'} . "; ";
- }
- $receivedlist =~ s/; $//;
- my $query = qq{
- UPDATE subscriptionhistory
- SET recievedlist = ?
- WHERE subscriptionid = ?
- };
- my $sth = $dbh->prepare($query);
- $sth->execute($receivedlist, $subscriptionid);
-}
-
=head2 ModSerialStatus
ModSerialStatus($serialid,$serialseq, $planneddate,$publisheddate,$status,$notes)
DelIssue( { 'serialid' => $serialid, 'subscriptionid' => $subscriptionid, 'serialseq' => $serialseq } );
} else {
- unless ($frequency->{'unit'}) {
- if ( not $planneddate or $planneddate eq '0000-00-00' ) { $planneddate = C4::Dates->new()->output('iso') };
- if ( not $publisheddate or $publisheddate eq '0000-00-00' ) { $publisheddate = C4::Dates->new()->output('iso') };
- }
my $query = 'UPDATE serial SET serialseq=?,publisheddate=?,planneddate=?,status=?,notes=? WHERE serialid = ?';
$sth = $dbh->prepare($query);
$sth->execute( $serialseq, $publisheddate, $planneddate, $status, $notes, $serialid );
$sth->execute($subscriptionid);
my $val = $sth->fetchrow_hashref;
unless ( $val->{manualhistory} ) {
+ $query = "SELECT missinglist,recievedlist FROM subscriptionhistory WHERE subscriptionid=?";
+ $sth = $dbh->prepare($query);
+ $sth->execute($subscriptionid);
+ my ( $missinglist, $recievedlist ) = $sth->fetchrow;
+
if ( $status == 2 || ($oldstatus == 2 && $status != 2) ) {
- _update_receivedlist($subscriptionid);
+ $recievedlist .= "; $serialseq"
+ if ($recievedlist !~ /(^|;)\s*$serialseq(?=;|$)/);
}
- my @missing_statuses = qw( 4 41 42 43 44 );
- if ( ( grep { $_ == $status } ( @missing_statuses, 5 ) )
- || (
- ( grep { $_ == $oldstatus } @missing_statuses )
- && ! ( grep { $_ == $status } @missing_statuses ) )
- || ($oldstatus == 5 && $status != 5)) {
- _update_missinglist($subscriptionid);
+
+ # in case serial has been previously marked as missing
+ if (grep /$status/, (1,2,3,7)) {
+ $missinglist=~ s/(^|;)\s*$serialseq(?=;|$)//g;
}
+
+ my @missing_statuses = qw( 4 41 42 43 44 );
+ $missinglist .= "; $serialseq"
+ if ( ( grep { $_ == $status } @missing_statuses ) && ( $missinglist !~/(^|;)\s*$serialseq(?=;|$)/ ) );
+ $missinglist .= "; not issued $serialseq"
+ if ( $status == 5 && $missinglist !~ /(^|;)\s*$serialseq(?=;|$)/ );
+
+ $query = "UPDATE subscriptionhistory SET recievedlist=?, missinglist=? WHERE subscriptionid=?";
+ $sth = $dbh->prepare($query);
+ $recievedlist =~ s/^; //;
+ $missinglist =~ s/^; //;
+ $sth->execute( $recievedlist, $missinglist, $subscriptionid );
}
}
my $pattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subscription->{numberpattern});
# calculate issue number
- my $serialseq = GetSeq($subscription, $pattern);
+ my $serialseq = GetSeq($subscription, $pattern) || q{};
$query = qq|
INSERT INTO serial
(serialseq,subscriptionid,biblionumber,status, planneddate, publisheddate)
VALUES (?,?,?,?,?,?)
|;
$sth = $dbh->prepare($query);
- $sth->execute( "$serialseq", $subscriptionid, $biblionumber, 1, $firstacquidate, $firstacquidate );
+ $sth->execute( $serialseq, $subscriptionid, $biblionumber, 1, $firstacquidate, $firstacquidate );
logaction( "SERIAL", "ADD", $subscriptionid, "" ) if C4::Context->preference("SubscriptionLog");
$sth = $dbh->prepare(
"SELECT
serialid, aqbooksellerid, name,
- biblio.title, planneddate, serialseq,
+ biblio.title, biblioitems.issn, planneddate, serialseq,
serial.status, serial.subscriptionid, claimdate,
subscription.branchcode
FROM serial
LEFT JOIN subscription ON serial.subscriptionid=subscription.subscriptionid
LEFT JOIN biblio ON subscription.biblionumber=biblio.biblionumber
+ LEFT JOIN biblioitems ON subscription.biblionumber=biblioitems.biblionumber
LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id
WHERE subscription.subscriptionid = serial.subscriptionid
AND (serial.STATUS IN (4, 41, 42, 43, 44) OR ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3 OR serial.STATUS = 7))
while ( my $line = $sth->fetchrow_hashref ) {
if ($line->{planneddate} && $line->{planneddate} !~/^0+\-/) {
+ $line->{planneddateISO} = $line->{planneddate};
$line->{planneddate} = format_date( $line->{planneddate} );
}
if ($line->{claimdate} && $line->{claimdate} !~/^0+\-/) {
+ $line->{claimdateISO} = $line->{claimdate};
$line->{claimdate} = format_date( $line->{claimdate} );
}
$line->{"status".$line->{status}} = 1;
return :
$resultdate - then next date in the sequence (ISO date)
-Return $publisheddate if subscription is irregular
+Return undef if subscription is irregular
=cut
sub GetNextDate {
my ( $subscription, $publisheddate, $updatecount ) = @_;
+ return unless $subscription and $publisheddate;
+
my $freqdata = GetSubscriptionFrequency($subscription->{'periodicity'});
if ($freqdata->{'unit'}) {
# irreg1;irreg2;irreg3
# where irregX is the number of issue which will not be received
# (the first issue takes the number 1, the 2nd the number 2 and so on)
- my @irreg = split /;/, $subscription->{'irregularity'} ;
my %irregularities;
- foreach my $irregularity (@irreg) {
- $irregularities{$irregularity} = 1;
+ if ( $subscription->{irregularity} ) {
+ my @irreg = split /;/, $subscription->{'irregularity'} ;
+ foreach my $irregularity (@irreg) {
+ $irregularities{$irregularity} = 1;
+ }
}
# Get the 'fictive' next issue number
}
return sprintf("%04d-%02d-%02d", $year, $month, $day);
}
- else {
- return $publisheddate;
- }
}
=head2 _numeration
sub _numeration {
my ($value, $num_type, $locale) = @_;
$value ||= 0;
- my $initlocale = setlocale(LC_TIME);
- if($locale and $locale ne $initlocale) {
- $locale = setlocale(LC_TIME, $locale);
- }
- $locale ||= $initlocale;
- my $string;
$num_type //= '';
- given ($num_type) {
- when (/^dayname$/) {
- $value = $value % 7;
- $string = POSIX::strftime("%A",0,0,0,0,0,0,$value);
- }
- when (/^monthname$/) {
- $value = $value % 12;
- $string = POSIX::strftime("%B",0,0,0,1,$value,0,0,0,0);
- }
- when (/^season$/) {
- my $seasonlocale = ($locale)
- ? (substr $locale,0,2)
- : "en";
- my %seasons=(
- "en" =>
- [qw(Spring Summer Fall Winter)],
- "fr"=>
- [qw(Printemps Été Automne Hiver)],
- );
- $value = $value % 4;
- $string = ($seasons{$seasonlocale})
- ? $seasons{$seasonlocale}->[$value]
- : $seasons{'en'}->[$value];
- }
- default {
- $string = $value;
- }
- }
- if($locale ne $initlocale) {
- setlocale(LC_TIME, $initlocale);
+ $locale ||= 'en';
+ my $string;
+ if ( $num_type =~ /^dayname$/ ) {
+ # 1970-11-01 was a Sunday
+ $value = $value % 7;
+ my $dt = DateTime->new(
+ year => 1970,
+ month => 11,
+ day => $value + 1,
+ locale => $locale,
+ );
+ $string = $dt->strftime("%A");
+ } elsif ( $num_type =~ /^monthname$/ ) {
+ $value = $value % 12;
+ my $dt = DateTime->new(
+ year => 1970,
+ month => $value + 1,
+ locale => $locale,
+ );
+ $string = $dt->strftime("%B");
+ } elsif ( $num_type =~ /^season$/ ) {
+ my @seasons= qw( Spring Summer Fall Winter );
+ $value = $value % 4;
+ $string = $seasons[$value];
+ } else {
+ $string = $value;
}
+
return $string;
}
$can = can_edit_subscription( $subscriptionid[, $userid] );
-Return 1 if the subscription is editable by the current logged user (or a given $userid), else 0.
+Return 1 if the subscription can be edited by the current logged user (or a given $userid), else 0.
=cut
sub can_edit_subscription {
my ( $subscription, $userid ) = @_;
+ return _can_do_on_subscription( $subscription, $userid, 'edit_subscription' );
+}
+
+=head2 can_show_subscription
+
+ $can = can_show_subscription( $subscriptionid[, $userid] );
+
+Return 1 if the subscription can be shown by the current logged user (or a given $userid), else 0.
+
+=cut
+
+sub can_show_subscription {
+ my ( $subscription, $userid ) = @_;
+ return _can_do_on_subscription( $subscription, $userid, '*' );
+}
+
+sub _can_do_on_subscription {
+ my ( $subscription, $userid, $permission ) = @_;
return 0 unless C4::Context->userenv;
my $flags = C4::Context->userenv->{flags};
$userid ||= C4::Context->userenv->{'id'};
- my $independent_branches = C4::Context->preference('IndependentBranches');
- return 1 unless $independent_branches;
- if( C4::Context->IsSuperLibrarian()
- or C4::Auth::haspermission( $userid, {serials => 'superserials'}),
- or C4::Auth::haspermission( $userid, {serials => 'edit_subscription'}),
- or not defined $subscription->{branchcode}
- or $subscription->{branchcode} eq ''
- or $subscription->{branchcode} eq C4::Context->userenv->{'branch'}
- ) {
- return 1;
- }
- return 0;
+
+ if ( C4::Context->preference('IndependentBranches') ) {
+ return 1
+ if C4::Context->IsSuperLibrarian()
+ or
+ C4::Auth::haspermission( $userid, { serials => 'superserials' } )
+ or (
+ C4::Auth::haspermission( $userid,
+ { serials => $permission } )
+ and ( not defined $subscription->{branchcode}
+ or $subscription->{branchcode} eq ''
+ or $subscription->{branchcode} eq
+ C4::Context->userenv->{'branch'} )
+ );
+ }
+ else {
+ return 1
+ if C4::Context->IsSuperLibrarian()
+ or
+ C4::Auth::haspermission( $userid, { serials => 'superserials' } )
+ or C4::Auth::haspermission(
+ $userid, { serials => $permission }
+ ),
+ ;
+ }
+ return 0;
}
1;
projects / koha_fer / blobdiff