[Koha-patches] [PATCH] Adding enddate to Subscriptions
Henri-Damien LAURENT
henridamien.laurent at biblibre.com
Tue Aug 25 23:56:20 CEST 2009
---
C4/Serials.pm | 222 +++++++++++++++-----
.../mysql/atomicupdate/subscription_add_enddate.pl | 7 +
.../prog/en/modules/serials/subscription-add.tmpl | 22 ++
.../en/modules/serials/subscription-detail.tmpl | 24 ++-
serials/subscription-add.pl | 11 +-
serials/subscription-detail.pl | 51 +++--
6 files changed, 265 insertions(+), 72 deletions(-)
create mode 100644 installer/data/mysql/atomicupdate/subscription_add_enddate.pl
diff --git a/C4/Serials.pm b/C4/Serials.pm
index 0745d3c..b0ad919 100644
--- a/C4/Serials.pm
+++ b/C4/Serials.pm
@@ -19,7 +19,7 @@ package C4::Serials; #assumes C4/Serials.pm
use strict;
-use C4::Dates qw(format_date format_date_in_iso);
+use C4::Dates qw(format_date);
use Date::Calc qw(:all);
use POSIX qw(strftime);
use C4::Suggestions;
@@ -41,7 +41,7 @@ BEGIN {
&NewSubscription &ModSubscription &DelSubscription &GetSubscriptions
&GetSubscription &CountSubscriptionFromBiblionumber &GetSubscriptionsFromBiblionumber
&GetFullSubscriptionsFromBiblionumber &GetFullSubscription &ModSubscriptionHistory
- &HasSubscriptionExpired &GetExpirationDate &abouttoexpire
+ &HasSubscriptionStrictlyExpired &HasSubscriptionExpired &GetExpirationDate &abouttoexpire
&GetNextSeq &NewIssue &ItemizeSerials &GetSerials
&GetLatestSerials &ModSerialStatus &GetNextDate &GetSerials2
@@ -51,10 +51,12 @@ BEGIN {
&UpdateClaimdateIssues
&GetSuppliersWithLateIssues &getsupplierbyserialid
+ &GetDistributedTo &SetDistributedTo
&getroutinglist &delroutingmember &addroutingmember
&reorder_members
&check_routing &updateClaim &removeMissingIssue
-
+ &CountIssues
+
);
}
@@ -320,14 +322,14 @@ Update Claimdate for issues in @$serialids list with date $date
sub UpdateClaimdateIssues {
my ( $serialids, $date ) = @_;
- if (!$date) {
- $date = strftime('%Y-%m-%d',localtime);
- }
my $dbh = C4::Context->dbh;
- my $ids_str = join ',', @{$serialids};
- my $query = 'UPDATE serial SET claimdate=? ,status=7 WHERE serialid IN ( '
- . $ids_str . ' )';
- return $dbh->do($query,undef, $date);
+ $date = strftime("%Y-%m-%d",localtime) unless ($date);
+ my $query = "
+ UPDATE serial SET claimdate=$date,status=7
+ WHERE serialid in (".join (",",@$serialids) .")";
+ my $rq = $dbh->prepare($query);
+ $rq->execute;
+ return $rq->rows;
}
=head2 GetSubscription
@@ -350,7 +352,6 @@ sub GetSubscription {
my $query = qq(
SELECT subscription.*,
subscriptionhistory.*,
- subscriptionhistory.enddate as histenddate,
aqbudget.bookfundid,
aqbooksellers.name AS aqbooksellername,
biblio.title AS bibliotitle,
@@ -514,7 +515,6 @@ sub GetSubscriptionsFromBiblionumber {
SELECT subscription.*,
branches.branchname,
subscriptionhistory.*,
- subscriptionhistory.enddate as histenddate,
aqbudget.bookfundid,
aqbooksellers.name AS aqbooksellername,
biblio.title AS bibliotitle
@@ -587,7 +587,6 @@ sub GetFullSubscriptionsFromBiblionumber {
aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,
biblio.title as bibliotitle,
subscription.branchcode AS branchcode,
- branches.branchname AS branchname,
subscription.subscriptionid AS subscriptionid|;
if (C4::Context->preference('IndependantBranches') &&
C4::Context->userenv &&
@@ -602,7 +601,6 @@ sub GetFullSubscriptionsFromBiblionumber {
(serial.subscriptionid=subscription.subscriptionid)
LEFT JOIN aqbudget ON subscription.aqbudgetid=aqbudget.aqbudgetid
LEFT JOIN aqbooksellers on subscription.aqbooksellerid=aqbooksellers.id
- LEFT JOIN branches ON branches.branchcode=subscription.branchcode
LEFT JOIN biblio on biblio.biblionumber=subscription.biblionumber
WHERE subscription.biblionumber = ?
ORDER BY year DESC,
@@ -735,7 +733,7 @@ sub GetSerials {
$count=5 unless ($count);
my @serials;
my $query =
- "SELECT serialid,serialseq, status, publisheddate, planneddate,notes, routingnotes, claimdate
+ "SELECT serialid,serialseq, status, publisheddate, planneddate,notes, routingnotes
FROM serial
WHERE subscriptionid = ? AND status NOT IN (2,4,5)
ORDER BY IF(publisheddate<>'0000-00-00',publisheddate,planneddate) DESC";
@@ -746,7 +744,6 @@ sub GetSerials {
1; # fills a "statusX" value, used for template status select list
$line->{"publisheddate"} = format_date( $line->{"publisheddate"} );
$line->{"planneddate"} = format_date( $line->{"planneddate"} );
- $line->{claimdate} = format_date( $line->{claimdate} );
push @serials, $line;
}
# OK, now add the last 5 issues arrives/missing
@@ -832,7 +829,7 @@ sub GetLatestSerials {
FROM serial
WHERE subscriptionid = ?
AND (status =2 or status=4)
- ORDER BY publisheddate DESC LIMIT 0,$limit
+ ORDER BY planneddate DESC LIMIT 0,$limit
";
my $sth = $dbh->prepare($strsth);
$sth->execute($subscriptionid);
@@ -855,6 +852,27 @@ sub GetLatestSerials {
return \@serials;
}
+=head2 GetDistributedTo
+
+=over 4
+
+$distributedto=GetDistributedTo($subscriptionid)
+This function select the old previous value of distributedto in the database.
+
+=back
+
+=cut
+
+sub GetDistributedTo {
+ my $dbh = C4::Context->dbh;
+ my $distributedto;
+ my $subscriptionid = @_;
+ my $query = "SELECT distributedto FROM subscription WHERE subscriptionid=?";
+ my $sth = $dbh->prepare($query);
+ $sth->execute($subscriptionid);
+ return ($distributedto) = $sth->fetchrow;
+}
+
=head2 GetNextSeq
=over 4
@@ -1010,10 +1028,15 @@ sub GetExpirationDate {
my ($subscriptionid) = @_;
my $dbh = C4::Context->dbh;
my $subscription = GetSubscription($subscriptionid);
- my $enddate = $subscription->{startdate};
-
-# we don't do the same test if the subscription is based on X numbers or on X weeks/months
- if (($subscription->{periodicity} % 16) >0){
+ my $enddate = $$subscription{enddate}||$$subscription{histenddate};
+
+ return $enddate if ($enddate && $enddate ne "0000-00-00");
+
+ # we don't do the same test if the subscription is based on X numbers or on X weeks/months
+ $enddate=$$subscription{startdate};
+ my @date=split (/-/,$$subscription{startdate});
+ return if (scalar(@date)!=3 ||not check_date(@date));
+ if (($subscription->{periodicity} % 16) >0){
if ( $subscription->{numberlength} ) {
#calculate the date of the last issue.
my $length = $subscription->{numberlength};
@@ -1022,17 +1045,20 @@ sub GetExpirationDate {
}
}
elsif ( $subscription->{monthlength} ){
- my @date=split (/-/,$subscription->{startdate});
- my @enddate = Add_Delta_YM($date[0],$date[1],$date[2],0,$subscription->{monthlength});
- $enddate=sprintf("%04d-%02d-%02d",$enddate[0],$enddate[1],$enddate[2]);
- } elsif ( $subscription->{weeklength} ){
- my @date=split (/-/,$subscription->{startdate});
- my @enddate = Add_Delta_Days($date[0],$date[1],$date[2],$subscription->{weeklength}*7);
- $enddate=sprintf("%04d-%02d-%02d",$enddate[0],$enddate[1],$enddate[2]);
- }
- return $enddate;
- } else {
- return 0;
+ if ($$subscription{startdate}){
+ my @enddate = Add_Delta_YM($date[0],$date[1],$date[2],0,$subscription->{monthlength});
+ $enddate=sprintf("%04d-%02d-%02d",$enddate[0],$enddate[1],$enddate[2]);
+ }
+ } elsif ( $subscription->{weeklength} ){
+ if ($$subscription{startdate}){
+ my @date=split (/-/,$subscription->{startdate});
+ my @enddate = Add_Delta_Days($date[0],$date[1],$date[2],$subscription->{weeklength}*7);
+ $enddate=sprintf("%04d-%02d-%02d",$enddate[0],$enddate[1],$enddate[2]);
+ }
+ }
+ return $enddate;
+ } else {
+ return ;
}
}
@@ -1078,7 +1104,7 @@ sub ModSubscriptionHistory {
) = @_;
my $dbh = C4::Context->dbh;
my $query = "UPDATE subscriptionhistory
- SET histstartdate=?,enddate=?,recievedlist=?,missinglist=?,opacnote=?,librariannote=?
+ SET histstartdate=?,histenddate=?,recievedlist=?,missinglist=?,opacnote=?,librariannote=?
WHERE subscriptionid=?
";
my $sth = $dbh->prepare($query);
@@ -1279,8 +1305,8 @@ sub ModSubscription {
$whenmorethan3, $setto3, $lastvalue3, $innerloop3,
$numberingmethod, $status, $biblionumber, $callnumber,
$notes, $letter, $hemisphere, $manualhistory,
- $internalnotes, $serialsadditems,$subscriptionid,
- $staffdisplaycount,$opacdisplaycount, $graceperiod, $location
+ $internalnotes, $serialsadditems,
+ $staffdisplaycount,$opacdisplaycount, $graceperiod, $location,$enddate,$subscriptionid
) = @_;
# warn $irregularity;
my $dbh = C4::Context->dbh;
@@ -1290,7 +1316,10 @@ sub ModSubscription {
add1=?,every1=?,whenmorethan1=?,setto1=?,lastvalue1=?,innerloop1=?,
add2=?,every2=?,whenmorethan2=?,setto2=?,lastvalue2=?,innerloop2=?,
add3=?,every3=?,whenmorethan3=?,setto3=?,lastvalue3=?,innerloop3=?,
- numberingmethod=?, status=?, biblionumber=?, callnumber=?, notes=?, letter=?, hemisphere=?,manualhistory=?,internalnotes=?,serialsadditems=?,staffdisplaycount = ?,opacdisplaycount = ?, graceperiod = ?, location = ?
+ numberingmethod=?, status=?, biblionumber=?, callnumber=?, notes=?,
+ letter=?, hemisphere=?,manualhistory=?,internalnotes=?,serialsadditems=?,
+ staffdisplaycount = ?,opacdisplaycount = ?, graceperiod = ?, location = ?
+ ,enddate=?
WHERE subscriptionid = ?";
#warn "query :".$query;
my $sth = $dbh->prepare($query);
@@ -1306,7 +1335,7 @@ sub ModSubscription {
$numberingmethod, $status, $biblionumber, $callnumber,
$notes, $letter, $hemisphere, ($manualhistory?$manualhistory:0),
$internalnotes, $serialsadditems,
- $staffdisplaycount, $opacdisplaycount, $graceperiod, $location,
+ $staffdisplaycount, $opacdisplaycount, $graceperiod, $location,$enddate,
$subscriptionid
);
my $rows=$sth->rows;
@@ -1326,7 +1355,7 @@ $subscriptionid = &NewSubscription($auser,branchcode,$aqbooksellerid,$cost,$aqbu
$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,$innerloop2,
$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3,
$numberingmethod, $status, $notes, $serialsadditems,
- $staffdisplaycount, $opacdisplaycount, $graceperiod, $location);
+ $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate);
Create a new subscription with value given on input args.
@@ -1350,7 +1379,7 @@ sub NewSubscription {
$notes, $letter, $firstacquidate, $irregularity,
$numberpattern, $callnumber, $hemisphere, $manualhistory,
$internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount,
- $graceperiod, $location
+ $graceperiod, $location,$enddate
) = @_;
my $dbh = C4::Context->dbh;
@@ -1364,15 +1393,15 @@ sub NewSubscription {
add3,every3,whenmorethan3,setto3,lastvalue3,innerloop3,
numberingmethod, status, notes, letter,firstacquidate,irregularity,
numberpattern, callnumber, hemisphere,manualhistory,internalnotes,serialsadditems,
- staffdisplaycount,opacdisplaycount,graceperiod,location)
- VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+ staffdisplaycount,opacdisplaycount,graceperiod,location,enddate)
+ VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
|;
my $sth = $dbh->prepare($query);
$sth->execute(
$auser, $branchcode,
$aqbooksellerid, $cost,
$aqbudgetid, $biblionumber,
- format_date_in_iso($startdate), $periodicity,
+ $startdate, $periodicity,
$dow, $numberlength,
$weeklength, $monthlength,
$add1, $every1,
@@ -1386,12 +1415,13 @@ sub NewSubscription {
$lastvalue3, $innerloop3,
$numberingmethod, "$status",
$notes, $letter,
- format_date_in_iso($firstacquidate), $irregularity,
+ $firstacquidate, $irregularity,
$numberpattern, $callnumber,
$hemisphere, $manualhistory,
$internalnotes, $serialsadditems,
$staffdisplaycount, $opacdisplaycount,
$graceperiod, $location,
+ $enddate
);
#then create the 1st waited number
@@ -1403,7 +1433,7 @@ sub NewSubscription {
);
$sth = $dbh->prepare($query);
$sth->execute( $biblionumber, $subscriptionid,
- format_date_in_iso($startdate),
+ $startdate,
$notes,$internalnotes );
# reread subscription to get a hash (for calculation of the 1st issue number)
@@ -1426,8 +1456,8 @@ sub NewSubscription {
$sth = $dbh->prepare($query);
$sth->execute(
"$serialseq", $subscriptionid, $biblionumber, 1,
- format_date_in_iso($firstacquidate),
- format_date_in_iso($firstacquidate)
+ $firstacquidate,
+ $firstacquidate
);
logaction("SERIAL", "ADD", $subscriptionid, "") if C4::Context->preference("SubscriptionLog");
@@ -1492,7 +1522,7 @@ sub ReNewSubscription {
WHERE subscriptionid=?
|;
$sth = $dbh->prepare($query);
- $sth->execute( format_date_in_iso($startdate),
+ $sth->execute( $startdate,
$numberlength, $weeklength, $monthlength, $subscriptionid );
logaction("SERIAL", "RENEW", $subscriptionid, "") if C4::Context->preference("SubscriptionLog");
@@ -1610,7 +1640,7 @@ sub ItemizeSerials {
$sth->execute( $data->{'biblionumber'} );
my $biblioitem = $sth->fetchrow_hashref;
$biblioitem->{'volumedate'} =
- format_date_in_iso( $data->{planneddate} );
+ $data->{planneddate} ;
$biblioitem->{'volumeddesc'} =
$data->{serialseq} . ' ('
. format_date( $data->{'planneddate'} ) . ')';
@@ -1758,6 +1788,49 @@ sub ItemizeSerials {
}
}
+=head2 HasSubscriptionStrictlyExpired
+
+=over 4
+
+1 or 0 = HasSubscriptionStrictlyExpired($subscriptionid)
+
+the subscription has stricly expired when today > the end subscription date
+
+return :
+1 if true, 0 if false, -1 if the expiration date is not set.
+
+=back
+
+=cut
+sub HasSubscriptionStrictlyExpired {
+ # Getting end of subscription date
+ my ($subscriptionid) = @_;
+ my $dbh = C4::Context->dbh;
+ my $subscription = GetSubscription($subscriptionid);
+ my $expirationdate = GetExpirationDate($subscriptionid);
+
+ # If the expiration date is set
+ if ($expirationdate != 0) {
+ my ($endyear, $endmonth, $endday) = split('-', $expirationdate);
+
+ # Getting today's date
+ my ($nowyear, $nowmonth, $nowday) = Today();
+
+ # if today's date > expiration date, then the subscription has stricly expired
+ if (Delta_Days($nowyear, $nowmonth, $nowday,
+ $endyear, $endmonth, $endday) < 0) {
+ return 1;
+ } else {
+ return 0;
+ }
+ } else {
+ # There are some cases where the expiration date is not set
+ # As we can't determine if the subscription has expired on a date-basis,
+ # we return -1;
+ return -1;
+ }
+}
+
=head2 HasSubscriptionExpired
=over 4
@@ -1809,6 +1882,29 @@ sub HasSubscriptionExpired {
return 0; # Notice that you'll never get here.
}
+=head2 SetDistributedto
+
+=over 4
+
+SetDistributedto($distributedto,$subscriptionid);
+This function update the value of distributedto for a subscription given on input arg.
+
+=back
+
+=cut
+
+sub SetDistributedto {
+ my ( $distributedto, $subscriptionid ) = @_;
+ my $dbh = C4::Context->dbh;
+ my $query = qq|
+ UPDATE subscription
+ SET distributedto=?
+ WHERE subscriptionid=?
+ |;
+ my $sth = $dbh->prepare($query);
+ $sth->execute( $distributedto, $subscriptionid );
+}
+
=head2 DelSubscription
=over 4
@@ -1930,7 +2026,7 @@ LEFT JOIN subscription ON serial.subscriptionid=subscription.subscriptionid
LEFT JOIN biblio ON subscription.biblionumber=biblio.biblionumber
LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id
WHERE subscription.subscriptionid = serial.subscriptionid
-AND (serial.STATUS = 4 OR ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3))
+AND (serial.STATUS = 4 OR ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3 OR serial.STATUS = 7))
AND subscription.aqbooksellerid=$supplierid
$byserial
ORDER BY $order"
@@ -1957,7 +2053,7 @@ LEFT JOIN aqbooksellers
ON subscription.aqbooksellerid = aqbooksellers.id
WHERE
subscription.subscriptionid = serial.subscriptionid
-AND (serial.STATUS = 4 OR ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3))
+AND (serial.STATUS = 4 OR ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3 OR serial.STATUS = 7))
$byserial
ORDER BY $order"
);
@@ -2301,6 +2397,31 @@ sub countissuesfrom {
return $countreceived;
}
+=head2 CountIssues
+
+=over 4
+
+$result = &CountIssues($subscriptionid)
+
+
+=back
+
+=cut
+
+sub CountIssues {
+ my ($subscriptionid) = @_;
+ my $dbh = C4::Context->dbh;
+ my $query = qq|
+ SELECT count(*)
+ FROM serial
+ WHERE subscriptionid=?
+ |;
+ my $sth=$dbh->prepare($query);
+ $sth->execute($subscriptionid);
+ my ($countreceived)=$sth->fetchrow;
+ return $countreceived;
+}
+
=head2 abouttoexpire
=over 4
@@ -2359,6 +2480,7 @@ sub abouttoexpire {
} else {return 0}
}
+
=head2 GetNextDate
($resultdate) = &GetNextDate($planneddate,$subscription)
diff --git a/installer/data/mysql/atomicupdate/subscription_add_enddate.pl b/installer/data/mysql/atomicupdate/subscription_add_enddate.pl
new file mode 100644
index 0000000..8f8c230
--- /dev/null
+++ b/installer/data/mysql/atomicupdate/subscription_add_enddate.pl
@@ -0,0 +1,7 @@
+#!/usr/bin/perl
+use C4::Context;
+my $dbh=C4::Context->dbh;
+$dbh->do("ALTER TABLE `subscription` ADD `enddate` date default NULL");
+$dbh->do("ALTER TABLE subscriptionhistory CHANGE enddate histenddate DATE default NULL");
+print "Upgrade to $DBversion done ( Adding enddate to subscription)\n";
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
index 26337f1..e45181b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
@@ -917,6 +917,7 @@ function Check(f) {
$(document).ready(function() {
init_pattern();
+ // $(".widelabel").attr("width", "300px"); // labels stay skinny in IE7 anyway.
<!-- TMPL_IF name="mod" -->
set_num_pattern_from_template_vars();
<!-- TMPL_IF name="hemisphere" -->
@@ -1288,6 +1289,27 @@ $(document).ready(function() {
<input type="text" name="sublength" value="<!-- TMPL_VAR name="sublength" -->" size="3" onkeypress="return check_input(event)" /> (enter amount in numerals)
<span class="required">Required</span>
</li>
+ <li>
+ <label for="ending_date" class="required"> Subscription end date:</label>
+
+ <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="buttonend1" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" />
+ <input type="text" name="enddate" value="<!-- TMPL_VAR name="enddate" -->" size="13" maxlength="10" id="ending_date" style="border-width: 0px;" />
+ <!-- both scripts for calendar must follow the input field -->
+ <script type="text/javascript">
+ Calendar.setup({
+ inputField : "ending_date",
+ ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
+ button : "buttonend1",
+ align : "Tl"
+ });
+ Calendar.setup({
+ inputField : "ending_date",
+ ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
+ button : "ending_date",
+ align : "Tl"
+ });
+ </script>
+ </li>
<li><label for="numberingmethod">Numbering formula:</label> <input type="text" name="numberingmethod" id="numberingmethod" value="<!-- TMPL_VAR name="numberingmethod" -->" />
</li>
</ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
index 82b73af..0ca920f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
@@ -52,7 +52,29 @@ function popup(subscriptionid) {
<h1>Subscription for <!-- TMPL_VAR name="bibliotitle" --> </h1>
<!--TMPL_IF Name="abouttoexpire"--><div class="problem">Subscription is near its end. It should be renewed now.</div><!--/TMPL_IF-->
-
+ <!-- TMPL_IF NAME="NEEDSCONFIRMATION" -->
+ <div id="circ_needsconfirmation" class="dialog alert">
+ <h3>Please Confirm Subscription deletion</h3>
+
+ <ul>
+ <!-- TMPL_IF NAME="NOTEXPIRED" --> <li>The subscription has not expired yet</li> <!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="LINKEDISSUES" --> <li>The subscription has linked issues</li> <!-- /TMPL_IF -->
+ </ul>
+ <form method="post" action="/cgi-bin/koha/serials/subscription-detail.pl">
+ <input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR NAME="subscriptionid" -->" />
+ <input type="hidden" name="issueconfirmed" value="1" />
+ <input type="hidden" name="op" value="del" />
+ <input type="submit" class="approve" value="Yes, Delete (Y)" accesskey="y" />
+ </form>
+ <form method="get" action="/cgi-bin/koha/serials/subscription-detail.pl">
+ <input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR NAME="subscriptionid" -->" />
+ <input type="submit" class="deny" value="No, Don't Delete (N)" accesskey="n" />
+ </form>
+
+ </div>
+ <!-- /TMPL_IF --> <!-- NEEDSCONFIRMATION -->
+
+
<div id="subscription_info">
<h2>Subscription information</h2>
<ul>
diff --git a/serials/subscription-add.pl b/serials/subscription-add.pl
index 9fd55d1..9150f19 100755
--- a/serials/subscription-add.pl
+++ b/serials/subscription-add.pl
@@ -204,12 +204,14 @@ if ($op eq 'addsubscription') {
my $internalnotes = $query->param('internalnotes');
my $hemisphere = $query->param('hemisphere') || 1;
my $letter = $query->param('letter');
- # ## BugFIX : hdl doesnot know what innerloops or letter stand for but it seems necessary. So he adds them.
my $manualhistory = $query->param('manualhist');
my $serialsadditems = $query->param('serialsadditems');
my $staffdisplaycount = $query->param('staffdisplaycount');
my $opacdisplaycount = $query->param('opacdisplaycount');
my $location = $query->param('location');
+ my $startdate = format_date_in_iso($query->param('startdate'));
+ my $enddate = format_date_in_iso($query->param('enddate'));
+ my $firstacquidate = format_date_in_iso($query->param('firstacquidate'));
my $subscriptionid = NewSubscription($auser,$branchcode,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber,
$startdate,$periodicity,$dow,$numberlength,$weeklength,$monthlength,
$add1,$every1,$whenmorethan1,$setto1,$lastvalue1,$innerloop1,
@@ -217,7 +219,7 @@ if ($op eq 'addsubscription') {
$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3,
$numberingmethod, $status, $notes,$letter,$firstacquidate,join(",", at irregularity),
$numberpattern, $callnumber, $hemisphere,($manualhistory?$manualhistory:0),$internalnotes,
- $serialsadditems,$staffdisplaycount,$opacdisplaycount,$graceperiod,$location
+ $serialsadditems,$staffdisplaycount,$opacdisplaycount,$graceperiod,$location,$enddate
);
print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
@@ -232,9 +234,11 @@ if ($op eq 'addsubscription') {
my $biblionumber = $query->param('biblionumber');
my $aqbudgetid = $query->param('aqbudgetid');
my $startdate = format_date_in_iso($query->param('startdate'));
+ my $enddate = format_date_in_iso($query->param('enddate'));
my $nextacquidate = $query->param('nextacquidate') ?
format_date_in_iso($query->param('nextacquidate')):
format_date_in_iso($query->param('startdate'));
+ my $enddate = format_date_in_iso($query->param('enddate'));
my $periodicity = $query->param('periodicity');
my $dow = $query->param('dow');
my $sublength = $query->param('sublength');
@@ -274,7 +278,6 @@ if ($op eq 'addsubscription') {
my $hemisphere = $query->param('hemisphere');
my $letter = $query->param('letter');
my $manualhistory = $query->param('manualhist');
- my $enddate = $query->param('enddate');
my $serialsadditems = $query->param('serialsadditems');
# subscription history
my $histenddate = format_date_in_iso($query->param('histenddate'));
@@ -309,7 +312,7 @@ if ($op eq 'addsubscription') {
$whenmorethan3, $setto3, $lastvalue3, $innerloop3,
$numberingmethod, $status, $biblionumber, $callnumber,
$notes, $letter, $hemisphere, $manualhistory,$internalnotes,
- $serialsadditems, $subscriptionid,$staffdisplaycount,$opacdisplaycount,$graceperiod,$location
+ $serialsadditems, $staffdisplaycount,$opacdisplaycount,$graceperiod,$location,$enddate,$subscriptionid
);
}
print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl
index aa3179d..0687543 100755
--- a/serials/subscription-detail.pl
+++ b/serials/subscription-detail.pl
@@ -28,6 +28,7 @@ use Date::Calc qw/Today Day_of_Year Week_of_Year Add_Delta_Days/;
my $query = new CGI;
my $op = $query->param('op');
+my $issueconfirmed = $query->param('issueconfirmed');
my $dbh = C4::Context->dbh;
my $sth;
# my $id;
@@ -35,42 +36,58 @@ my ($template, $loggedinuser, $cookie, $hemisphere);
my $subscriptionid = $query->param('subscriptionid');
my $subs = &GetSubscription($subscriptionid);
-$subs->{enddate} = GetExpirationDate($subscriptionid);
+($template, $loggedinuser, $cookie)
+= get_template_and_user({template_name => "serials/subscription-detail.tmpl",
+ query => $query,
+ type => "intranet",
+ authnotrequired => 0,
+ flagsrequired => {serials => 1},
+ debug => 1,
+ });
+
+$$subs{enddate} ||= GetExpirationDate($subscriptionid);
if ($op eq 'del') {
- if ($subs->{'cannotedit'}){
+ if ($$subs{'cannotedit'}){
warn "Attempt to delete subscription $subscriptionid by ".C4::Context->userenv->{'id'}." not allowed";
print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
- }
+ exit;
+ }
+
+ # Asking for confirmation if the subscription has not strictly expired yet or if it has linked issues
+ my $strictlyexpired = HasSubscriptionStrictlyExpired($subscriptionid);
+ my $linkedissues = CountIssues($subscriptionid);
+ if ($strictlyexpired == 0 || $linkedissues > 0) {
+
+ $template->param(NEEDSCONFIRMATION => 1);
+ if ($strictlyexpired == 0) { $template->param("NOTEXPIRED" => 1); }
+ if ($linkedissues > 0) { $template->param("LINKEDISSUES" => 1); }
+
+ } else {
+ $issueconfirmed = "1";
+
+ }
+ # If it's ok to delete the subscription, we do so
+ if ($issueconfirmed eq "1") {
&DelSubscription($subscriptionid);
print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=serials-home.pl\"></html>";
exit;
+ }
}
my ($routing, @routinglist) = getroutinglist($subscriptionid);
my ($totalissues, at serialslist) = GetSerials($subscriptionid);
$totalissues-- if $totalissues; # the -1 is to have 0 if this is a new subscription (only 1 issue)
# the subscription must be deletable if there is NO issues for a reason or another (should not happend, but...)
-($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "serials/subscription-detail.tmpl",
- query => $query,
- type => "intranet",
- authnotrequired => 0,
- flagsrequired => {serials => 1},
- debug => 1,
- });
-
my ($user, $sessionID, $flags);
($user, $cookie, $sessionID, $flags)
= checkauth($query, 0, {catalogue => 1}, "intranet");
# COMMENT hdl : IMHO, we should think about passing more and more data hash to template->param rather than duplicating code a new coding Guideline ?
-$subs->{startdate} = format_date($subs->{startdate});
-$subs->{firstacquidate} = format_date($subs->{firstacquidate});
-$subs->{histstartdate} = format_date($subs->{histstartdate});
-$subs->{enddate} = format_date($subs->{enddate});
-$subs->{histenddate} = format_date($subs->{histenddate});
+for my $date qw(startdate enddate firstacquidate histstartdate histenddate){
+ $$subs{$_} = format_date($$subs{$_});
+}
$subs->{abouttoexpire} = abouttoexpire($subs->{subscriptionid});
$template->param($subs);
--
1.6.0.4
More information about the Koha-patches
mailing list