[Koha-patches] [PATCH] Adding and managing location in subscription
henridamien.laurent at biblibre.com
henridamien.laurent at biblibre.com
Thu Mar 5 12:21:55 CET 2009
From: Henri-Damien LAURENT <henridamien.laurent at biblibre.com>
---
C4/Serials.pm | 15 ++++++++-------
installer/data/mysql/kohastructure.sql | 1 +
installer/data/mysql/updatedatabase.pl | 7 +++++++
.../prog/en/modules/serials/subscription-add.tmpl | 4 ++++
.../en/modules/serials/subscription-detail.tmpl | 3 ++-
kohaversion.pl | 2 +-
serials/subscription-add.pl | 8 +++++---
7 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/C4/Serials.pm b/C4/Serials.pm
index 75e8de4..f993843 100644
--- a/C4/Serials.pm
+++ b/C4/Serials.pm
@@ -1297,7 +1297,7 @@ sub ModSubscription {
$numberingmethod, $status, $biblionumber, $callnumber,
$notes, $letter, $hemisphere, $manualhistory,
$internalnotes, $serialsadditems,
- $subscriptionid
+ $subscriptionid, $location
) = @_;
# warn $irregularity;
my $dbh = C4::Context->dbh;
@@ -1307,7 +1307,7 @@ 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=?
+ numberingmethod=?, status=?, biblionumber=?, callnumber=?, notes=?, letter=?, hemisphere=?,manualhistory=?,internalnotes=?,serialsadditems=?, location=?
WHERE subscriptionid = ?";
# warn "query :".$query;
my $sth = $dbh->prepare($query);
@@ -1322,7 +1322,7 @@ sub ModSubscription {
$whenmorethan3, $setto3, $lastvalue3, $innerloop3,
$numberingmethod, $status, $biblionumber, $callnumber,
$notes, $letter, $hemisphere, ($manualhistory?$manualhistory:0),
- $internalnotes, $serialsadditems,
+ $internalnotes, $serialsadditems,$location,
$subscriptionid
);
my $rows=$sth->rows;
@@ -1341,7 +1341,7 @@ $subscriptionid = &NewSubscription($auser,branchcode,$aqbooksellerid,$cost,$aqbu
$add1,$every1,$whenmorethan1,$setto1,$lastvalue1,$innerloop1,
$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,$innerloop2,
$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3,
- $numberingmethod, $status, $notes, $serialsadditems)
+ $numberingmethod, $status, $notes, $serialsadditems, $location)
Create a new subscription with value given on input args.
@@ -1364,7 +1364,7 @@ sub NewSubscription {
$lastvalue3, $innerloop3, $numberingmethod, $status,
$notes, $letter, $firstacquidate, $irregularity,
$numberpattern, $callnumber, $hemisphere, $manualhistory,
- $internalnotes, $serialsadditems,
+ $internalnotes, $serialsadditems, $location
) = @_;
my $dbh = C4::Context->dbh;
@@ -1377,8 +1377,8 @@ sub NewSubscription {
add2,every2,whenmorethan2,setto2,lastvalue2,innerloop2,
add3,every3,whenmorethan3,setto3,lastvalue3,innerloop3,
numberingmethod, status, notes, letter,firstacquidate,irregularity,
- numberpattern, callnumber, hemisphere,manualhistory,internalnotes,serialsadditems)
- VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+ numberpattern, callnumber, hemisphere,manualhistory,internalnotes,serialsadditems,location)
+ VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
|;
my $sth = $dbh->prepare($query);
$sth->execute(
@@ -1403,6 +1403,7 @@ sub NewSubscription {
$numberpattern, $callnumber,
$hemisphere, $manualhistory,
$internalnotes, $serialsadditems,
+ $location
);
#then create the 1st waited number
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index daf489e..0178af4 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -1891,6 +1891,7 @@ CREATE TABLE `subscription` (
`distributedto` text,
`internalnotes` longtext,
`callnumber` text,
+ `location` varchar(80) NULL default '',
`branchcode` varchar(10) NOT NULL default '',
`hemisphere` tinyint(3) default 0,
`lastbranch` varchar(10),
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 6b4d6ba..28c5eb0 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -2220,6 +2220,13 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
print "Upgrade to $DBversion done (data for Email Checkout Slips project)\n";
SetVersion ($DBversion);
}
+$DBversion = '3.01.00.015';
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+ $dbh->do(q{ ALTER TABLE `subscription` ADD location varchar(80) NULL DEFAULT '' AFTER callnumber; });
+ print "Upgrade to $DBversion done (Adding location to subscription table)\n";
+ SetVersion ($DBversion);
+}
+
=item DropAllForeignKeys($table)
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 60e09d7..eea4da7 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
@@ -983,6 +983,10 @@ $('#numberpattern').change( function() {
<!-- /TMPL_IF -->
</li>
<li>
+ <label for="location">Location:</label>
+ <input type="text" name="location" id="location" value="<!-- TMPL_VAR name="location" -->" size="30" />
+ </li>
+ <li>
<label for="callnumber">Call Number:</label>
<input type="text" name="callnumber" id="callnumber" value="<!-- TMPL_VAR name="callnumber" -->" size="20" />
</li>
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 8f78e73..9d1f412 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
@@ -66,7 +66,8 @@ function popup(subscriptionid) {
<!-- TMPL_ELSE -->
<li>Serial receipt does not create an item record.</li>
<!-- /TMPL_IF -->
- <!-- TMPL_IF name="callnumber" --><li><span class="label">Call Number:</span> <!-- TMPL_VAR name="callnumber" --> </li><!-- /TMPL_IF -->
+ <!-- TMPL_IF name="location" --><li><span class="label">Location:</span> <!-- TMPL_VAR name="location" --> </li><!-- /TMPL_IF -->
+ <!-- TMPL_IF name="callnumber" --><li><span class="label">Call Number:</span> <!-- TMPL_VAR name="callnumber" --> </li><!-- /TMPL_IF -->
<!-- TMPL_IF name="letter" --><li><span class="label">Patron alert with:</span> <!-- TMPL_VAR name="letter" --> </li><!-- /TMPL_IF -->
<!-- TMPL_IF name="notes" --><li><span class="label">Notes:</span> <!-- TMPL_VAR name="notes" --></li><!-- /TMPL_IF -->
<!-- TMPL_IF name="internalnotes" --><li><span class="label">Management Notes:</span> <!-- TMPL_VAR name="internalnotes" --></li><!-- /TMPL_IF -->
diff --git a/kohaversion.pl b/kohaversion.pl
index 825b86d..a0c6437 100644
--- a/kohaversion.pl
+++ b/kohaversion.pl
@@ -10,7 +10,7 @@
use strict;
sub kohaversion {
- our $VERSION = '3.01.00.013';
+ our $VERSION = '3.01.00.015';
# version needs to be set this way
# so that it can be picked up by Makefile.PL
# during install
diff --git a/serials/subscription-add.pl b/serials/subscription-add.pl
index 39bd8ff..0f477a1 100755
--- a/serials/subscription-add.pl
+++ b/serials/subscription-add.pl
@@ -40,7 +40,7 @@ my ($subscriptionid,$auser,$branchcode,$librarian,$cost,$aqbooksellerid, $aqbook
$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,$innerloop2,
$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3,
$numberingmethod, $status, $biblionumber,
- $bibliotitle, $callnumber, $notes, $hemisphere, $letter, $manualhistory,$serialsadditems);
+ $bibliotitle, $callnumber, $notes, $hemisphere, $letter, $manualhistory,$serialsadditems, $location);
my @budgets;
my ($template, $loggedinuser, $cookie)
@@ -213,6 +213,7 @@ if ($op eq 'addsubscription') {
# ## 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 $location = $query->param('location');
my $subscriptionid = NewSubscription($auser,$branchcode,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber,
$startdate,$periodicity,$dow,$numberlength,$weeklength,$monthlength,
$add1,$every1,$whenmorethan1,$setto1,$lastvalue1,$innerloop1,
@@ -220,7 +221,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,
+ $serialsadditems,$location
);
print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
@@ -287,6 +288,7 @@ if ($op eq 'addsubscription') {
my $opacnote = $query->param('opacnote');
my $librariannote = $query->param('librariannote');
my $history_only = $query->param('history_only');
+ my $location = $query->param('location');
# If it's a mod, we need to check the current 'expected' issue, and mod it in the serials table if necessary.
if ( $nextacquidate ne $nextexpected->{planneddate}->output('iso') ) {
ModNextExpected($subscriptionid,C4::Dates->new($nextacquidate,'iso'));
@@ -308,7 +310,7 @@ if ($op eq 'addsubscription') {
$whenmorethan3, $setto3, $lastvalue3, $innerloop3,
$numberingmethod, $status, $biblionumber, $callnumber,
$notes, $letter, $hemisphere, $manualhistory,$internalnotes,
- $serialsadditems, $subscriptionid,
+ $serialsadditems, $subscriptionid,$location
);
}
print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
--
1.5.6.3
More information about the Koha-patches
mailing list