View | Details | Raw Unified | Return to bug 7957
Collapse All | Expand All

(-)a/C4/Items.pm (-1 / +1 lines)
Lines 164-170 sub GetItem { Link Here
164
        ($data->{'serialseq'} , $data->{'publisheddate'}) = $ssth->fetchrow_array();
164
        ($data->{'serialseq'} , $data->{'publisheddate'}) = $ssth->fetchrow_array();
165
    }
165
    }
166
	#if we don't have an items.itype, use biblioitems.itemtype.
166
	#if we don't have an items.itype, use biblioitems.itemtype.
167
	if( ! $data->{'itype'} ) {
167
	if( $data and ! $data->{'itype'} ) {
168
		my $sth = $dbh->prepare("SELECT itemtype FROM biblioitems  WHERE biblionumber = ?");
168
		my $sth = $dbh->prepare("SELECT itemtype FROM biblioitems  WHERE biblionumber = ?");
169
		$sth->execute($data->{'biblionumber'});
169
		$sth->execute($data->{'biblionumber'});
170
		($data->{'itype'}) = $sth->fetchrow_array;
170
		($data->{'itype'}) = $sth->fetchrow_array;
(-)a/C4/Serials.pm (-152 / +56 lines)
Lines 45-57 BEGIN { Link Here
45
      &ReNewSubscription  &GetLateIssues      &GetLateOrMissingIssues
45
      &ReNewSubscription  &GetLateIssues      &GetLateOrMissingIssues
46
      &GetSerialInformation                   &AddItem2Serial
46
      &GetSerialInformation                   &AddItem2Serial
47
      &PrepareSerialsData &GetNextExpected    &ModNextExpected
47
      &PrepareSerialsData &GetNextExpected    &ModNextExpected
48
      &GetSerial &GetSerialItemnumber
48
49
49
      &UpdateClaimdateIssues
50
      &UpdateClaimdateIssues
50
      &GetSuppliersWithLateIssues             &getsupplierbyserialid
51
      &GetSuppliersWithLateIssues             &getsupplierbyserialid
51
      &GetDistributedTo   &SetDistributedTo
52
      &GetDistributedTo   &SetDistributedTo
52
      &getroutinglist     &delroutingmember   &addroutingmember
53
      &updateClaim        &removeMissingIssue
53
      &reorder_members
54
      &check_routing &updateClaim &removeMissingIssue
55
      &CountIssues
54
      &CountIssues
56
      HasItems
55
      HasItems
57
      &GetSubscriptionsFromBorrower
56
      &GetSubscriptionsFromBorrower
Lines 170-175 sub GetSubscriptionHistoryFromSubscriptionId { Link Here
170
    return $dbh->prepare($query);
169
    return $dbh->prepare($query);
171
}
170
}
172
171
172
=head2 GetSerial
173
174
    my $serial = &GetSerial($serialid);
175
176
This sub returns serial informations (ie. in serial table) for given $serialid
177
It returns a hashref where each key is a sql column.
178
179
=cut
180
181
sub GetSerial {
182
    my ($serialid) = @_;
183
184
    return unless $serialid;
185
186
    my $dbh = C4::Context->dbh;
187
    my $query = qq{
188
        SELECT *
189
        FROM serial
190
        WHERE serialid = ?
191
    };
192
    my $sth = $dbh->prepare($query);
193
    $sth->execute($serialid);
194
    return $sth->fetchrow_hashref;
195
}
196
197
=head2 GetSerialItemnumber
198
199
    my $itemnumber = GetSerialItemnumber($serialid);
200
201
Returns the itemnumber associated to $serialid or undef if there is no item.
202
203
=cut
204
205
sub GetSerialItemnumber {
206
    my ($serialid) = @_;
207
208
    return unless $serialid;
209
    my $itemnumber;
210
211
    my $dbh = C4::Context->dbh;
212
    my $query = qq{
213
        SELECT itemnumber
214
        FROM serialitems
215
        WHERE serialid = ?
216
    };
217
    my $sth = $dbh->prepare($query);
218
    my $rv = $sth->execute($serialid);
219
    if ($rv) {
220
        my $result = $sth->fetchrow_hashref;
221
        $itemnumber = $result->{itemnumber};
222
    }
223
    return $itemnumber;
224
}
225
173
=head2 GetSerialStatusFromSerialId
226
=head2 GetSerialStatusFromSerialId
174
227
175
$sth = GetSerialStatusFromSerialId();
228
$sth = GetSerialStatusFromSerialId();
Lines 1972-2126 sub getsupplierbyserialid { Link Here
1972
    return $result;
2025
    return $result;
1973
}
2026
}
1974
2027
1975
=head2 check_routing
1976
1977
$result = &check_routing($subscriptionid)
1978
1979
this function checks to see if a serial has a routing list and returns the count of routingid
1980
used to show either an 'add' or 'edit' link
1981
1982
=cut
1983
1984
sub check_routing {
1985
    my ($subscriptionid) = @_;
1986
    my $dbh              = C4::Context->dbh;
1987
    my $sth              = $dbh->prepare(
1988
        "SELECT count(routingid) routingids FROM subscription LEFT JOIN subscriptionroutinglist 
1989
                              ON subscription.subscriptionid = subscriptionroutinglist.subscriptionid
1990
                              WHERE subscription.subscriptionid = ? ORDER BY ranking ASC
1991
                              "
1992
    );
1993
    $sth->execute($subscriptionid);
1994
    my $line   = $sth->fetchrow_hashref;
1995
    my $result = $line->{'routingids'};
1996
    return $result;
1997
}
1998
1999
=head2 addroutingmember
2000
2001
addroutingmember($borrowernumber,$subscriptionid)
2002
2003
this function takes a borrowernumber and subscriptionid and adds the member to the
2004
routing list for that serial subscription and gives them a rank on the list
2005
of either 1 or highest current rank + 1
2006
2007
=cut
2008
2009
sub addroutingmember {
2010
    my ( $borrowernumber, $subscriptionid ) = @_;
2011
    my $rank;
2012
    my $dbh = C4::Context->dbh;
2013
    my $sth = $dbh->prepare( "SELECT max(ranking) rank FROM subscriptionroutinglist WHERE subscriptionid = ?" );
2014
    $sth->execute($subscriptionid);
2015
    while ( my $line = $sth->fetchrow_hashref ) {
2016
        if ( $line->{'rank'} > 0 ) {
2017
            $rank = $line->{'rank'} + 1;
2018
        } else {
2019
            $rank = 1;
2020
        }
2021
    }
2022
    $sth = $dbh->prepare( "INSERT INTO subscriptionroutinglist (subscriptionid,borrowernumber,ranking) VALUES (?,?,?)" );
2023
    $sth->execute( $subscriptionid, $borrowernumber, $rank );
2024
}
2025
2026
=head2 reorder_members
2027
2028
reorder_members($subscriptionid,$routingid,$rank)
2029
2030
this function is used to reorder the routing list
2031
2032
it takes the routingid of the member one wants to re-rank and the rank it is to move to
2033
- it gets all members on list puts their routingid's into an array
2034
- removes the one in the array that is $routingid
2035
- then reinjects $routingid at point indicated by $rank
2036
- then update the database with the routingids in the new order
2037
2038
=cut
2039
2040
sub reorder_members {
2041
    my ( $subscriptionid, $routingid, $rank ) = @_;
2042
    my $dbh = C4::Context->dbh;
2043
    my $sth = $dbh->prepare( "SELECT * FROM subscriptionroutinglist WHERE subscriptionid = ? ORDER BY ranking ASC" );
2044
    $sth->execute($subscriptionid);
2045
    my @result;
2046
    while ( my $line = $sth->fetchrow_hashref ) {
2047
        push( @result, $line->{'routingid'} );
2048
    }
2049
2050
    # To find the matching index
2051
    my $i;
2052
    my $key = -1;    # to allow for 0 being a valid response
2053
    for ( $i = 0 ; $i < @result ; $i++ ) {
2054
        if ( $routingid == $result[$i] ) {
2055
            $key = $i;    # save the index
2056
            last;
2057
        }
2058
    }
2059
2060
    # if index exists in array then move it to new position
2061
    if ( $key > -1 && $rank > 0 ) {
2062
        my $new_rank = $rank - 1;                       # $new_rank is what you want the new index to be in the array
2063
        my $moving_item = splice( @result, $key, 1 );
2064
        splice( @result, $new_rank, 0, $moving_item );
2065
    }
2066
    for ( my $j = 0 ; $j < @result ; $j++ ) {
2067
        my $sth = $dbh->prepare( "UPDATE subscriptionroutinglist SET ranking = '" . ( $j + 1 ) . "' WHERE routingid = '" . $result[$j] . "'" );
2068
        $sth->execute;
2069
    }
2070
    return;
2071
}
2072
2073
=head2 delroutingmember
2074
2075
delroutingmember($routingid,$subscriptionid)
2076
2077
this function either deletes one member from routing list if $routingid exists otherwise
2078
deletes all members from the routing list
2079
2080
=cut
2081
2082
sub delroutingmember {
2083
2084
    # if $routingid exists then deletes that row otherwise deletes all with $subscriptionid
2085
    my ( $routingid, $subscriptionid ) = @_;
2086
    my $dbh = C4::Context->dbh;
2087
    if ($routingid) {
2088
        my $sth = $dbh->prepare("DELETE FROM subscriptionroutinglist WHERE routingid = ?");
2089
        $sth->execute($routingid);
2090
        reorder_members( $subscriptionid, $routingid );
2091
    } else {
2092
        my $sth = $dbh->prepare("DELETE FROM subscriptionroutinglist WHERE subscriptionid = ?");
2093
        $sth->execute($subscriptionid);
2094
    }
2095
    return;
2096
}
2097
2098
=head2 getroutinglist
2099
2100
@routinglist = getroutinglist($subscriptionid)
2101
2102
this gets the info from the subscriptionroutinglist for $subscriptionid
2103
2104
return :
2105
the routinglist as an array. Each element of the array contains a hash_ref containing
2106
routingid - a unique id, borrowernumber, ranking, and biblionumber of subscription
2107
2108
=cut
2109
2110
sub getroutinglist {
2111
    my ($subscriptionid) = @_;
2112
    my $dbh              = C4::Context->dbh;
2113
    my $sth              = $dbh->prepare(
2114
        'SELECT routingid, borrowernumber, ranking, biblionumber
2115
            FROM subscription 
2116
            JOIN subscriptionroutinglist ON subscription.subscriptionid = subscriptionroutinglist.subscriptionid
2117
            WHERE subscription.subscriptionid = ? ORDER BY ranking ASC'
2118
    );
2119
    $sth->execute($subscriptionid);
2120
    my $routinglist = $sth->fetchall_arrayref({});
2121
    return @{$routinglist};
2122
}
2123
2124
=head2 countissuesfrom
2028
=head2 countissuesfrom
2125
2029
2126
$result = countissuesfrom($subscriptionid,$startdate)
2030
$result = countissuesfrom($subscriptionid,$startdate)
(-)a/C4/Serials/RoutingLists.pm (+274 lines)
Line 0 Link Here
1
package C4::Serials::RoutingLists;
2
3
# Copyright 2012 Biblibre
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 2 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
20
use Modern::Perl;
21
22
use C4::Context;
23
24
use vars qw($VERSION @ISA @EXPORT_OK);
25
26
BEGIN {
27
    $VERSION = 3.01;
28
    require Exporter;
29
    @ISA = qw(Exporter);
30
    @EXPORT_OK = qw(
31
        &AddRoutingList
32
        &ModRoutingList
33
        &DelRoutingList
34
        &GetRoutingList
35
        &GetRoutingLists
36
        &GetRoutingListsCount
37
        &GetRoutingListAsCSV
38
    );
39
}
40
41
=head2 AddRoutingList
42
43
$routinglistid = &AddRoutingList($subscriptionid, $title);
44
45
this function create a new routing list for a subscription.
46
47
=cut
48
49
sub AddRoutingList {
50
    my ($subscriptionid, $title) = @_;
51
52
    my $dbh = C4::Context->dbh();
53
    my $query = qq{
54
        INSERT INTO subscriptionroutinglist (subscriptionid, title)
55
        VALUES (?, ?)
56
    };
57
    my $sth = $dbh->prepare($query);
58
    $sth->execute($subscriptionid, $title);
59
60
    return $dbh->last_insert_id(undef, undef, 'subscriptionroutinglist', undef);
61
}
62
63
=head2 ModRoutingList
64
65
&ModRoutingList($routinglistid, $subscriptionid, $title, $notes, @borrowernumbers);
66
67
this function modifies a routing list.
68
69
=cut
70
71
sub ModRoutingList {
72
    my ($routinglistid, $subscriptionid, $title, $notes, @borrowernumbers) = @_;
73
74
    my $dbh = C4::Context->dbh;
75
    my $query = 'UPDATE subscriptionroutinglist';
76
    my @setstrings = ();
77
    my @setargs = ();
78
    if($subscriptionid) {
79
        push @setstrings, 'subscriptionid = ?';
80
        push @setargs, $subscriptionid;
81
    }
82
    if($title) {
83
        push @setstrings, 'title = ?';
84
        push @setargs, $title;
85
    }
86
    if($notes) {
87
        push @setstrings, 'notes = ?';
88
        push @setargs, $notes;
89
    }
90
91
    if(@setstrings) {
92
        $query .= ' SET ' . join(',', @setstrings);
93
        $query .= ' WHERE routinglistid = ?';
94
        my $sth = $dbh->prepare($query);
95
        $sth->execute(@setargs, $routinglistid);
96
    }
97
98
    $query = qq{
99
        DELETE FROM subscriptionrouting
100
        WHERE routinglistid = ?
101
    };
102
    my $sth = $dbh->prepare($query);
103
    $sth->execute($routinglistid);
104
105
    if(@borrowernumbers > 0){
106
        $query = qq{
107
            INSERT INTO subscriptionrouting (routinglistid, borrowernumber, ranking)
108
            VALUES (?, ?, ?)
109
        };
110
        $sth = $dbh->prepare($query);
111
        my $i = 1;
112
        foreach (@borrowernumbers) {
113
            $sth->execute($routinglistid, $_, $i);
114
            $i++;
115
        }
116
    }
117
}
118
119
=head2 DelRoutingList
120
121
&DelRoutingList($routinglistid);
122
123
this function delete a routing list.
124
125
=cut
126
127
sub DelRoutingList {
128
    my ($routinglistid) = @_;
129
130
    my $dbh = C4::Context->dbh;
131
    my $query = qq{
132
        DELETE FROM subscriptionroutinglist
133
        WHERE routinglistid = ?
134
    };
135
    my $sth = $dbh->prepare($query);
136
    $sth->execute($routinglistid);
137
}
138
139
140
=head2 GetRoutingList
141
142
$routinglist = &GetRoutingList($routinglistid);
143
144
this function get infos from subscriptionroutinglist table.
145
The 'borrowers' keys contains the list of borrowernumbers attached
146
to this routing list.
147
148
=cut
149
150
sub GetRoutingList {
151
    my ($routinglistid) = @_;
152
153
    my $dbh = C4::Context->dbh;
154
    my $query = qq{
155
        SELECT *
156
        FROM subscriptionroutinglist
157
        WHERE routinglistid = ?
158
    };
159
    my $sth = $dbh->prepare($query);
160
    $sth->execute($routinglistid);
161
    my $result = $sth->fetchrow_hashref;
162
163
    $query = qq{
164
        SELECT borrowernumber
165
        FROM subscriptionrouting
166
        WHERE routinglistid = ?
167
        ORDER BY ranking ASC
168
    };
169
    $sth = $dbh->prepare($query);
170
    $sth->execute($routinglistid);
171
    while (my $row = $sth->fetchrow_hashref) {
172
        push @{$result->{borrowers}}, $row->{borrowernumber};
173
    }
174
175
    return $result;
176
}
177
178
=head2 GetRoutingLists
179
180
$routinglists = &GetRoutingLists($subscriptionid);
181
182
this function get all routing lists for a subscription.
183
184
=cut
185
186
sub GetRoutingLists {
187
    my ($subscriptionid) = @_;
188
189
    my $dbh = C4::Context->dbh;
190
    my $query = qq{
191
        SELECT routinglistid
192
        FROM subscriptionroutinglist
193
        WHERE subscriptionid = ?
194
    };
195
    my $sth = $dbh->prepare($query);
196
    $sth->execute($subscriptionid);
197
    my @results;
198
    while (my $row = $sth->fetchrow_hashref) {
199
        my $routinglistid = $row->{routinglistid};
200
        push @results, GetRoutingList($routinglistid);
201
    }
202
203
    return @results;
204
}
205
206
=head2 GetRoutingListsCount
207
208
$count = &GetRoutingListsCount($subscriptionid);
209
210
this function return the number of routing lists for a subscription.
211
212
=cut
213
214
sub GetRoutingListsCount {
215
    my ($subscriptionid) = @_;
216
217
    return unless $subscriptionid;
218
219
    my $dbh = C4::Context->dbh;
220
    my $query = qq{
221
        SELECT COUNT(*) AS count
222
        FROM subscriptionroutinglist
223
        WHERE subscriptionid = ?
224
    };
225
    my $sth = $dbh->prepare($query);
226
    $sth->execute($subscriptionid);
227
    my $result = $sth->fetchrow_hashref;
228
229
    return $result->{count};
230
}
231
232
=head2 GetRoutingListAsCSV
233
234
$csv_output = &GetRoutingListAsCSV($routinglistid);
235
236
this function return the routing list as a CSV file.
237
238
=cut
239
240
sub GetRoutingListAsCSV {
241
    my ($routinglistid) = @_;
242
243
    require C4::Biblio;
244
    require C4::Serials;
245
    require C4::Members;
246
    require Text::CSV::Encoded;
247
248
    my $csv = Text::CSV::Encoded->new( {encoding => "utf8" } );
249
    my $output;
250
251
    my $routinglist = GetRoutingList($routinglistid);
252
    my $subscription = C4::Serials::GetSubscription($routinglist->{'subscriptionid'});
253
    my (undef, $biblio) = C4::Biblio::GetBiblio($subscription->{'biblionumber'});
254
255
    my @headers = ("Subscription title", "Routing list", qw(Surname Firstname Notes));
256
    $csv->combine(@headers);
257
    $output .= $csv->string() . "\n";
258
259
    foreach (@{$routinglist->{borrowers}}) {
260
        my $member = C4::Members::GetMemberDetails($_);
261
        $csv->combine(
262
            $biblio->{'title'},
263
            $routinglist->{'title'},
264
            $member->{'surname'},
265
            $member->{'firstname'},
266
            $routinglist->{'notes'},
267
        );
268
        $output .= $csv->string() . "\n";
269
    }
270
271
    return $output;
272
}
273
274
1;
(-)a/installer/data/mysql/kohastructure.sql (-15 / +31 lines)
Lines 1940-1960 CREATE TABLE `subscriptionhistory` ( Link Here
1940
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
1940
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
1941
1941
1942
--
1942
--
1943
-- Table structure for table `subscriptionroutinglist`
1943
-- Table structure for table subscriptionroutinglist
1944
--
1944
--
1945
1945
1946
DROP TABLE IF EXISTS `subscriptionroutinglist`;
1946
DROP TABLE IF EXISTS subscriptionroutinglist;
1947
CREATE TABLE `subscriptionroutinglist` ( -- information related to the routing lists attached to subscriptions
1947
CREATE TABLE subscriptionroutinglist (
1948
  `routingid` int(11) NOT NULL auto_increment, -- unique identifier assigned by Koha
1948
    routinglistid int(11) NOT NULL AUTO_INCREMENT, -- unique identifier assigned by Koha
1949
  `borrowernumber` int(11) NOT NULL, -- foreign key from the borrowers table, defines with patron is on the routing list
1949
    subscriptionid int(11) NOT NULL, -- foreign key from the subscription table,
1950
  `ranking` int(11) default NULL, -- where the patron stands in line to receive the serial
1950
                                     -- defines which subscription this routing list is for
1951
  `subscriptionid` int(11) NOT NULL, -- foreign key from the subscription table, defines which subscription this routing list is for
1951
    title varchar(256) NOT NULL, -- title of this routing list
1952
  PRIMARY KEY  (`routingid`),
1952
    notes text default NULL, -- notes for this routing list
1953
  UNIQUE (`subscriptionid`, `borrowernumber`),
1953
    PRIMARY KEY (routinglistid),
1954
  CONSTRAINT `subscriptionroutinglist_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`)
1954
    CONSTRAINT subscriptionroutinglist_ibfk_1 FOREIGN KEY (subscriptionid)
1955
    ON DELETE CASCADE ON UPDATE CASCADE,
1955
      REFERENCES subscription (subscriptionid) ON DELETE CASCADE
1956
  CONSTRAINT `subscriptionroutinglist_ibfk_2` FOREIGN KEY (`subscriptionid`) REFERENCES `subscription` (`subscriptionid`)
1956
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
1957
    ON DELETE CASCADE ON UPDATE CASCADE
1957
1958
--
1959
-- Table structure for subscriptionrouting
1960
--
1961
1962
DROP TABLE IF EXISTS subscriptionrouting;
1963
CREATE TABLE subscriptionrouting (
1964
    routinglistid int(11) NOT NULL, -- foreign key from the subscriptionroutinglist
1965
                                    -- table, defines which routing list is affected
1966
    borrowernumber int(11) NOT NULL, -- foreign key from the borrowers table,
1967
                                     -- defines which patron is on the routing list
1968
    ranking int(11) DEFAULT NULL, -- where the patron stands in line to receive the serial
1969
    PRIMARY KEY (routinglistid, borrowernumber),
1970
    CONSTRAINT subscriptionrouting_ibfk_1 FOREIGN KEY (routinglistid)
1971
      REFERENCES subscriptionroutinglists (routinglistid) ON DELETE CASCADE,
1972
    CONSTRAINT subscriptionrouting_ibfk_2 FOREIGN KEY (borrowernumber)
1973
      REFERENCES borrowers (borrowernumber) ON DELETE CASCADE
1958
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
1974
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
1959
1975
1960
--
1976
--
(-)a/installer/data/mysql/updatedatabase.pl (+67 lines)
Lines 6020-6025 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
6020
   SetVersion ($DBversion);
6020
   SetVersion ($DBversion);
6021
}
6021
}
6022
6022
6023
$DBversion = "XXX";
6024
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
6025
    $dbh->do("RENAME TABLE subscriptionroutinglist TO tmp_subscriptionroutinglist");
6026
    $dbh->do("
6027
        CREATE TABLE subscriptionroutinglist (
6028
            routinglistid int(11) NOT NULL AUTO_INCREMENT,
6029
            subscriptionid int(11) NOT NULL,
6030
            title varchar(256) NOT NULL,
6031
            notes text default NULL,
6032
            PRIMARY KEY (routinglistid),
6033
            CONSTRAINT subscriptionroutinglist_ibfk_1 FOREIGN KEY (subscriptionid)
6034
              REFERENCES subscription (subscriptionid) ON DELETE CASCADE
6035
        ) ENGINE=InnoDB DEFAULT CHARSET=utf8
6036
    ");
6037
    $dbh->do("
6038
        CREATE TABLE subscriptionrouting (
6039
            routinglistid int(11) NOT NULL,
6040
            borrowernumber int(11) NOT NULL,
6041
            ranking int(11) DEFAULT NULL,
6042
            PRIMARY KEY (routinglistid, borrowernumber),
6043
            CONSTRAINT subscriptionrouting_ibfk_1 FOREIGN KEY (routinglistid)
6044
              REFERENCES subscriptionroutinglist (routinglistid) ON DELETE CASCADE,
6045
            CONSTRAINT subscriptionrouting_ibfk_2 FOREIGN KEY (borrowernumber)
6046
              REFERENCES borrowers (borrowernumber) ON DELETE CASCADE
6047
        ) ENGINE=InnoDB DEFAULT CHARSET=utf8
6048
    ");
6049
6050
    # Migrate data from old subscriptionroutinglist table
6051
    my $query = qq{
6052
        SELECT DISTINCT subscriptionid
6053
        FROM tmp_subscriptionroutinglist
6054
    };
6055
    my $sth = $dbh->prepare($query);
6056
    $sth->execute();
6057
    my $results = $sth->fetchall_arrayref( {} );
6058
    $query = qq{
6059
        INSERT INTO subscriptionroutinglist (subscriptionid, title)
6060
        VALUES (?, ?)
6061
    };
6062
    $sth = $dbh->prepare($query);
6063
    $query = qq{
6064
        SELECT borrowernumber, ranking
6065
        FROM tmp_subscriptionroutinglist
6066
        WHERE subscriptionid = ?
6067
    };
6068
    my $select_sth = $dbh->prepare($query);
6069
    $query = qq{
6070
        INSERT INTO subscriptionrouting (routinglistid, borrowernumber, ranking)
6071
        VALUES(?, ?, ?)
6072
    };
6073
    my $insert_sth = $dbh->prepare($query);
6074
    foreach ( @$results ) {
6075
        $sth->execute($_->{subscriptionid}, 'import');
6076
        my $routinglistid = $dbh->last_insert_id(undef, undef, 'subscriptionroutinglist', undef);
6077
        $select_sth->execute($_->{subscriptionid});
6078
        my $routings = $select_sth->fetchall_arrayref( {} );
6079
        foreach (@$routings) {
6080
            $insert_sth->execute($routinglistid, $_->{borrowernumber}, $_->{ranking});
6081
        }
6082
    }
6083
6084
    $dbh->do("DROP TABLE tmp_subscriptionroutinglist");
6085
    print "Upgrade to $DBversion done (New subscription routing list system).\n";
6086
    SetVersion($DBversion);
6087
}
6088
6089
6023
=head1 FUNCTIONS
6090
=head1 FUNCTIONS
6024
6091
6025
=head2 TableExists($table)
6092
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc (-2 / +2 lines)
Lines 3-11 Link Here
3
<li><a href="serials-collection.pl?subscriptionid=[% subscriptionid %]">Serial collection</a></li>
3
<li><a href="serials-collection.pl?subscriptionid=[% subscriptionid %]">Serial collection</a></li>
4
    [% IF ( routing && CAN_user_serials_routing ) %]
4
    [% IF ( routing && CAN_user_serials_routing ) %]
5
        [% IF ( hasRouting ) %]
5
        [% IF ( hasRouting ) %]
6
             <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid %]">Edit routing list</a></li>
6
             <li><a href="/cgi-bin/koha/serials/routinglists.pl?subscriptionid=[% subscriptionid %]">Edit routing list</a></li>
7
        [% ELSE %]
7
        [% ELSE %]
8
            <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid %]&amp;op=new">Create routing list</a></li>
8
            <li><a href="/cgi-bin/koha/serials/routinglist.pl?subscriptionid=[% subscriptionid %]&amp;op=new">Create routing list</a></li>
9
        [% END %]
9
        [% END %]
10
    [% END %]
10
    [% END %]
11
</ul>
11
</ul>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc (+7 lines)
Lines 1-6 Link Here
1
<div id="toolbar"><script type="text/javascript">
1
<div id="toolbar"><script type="text/javascript">
2
	//<![CDATA[
2
	//<![CDATA[
3
3
4
    function confirm_deletion() {
5
        var is_confirmed = confirm(_("Are you sure you want to delete this subscription?"));
6
        if (is_confirmed) {
7
            window.location="subscription-detail.pl?subscriptionid=[% subscriptionid %]&op=del";
8
        }
9
    }
10
4
	// prepare DOM for YUI Toolbar
11
	// prepare DOM for YUI Toolbar
5
12
6
	 $(document).ready(function() {
13
	 $(document).ready(function() {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tt (-10 / +16 lines)
Lines 2-15 Link Here
2
<title>Koha &rsaquo; Member Search &rsaquo; [% bookselname %]</title>
2
<title>Koha &rsaquo; Member Search &rsaquo; [% bookselname %]</title>
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
<script type="text/javascript">
4
<script type="text/javascript">
5
<!--
5
//<![CDATA[
6
6
7
function add_member(subscriptionid,borrowernumber){
7
function add_member(borrowernumber, surname, firstname) {
8
     var myurl = "routing.pl?subscriptionid="+subscriptionid+"&borrowernumber="+borrowernumber+"&op=add";
8
    if(window.opener.addBorrower(borrowernumber, surname, firstname) < 0){
9
     window.opener.location.href = myurl;
9
        alert(_("This borrower is already in the list."));
10
    }
10
}
11
}
11
12
12
//-->
13
//]]>
13
</script>
14
</script>
14
<style type="text/css">
15
<style type="text/css">
15
   #custom-doc { width:36.46em;*width:35.53em;min-width:430px; margin:auto; text-align:left; padding: 1em; }
16
   #custom-doc { width:36.46em;*width:35.53em;min-width:430px; margin:auto; text-align:left; padding: 1em; }
Lines 60-70 function add_member(subscriptionid,borrowernumber){ Link Here
60
	</thead>
61
	</thead>
61
	<tbody>
62
	<tbody>
62
		[% FOREACH resultsloo IN resultsloop %]
63
		[% FOREACH resultsloo IN resultsloop %]
63
		[% IF ( loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
64
            [% IF ( loop.odd ) %]
64
		<td>[% resultsloo.cardnumber %] </td>
65
                <tr class="highlight">
65
		<td>[% resultsloo.surname %], [% resultsloo.firstname %] </td>
66
            [% ELSE %]
66
		<td>[% resultsloo.branchcode %] </td>
67
                <tr>
67
		<td><a onclick="add_member([% subscriptionid %],[% resultsloo.borrowernumber %]); return false" href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% resultsloo.subscriptionid %]&amp;borrowernumber=[% resultsloo.borrowernumber %]&amp;op=add">Add</a></td></tr>
68
            [% END %]
69
                <td>[% resultsloo.cardnumber %] </td>
70
                <td>[% resultsloo.surname %], [% resultsloo.firstname %] </td>
71
                <td>[% resultsloo.branchcode %] </td>
72
                <td><a style="cursor:pointer" onclick="add_member([% resultsloo.borrowernumber %], '[% resultsloo.surname %]', '[% resultsloo.firstname %]'); return false;">Add</a></td>
73
            </tr>
68
		[% END %]
74
		[% END %]
69
	</tbody>
75
	</tbody>
70
</table>
76
</table>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt (-25 / +91 lines)
Lines 14-47 Link Here
14
<div id="custom-doc" class="yui-t7">
14
<div id="custom-doc" class="yui-t7">
15
   <div id="bd">
15
   <div id="bd">
16
16
17
<table>
17
[% IF (missing_parameter_routinglistid or missing_parameter_serialid) %]
18
    <tr>
18
    <h1>Routing list preview for <em>[% title %]</em></h1>
19
        <td colspan="2"><h3>[% libraryname %]</h3></td>
19
20
    </tr>
20
    <form action="" method="get">
21
    <tr>
21
        [% IF (missing_parameter_routinglistid) %]
22
        <td colspan="2"><b>Title:</b> [% title |html %]<br />[% issue %]</td>
22
            <input type="hidden" name="serialid" value="[% serialid %]" />
23
    </tr>
23
            <label for="routinglist">Please select a routing list</label>
24
    <tr>
24
            <select id="routinglist" name="routinglistid">
25
        <td><b>Name</b></td>
25
                [% FOREACH routinglist IN routinglists %]
26
        <td><b>Date due</b></td>
26
                    <option value="[% routinglist.routinglistid %]">
27
    </tr>
27
                        [% routinglist.title %]
28
    [% FOREACH memberloo IN memberloop %]
28
                    </option>
29
    <tr>
29
                [% END %]
30
        <td>[% memberloo.name %]</td>
30
            </select>
31
        <td>&nbsp;</td>
31
        [% ELSE %]
32
    </tr>
32
            <input type="hidden" name="routinglistid" value="[% routinglistid %]" />
33
            <label for="serial">Please select a serial</label>
34
            <select id="serial" name="serialid">
35
                [% FOREACH serial IN serials %]
36
                    <option value="[% serial.serialid %]">
37
                        [% serial.serialseq %] ([% serial.planneddate %])
38
                    </option>
39
                [% END %]
40
            </select>
41
        [% END %]
42
        <input type="submit" value="Continue" />
43
    </form>
44
[% ELSE %]
45
    [% IF (error_no_item) %]
46
        <div class="error noprint">
47
            <p>Holds cannot be placed on this serial. There is no item attached to it.</p>
48
        </div>
33
    [% END %]
49
    [% END %]
34
</table>
50
    <table>
51
        [% IF (libraryname) %]
52
            <tr>
53
                <td colspan="2"><h3>[% libraryname %]</h3></td>
54
            </tr>
55
        [% END %]
56
        <tr>
57
            <td colspan="2">
58
                <b>Title:</b> [% title |html %]<br />
59
                [% serial.serialseq %] ([% serial.planneddate %])
60
            </td>
61
        </tr>
62
        <tr>
63
            <td colspan="2">
64
                <b>Routing list:</b> [% routinglisttitle %]
65
            </td>
66
        </tr>
67
        <tr>
68
            <td><b>Name</b></td>
69
            <td><b>Date due</b></td>
70
        </tr>
71
        [% FOREACH member IN memberloop %]
72
        <tr>
73
            <td>[% member.surname %], [% member.firstname %]</td>
74
            <td>&nbsp;</td>
75
        </tr>
76
        [% END %]
77
    </table>
35
78
36
<div id="routingnotes">
79
    <div id="routingnotes">
37
    <p id="generalroutingnote">[% generalroutingnote %]</p>
80
        <p id="generalroutingnote">[% generalroutingnote %]</p>
38
    <p id="routingnote">[% routingnotes %]</p>
81
        <p id="routingnote">[% routingnotes %]</p>
39
</div>
82
    </div>
40
83
41
   <div id="slip-block-links" class="noprint">
84
    [% IF (need_confirm) %]
42
   <a class="button" href="javascript:window.print();self.close()">Print</a> &nbsp; <a class="button" href="javascript:self.close()">Close</a>
85
        [%# RoutingListAddReserves is ON %]
43
   </div>
86
        <script type="text/javascript">
87
        //<![CDATA[
88
            function ask_confirm() {
89
                var msg = _("Holds will be placed for all borrowers in this list.");
90
                msg += "\n";
91
                msg += _("Do you want to continue?");
92
                return confirm(msg);
93
            }
94
        //]]>
95
        </script>
96
        <form action="" method="get" onsubmit="return ask_confirm()">
97
            <input type="hidden" name="routinglistid" value="[% routinglistid %]" />
98
            <input type="hidden" name="serialid" value="[% serialid %]" />
99
            <input type="hidden" name="confirm" value="1" />
100
            <input type="submit" value="Confirm and print" />
101
            <input type="button" value="Cancel" onclick="window.close()" />
102
        </form>
103
    [% ELSE %]
104
        <div id="slip-block-links" class="noprint">
105
           <a class="button" href="javascript:window.print();self.close()">Print</a>
106
           &nbsp; <a class="button" href="javascript:self.close()">Close</a>
107
        </div>
108
    [% END %]
109
[% END %]
44
110
45
   </div>
111
    </div>
46
112
47
[% INCLUDE 'intranet-bottom.inc' %]
113
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt (-57 lines)
Lines 1-57 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Serials &rsaquo; Preview routing list</title>
3
[% INCLUDE 'doc-head-close.inc' %]
4
<script type="text/javascript">
5
<!--
6
7
function print_slip(subscriptionid,issue){
8
    var myurl = 'routing-preview.pl?ok=1&subscriptionid='+subscriptionid+'&issue='+issue;
9
    window.open(myurl,'PrintSlip','width=500,height=500,toolbar=no,scrollbars=yes');
10
    window.location.href='subscription-detail.pl?subscriptionid=' + subscriptionid;
11
}
12
//-->
13
</script>
14
</head>
15
<body id="ser_routing-preview" class="ser">
16
[% INCLUDE 'header.inc' %]
17
[% INCLUDE 'serials-search.inc' %]
18
19
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid %]"><i>[% title |html %]</i></a> &rsaquo; Preview routing list</div>
20
21
<div id="doc3" class="yui-t2">
22
   
23
   <div id="bd">
24
	<div id="yui-main">
25
	<div class="yui-b">
26
27
<h2>Preview routing list for <i>[% title |html %]</i></h2>
28
29
<form method="post" action="routing-preview.pl">
30
<input type="hidden" name="subscriptionid" value="[% subscriptionid %]" />
31
<fieldset class="rows">
32
	<ol>
33
		<li><span class="label">Issue:</span>[% issue %]</li>
34
		<li><span class="label">List member:</span><table style="clear:none;margin:0;">
35
        <tr><th>Name</th></tr>
36
[% FOREACH memberloo IN memberloop %]
37
        <tr><td>[% memberloo.surname %], [% memberloo.firstname %]</td></tr>
38
[% END %]
39
        </table></li>
40
		<li><span class="label">Notes:</span>[% routingnotes %]</li>
41
	</ol>
42
</fieldset>
43
44
<fieldset class="action">
45
<input type="submit" name="ok" class="button" value="Save and preview routing slip" onclick="print_slip([% subscriptionid %],'[% issue_escaped %]'); return false" />
46
<input type="submit" name="edit" class="button" value="Edit" />
47
<input type="submit" name="delete" class="button" value="Delete" /></fieldset>
48
</form>
49
50
</div>
51
</div>
52
53
<div class="yui-b">
54
[% INCLUDE 'serials-menu.inc' %]
55
</div>
56
</div>
57
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt (-97 lines)
Lines 1-97 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Serials &rsaquo; [% title |html %] &rsaquo; [% IF ( op ) %]Create Routing List[% ELSE %]Edit routing list[% END %]</title>
3
[% INCLUDE 'doc-head-close.inc' %]
4
<script language="javascript" type="text/javascript">
5
<!--
6
7
function reorder_item(sid,rid,rank){
8
    var mylocation = 'reorder_members.pl?subscriptionid='+sid+'&routingid='+rid+'&rank='+rank;
9
    window.location.href=mylocation; 
10
}
11
12
function search_member(subscriptionid){
13
    var myurl = 'member-search.pl?subscriptionid='+subscriptionid; window.open(myurl,'FindAMember','width=550,height=480,toolbar=no,scrollbars=yes');
14
}
15
16
//-->
17
</script>
18
</head>
19
<body id="ser_routing" class="ser">
20
[% INCLUDE 'header.inc' %]
21
[% INCLUDE 'serials-search.inc' %]
22
23
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid %]"><i>[% title |html %]</i></a> &rsaquo; [% IF ( op ) %]Create Routing List[% ELSE %]Edit routing list[% END %]</div>
24
25
<div id="doc3" class="yui-t2">
26
   
27
   <div id="bd">
28
	<div id="yui-main">
29
	<div class="yui-b">
30
31
32
[% IF ( op ) %]
33
<h1>Create routing list for <i>[% title |html %]</i></h1>
34
[% ELSE %]
35
<h1>Edit routing list for <i>[% title |html %]</i></h1>
36
[% END %]
37
38
<form method="post" action="routing.pl">
39
<input type="hidden" name="op" value="save" />
40
<input type="hidden" name="subscriptionid" value="[% subscriptionid %]" />
41
<fieldset class="rows">
42
	<ol>
43
		<li><label for="date_selected">Issue: </label>
44
<select name="date_selected" id="date_selected">
45
[% FOREACH date IN dates %]
46
[% IF ( date.selected ) %]<option value="[% date.serialseq %] ([% date.planneddate %])" selected="selected">[% date.serialseq %] ([% date.planneddate %])</option>[% ELSE %]<option value="[% date.serialseq %] ([% date.planneddate %])">[% date.serialseq %] ([% date.planneddate %])</option>[% END %]
47
[% END %]
48
</select> [% issue %]</li>
49
50
[% IF memberloop %]
51
<li><span class="label">Recipients:</span><table style="clear:none;margin:0;">
52
        <tr><th>Name</th>
53
            <th>Rank</th>
54
            <th>Delete</th>
55
        </tr>
56
        [% USE m_loop = iterator(memberloop) %]
57
        [% FOREACH member IN m_loop %]
58
        <tr><td>[% member.name %]</td>
59
            <td>
60
                <select name="itemrank" onchange="reorder_item([%- subscriptionid -%], [%- member.routingid -%], this.value)">
61
                [% rankings = [1 .. m_loop.size] %]
62
                [% FOREACH r IN rankings %]
63
                    [% IF r == member.ranking %]
64
                      <option selected="selected" value="[% r %]">[% r %]</option>
65
                    [% ELSE %]
66
                      <option value="[% r %]">[% r %]</option>
67
                    [% END %]
68
                [% END %]
69
                </select>
70
            </td>
71
            <td><a href="/cgi-bin/koha/serials/routing.pl?routingid=[% member.routingid %]&amp;subscriptionid=[% subscriptionid %]&amp;op=delete">Delete</a></td>
72
        </tr>
73
        [% END %]
74
        </table><p style="margin-left:10em;"><a onclick="search_member([% subscriptionid %]); return false"
75
href="/cgi-bin/koha/serials/member-search.pl?subscriptionid=[% subscriptionid %]" class="button">Add recipients</a> &nbsp; <a
76
href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid %]&amp;op=delete" class="button">Delete all</a></p></li>
77
[% ELSE %]
78
<li><span class="label">Recipients:</span>
79
    <a onclick="search_member([% subscriptionid %]); return false" href="/cgi-bin/koha/serials/member-search.pl?subscriptionid=[% subscriptionid %]" class="button">Add recipients</a></li>
80
[% END %]
81
82
	<li><label for="notes">Notes:</label><textarea name="notes" id="notes" rows="3" cols="50">[% routingnotes %]</textarea></li>
83
	</ol>
84
85
</fieldset>
86
<fieldset class="action"><input type="submit" name="submit" value="Save" /></fieldset>
87
</form>
88
89
90
</div>
91
</div>
92
93
<div class="yui-b">
94
[% INCLUDE 'serials-menu.inc' %]
95
</div>
96
</div>
97
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routinglist.tt (+194 lines)
Line 0 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Serials &rsaquo; Routing list</title>
3
[% INCLUDE 'doc-head-close.inc' %]
4
<script type="text/javascript">
5
//<![CDATA[
6
[% UNLESS ( new ) %]
7
var max_rank = [% max_rank %];
8
9
function IncMaxRank(){
10
    max_rank = max_rank + 1;
11
    var option = '<option value="' + max_rank + '">' + max_rank + '</option>';
12
    $('select[name="ranking"]').append(option);
13
}
14
15
function DecMaxRank(){
16
    max_rank = max_rank - 1;
17
    $('select[name="ranking"] option[value="'+(max_rank+1)+'"]').remove();
18
}
19
20
function updateTable(){
21
    var ids = $("#borrowersids").val().split(":");
22
    // split returns an array with one empty string if string is empty
23
    if(ids[0] == "")
24
        ids.splice(0,1);
25
26
    var new_trs = new Array();
27
    for(var i=0; i<ids.length; i++){
28
        var tr = $("#ranking"+ids[i]).parents("tr");
29
        new_trs.push("<tr>"+$(tr).html()+"</tr>");
30
    }
31
    $("#borrowers tbody").html(new_trs.join(" "));
32
    var i=0;
33
    $("select[name='ranking']").each(function(){
34
        $(this).val(i+1);
35
        i++;
36
        var borrowernumber = $(this).attr('id').replace("ranking","");
37
        $(this).change(function(){
38
            reorderBorrower(borrowernumber, $(this).val());
39
        });
40
    });
41
    if(i < max_rank)
42
        DecMaxRank();
43
44
    if(max_rank == 0){
45
        $("#borrowers").hide();
46
        $("#noborrowersp").show();
47
    }
48
}
49
50
// delete borrower if rank <= 0
51
function reorderBorrower(borrowernumber, rank){
52
    var ids = $("#borrowersids").val().split(":");
53
    for(var i=0; i<ids.length; i++){
54
        if(ids[i] == borrowernumber){
55
            ids.splice(i, 1);
56
            break;
57
        }
58
    }
59
    if(rank > 0){
60
      ids.splice(rank-1, 0, borrowernumber);
61
    }
62
    $("#borrowersids").val(ids.join(":"));
63
    updateTable();
64
}
65
66
function addBorrower(borrowernumber, surname, firstname){
67
    // Check if we have already this borrower
68
    var ids = $("#borrowersids").val();
69
    var re = new RegExp("(^"+borrowernumber+"$)|(^"+borrowernumber+":)|(:"+borrowernumber+"$)|(:"+borrowernumber+":)");
70
    if(ids.match(re))
71
        return -1;
72
73
    IncMaxRank();
74
    var tr = '<tr>';
75
    tr += '<td>' + surname + ', ' + firstname + '</td>';
76
    tr += '<td><select name="ranking" id="ranking' + borrowernumber + '">';
77
    for(var i=0; i<(max_rank-1); i++){
78
        tr += '<option value="' + (i+1) + '">' + (i+1) + '</option>';
79
    }
80
    tr += '<option selected="selected" value="' + (max_rank) + '">' + (max_rank) + '</option>';
81
    tr += '</select></td>';
82
    tr += '<td><a style="cursor:pointer" onclick="delBorrower('+borrowernumber+');">Delete</a></td>';
83
    tr += '</tr>';
84
    $("#borrowers tbody").append(tr);
85
    $("#ranking"+borrowernumber).change(function(){
86
        reorderBorrower(borrowernumber, $(this).val());
87
    });
88
89
    if(ids.length != 0)
90
        ids += ':';
91
    ids += borrowernumber;
92
    $("#borrowersids").val(ids);
93
94
    $("#borrowers").show();
95
    $("#noborrowersp").hide();
96
97
    return 0;
98
}
99
100
function delBorrower(borrowernumber){
101
    reorderBorrower(borrowernumber, 0);
102
}
103
104
function SearchMember(){
105
    window.open("/cgi-bin/koha/serials/member-search.pl", 'MemberSearch',
106
      'menubar=no,status=no,toolbar=no,scrollbars=yes');
107
}
108
109
$(document).ready(function() {
110
    updateTable();
111
});
112
[% END %]
113
114
//]]>
115
</script>
116
</head>
117
118
<body>
119
[% INCLUDE 'header.inc' %]
120
[% INCLUDE 'serials-search.inc' %]
121
122
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; Routing list</div>
123
124
<div id="doc3" class="yui-t2">
125
126
<div id="bd">
127
  <div id="yui-main">
128
    <div class="yui-b">
129
      [% INCLUDE 'serials-toolbar.inc' %]
130
      [% IF ( new ) %]
131
        <h1>Create routing list</h1>
132
133
        <form action="/cgi-bin/koha/serials/routinglist.pl" method="get">
134
          <input type="hidden" name="op" value="savenew" />
135
          <input type="hidden" name="subscriptionid" value="[% subscriptionid %]" />
136
          <label for="title">Title: </label>
137
          <input type="text" id="title" name="title" />
138
          <input type="submit" value="Save" />
139
        </form>
140
      [% ELSE %]
141
        <h1>Routing list '[% title %]'</h1>
142
        <a style="cursor:pointer" onclick="SearchMember();">Add a borrower</a>
143
        [% IF ( borrowers_loop ) %]
144
          <table id="borrowers">
145
        [% ELSE %]
146
          <table id="borrowers" style="display:none">
147
        [% END %]
148
            <thead>
149
              <tr>
150
                <th>Name</th>
151
                <th>Rank</th>
152
                <th>&nbsp;</th>
153
              </tr>
154
            </thead>
155
            <tbody>
156
              [% FOREACH borrower IN borrowers_loop %]
157
                <tr>
158
                  <td>[% borrower.surname %], [% borrower.firstname %]</td>
159
                  <td>
160
                    <select name="ranking" id="ranking[% borrower.borrowernumber %]">
161
                      [% FOREACH ranking_loo IN borrower.ranking_loop %]
162
                        [% IF ( ranking_loo.selected ) %]
163
                          <option selected="selected" value="[% ranking_loo.rank %]">[% ranking_loo.rank %]</option>
164
                        [% ELSE %]
165
                          <option value="[% ranking_loo.rank %]">[% ranking_loo.rank %]</option>
166
                        [% END %]
167
                      [% END %]
168
                    </select>
169
                  </td>
170
                  <td><a style="cursor:pointer" onclick="delBorrower([% borrower.borrowernumber %]);">Delete</a></td>
171
                </tr>
172
              [% END %]
173
            </tbody>
174
          </table>
175
          [% UNLESS ( borrowers_loop ) %]
176
            <p id="noborrowersp">There is no borrowers in this routing list.</p>
177
          [% END %]
178
          <form action="/cgi-bin/koha/serials/routinglist.pl" method="post">
179
            <input type="hidden" id="borrowersids" name="borrowersids" value="[% borrowersids %]" />
180
            <input type="hidden" name="op" value="mod" />
181
            <input type="hidden" name="routinglistid" value="[% routinglistid %]" />
182
            <label for="notes">Notes: </label><br />
183
            <textarea id="notes" name="notes">[% notes %]</textarea><br />
184
            <input type="submit" value="Save" />
185
            <input type="button" value="Cancel" onclick="window.location.href='/cgi-bin/koha/serials/routinglists.pl?subscriptionid=[% subscriptionid %]';" />
186
          </form>
187
      [% END %]<!-- new -->
188
    </div>
189
  </div>
190
  <div class="yui-b">
191
    [% INCLUDE 'serials-menu.inc' %]
192
  </div>
193
</div>
194
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routinglists.tt (+69 lines)
Line 0 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Serials &rsaquo; Routing lists</title>
3
[% INCLUDE 'doc-head-close.inc' %]
4
<script type="text/javascript">
5
//<![CDATA[
6
7
function previewSlip(routinglistid){
8
    window.open("/cgi-bin/koha/serials/routing-preview-slip.pl?routinglistid="+routinglistid, 'PreviewSlip', 'menubar=no,status=no,toolbar=no');
9
}
10
11
function confirmDelete(){
12
    return confirm(_("Are you sure you want to delete this routing list?"));
13
}
14
15
//]]>
16
</script>
17
</head>
18
19
<body>
20
[% INCLUDE 'header.inc' %]
21
[% INCLUDE 'serials-search.inc' %]
22
23
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; Routing lists</div>
24
25
<div id="doc3" class="yui-t2">
26
27
<div id="bd">
28
  <div id="yui-main">
29
    <div class="yui-b">
30
      [% INCLUDE 'serials-toolbar.inc' %]
31
      <h1>Routing lists for <em>[% title %]</em></h1>
32
33
      <a href="/cgi-bin/koha/serials/routinglist.pl?op=new&subscriptionid=[% subscriptionid %]">New routing list</a>
34
35
      [% IF ( routinglists_loop ) %]
36
      <table>
37
        <thead>
38
          <tr>
39
            <th>Title</th>
40
            <th>No. of borrowers</th>
41
            <th>Notes</th>
42
            <th>&nbsp;</th>
43
          </tr>
44
        </thead>
45
        <tbody>
46
          [% FOREACH routinglist IN routinglists_loop %]
47
            <tr>
48
              <td><a href="/cgi-bin/koha/serials/routinglist.pl?routinglistid=[% routinglist.routinglistid %]">[% routinglist.title %]</a></td>
49
              <td>[% routinglist.borrowers.size || 0 %]</td>
50
              <td>[% routinglist.notes %]</td>
51
              <td>
52
                <a style="cursor:pointer" onclick="previewSlip([% routinglist.routinglistid %]);">Preview</a> |
53
                <a style="text-decoration:none" href="/cgi-bin/koha/serials/routinglists.pl?op=export&routinglistid=[% routinglist.routinglistid %]">Export</a> |
54
                <a style="text-decoration:none" onclick="return confirmDelete();" href="/cgi-bin/koha/serials/routinglists.pl?op=del&routinglistid=[% routinglist.routinglistid %]">Delete</a></td>
55
            </tr>
56
          [% END %]
57
        </tbody>
58
      </table>
59
      [% ELSE %]
60
        <p>There is no routing lists for this subscription.</p>
61
      [% END %]
62
63
    </div>
64
  </div>
65
  <div class="yui-b">
66
    [% INCLUDE 'serials-menu.inc' %]
67
  </div>
68
</div>
69
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt (-3 / +8 lines)
Lines 10-18 function generateReceive(subscriptionid) { Link Here
10
    }
10
    }
11
}
11
}
12
function print_slip(subscriptionid,issue){
12
function print_slip(subscriptionid,issue){
13
    var myurl = 'routing-preview.pl?ok=1&subscriptionid='+subscriptionid+'&issue='+issue;
13
    var myurl = '/cgi-bin/koha/serials/routing-preview-slip.pl?serialid='+serialid;
14
    window.open(myurl,'PrintSlip','width=500,height=500,toolbar=no,scrollbars=yes');
14
    window.open(myurl,'PrintSlip','width=500,height=500,toolbar=no,scrollbars=yes');
15
}
15
}
16
16
function addsubscriptionid()
17
function addsubscriptionid()
17
{
18
{
18
	var tab=new Array();
19
	var tab=new Array();
Lines 156-162 $(document).ready(function() { Link Here
156
        </td>
157
        </td>
157
        [% IF ( routing && CAN_user_serials_routing ) %]
158
        [% IF ( routing && CAN_user_serials_routing ) %]
158
        <td>
159
        <td>
159
            <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]">Edit routing list</a>
160
            [% IF (subscription.routinglistscount) %]
161
                <a href="/cgi-bin/koha/serials/routinglists.pl?subscriptionid=[% subscription.subscriptionid %]">Edit routing lists</a> ([% subscription.routinglistscount %])
162
            [% ELSE %]
163
                <a href="/cgi-bin/koha/serials/routinglist.pl?op=new&subscriptionid=[% subscription.subscriptionid %]">New routing list</a>
164
            [% END %]
160
        </td>
165
        </td>
161
        [% END %]
166
        [% END %]
162
        [% IF ( subscription.abouttoexpire ) %]<td class="problem"> <a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscription.subscriptionid %]" onclick="popup([% subscription.subscriptionid %]); return false;">Renew</a></td>
167
        [% IF ( subscription.abouttoexpire ) %]<td class="problem"> <a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscription.subscriptionid %]" onclick="popup([% subscription.subscriptionid %]); return false;">Renew</a></td>
Lines 244-250 $(document).ready(function() { Link Here
244
                </td>
249
                </td>
245
                [% IF ( routing ) %]
250
                [% IF ( routing ) %]
246
                <td>
251
                <td>
247
                    <a href="" onclick="print_slip([% serial.subscriptionid |html %], '[% serial.serialseq |html %] ([% serial.planneddate %])'); return false" >Print list</a>
252
                    <a style="cursor:pointer" onclick="print_slip([% serial.serialid %]);">Print list</a>
248
                </td>
253
                </td>
249
                [% END %]
254
                [% END %]
250
            [% IF ( CAN_user_serials_receive_serials ) %]
255
            [% IF ( CAN_user_serials_receive_serials ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt (-4 / +4 lines)
Lines 141-151 Link Here
141
                    [% IF ( subscription.cannotedit ) %]
141
                    [% IF ( subscription.cannotedit ) %]
142
                      &nbsp;
142
                      &nbsp;
143
                    [% ELSE %]
143
                    [% ELSE %]
144
                      [% IF ( subscription.routingedit ) %]
144
                      [% IF ( subscription.routinglistscount ) %]
145
                        <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]">Edit</a>
145
                        <a href="/cgi-bin/koha/serials/routinglists.pl?subscriptionid=[% subscription.subscriptionid %]">Edit</a>
146
                        ([% subscription.routingedit %])
146
                        ([% subscription.routinglistscount %])
147
                      [% ELSE %]
147
                      [% ELSE %]
148
                        <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]&amp;op=new">New</a>
148
                        <a href="/cgi-bin/koha/serials/routinglist.pl?subscriptionid=[% subscription.subscriptionid %]&amp;op=new">New</a>
149
                      [% END %]
149
                      [% END %]
150
                    [% END %]
150
                    [% END %]
151
                  </td>
151
                  </td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (-6 lines)
Lines 23-34 var textbox = ''; Link Here
23
    }
23
    }
24
}
24
}
25
25
26
function confirm_deletion() {
27
    var is_confirmed = confirm(_("Are you sure you want to delete this subscription?"));
28
    if (is_confirmed) {
29
        window.location="subscription-detail.pl?subscriptionid=[% subscriptionid %]&op=del";
30
    }
31
}
32
function popup(subscriptionid) {
26
function popup(subscriptionid) {
33
    newin=window.open("subscription-renew.pl?mode=popup&subscriptionid="+subscriptionid,'popup','width=590,height=440,toolbar=false,scrollbars=yes');
27
    newin=window.open("subscription-renew.pl?mode=popup&subscriptionid="+subscriptionid,'popup','width=590,height=440,toolbar=false,scrollbars=yes');
34
}
28
}
(-)a/serials/member-search.pl (-3 / +2 lines)
Lines 105-113 if (@searchpatron) { Link Here
105
        "start_with"
105
        "start_with"
106
    );
106
    );
107
}
107
}
108
if ($results) {
108
109
    $count = scalar(@$results);
109
$count = $results ? scalar(@$results) : 0;
110
}
111
my @resultsdata;
110
my @resultsdata;
112
$to=($count>$to?$to:$count);
111
$to=($count>$to?$to:$count);
113
my $index=$from;
112
my $index=$from;
(-)a/serials/reorder_members.pl (-38 lines)
Lines 1-38 Link Here
1
#!/usr/bin/perl
2
# This file is part of Koha.
3
#
4
# Koha is free software; you can redistribute it and/or modify it under the
5
# terms of the GNU General Public License as published by the Free Software
6
# Foundation; either version 2 of the License, or (at your option) any later
7
# version.
8
#
9
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
10
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
11
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License along
14
# with Koha; if not, write to the Free Software Foundation, Inc.,
15
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
16
17
# Routing.pl script used to create a routing list for a serial subscription
18
# In this instance it is in fact a setting up of a list of reserves for the item
19
# where the hierarchical order can be changed on the fly and a routing list can be
20
# printed out
21
use strict;
22
use warnings;
23
use CGI;
24
use C4::Auth qw( checkauth );
25
use C4::Serials qw( reorder_members );
26
27
my $query          = CGI->new;
28
my $subscriptionid = $query->param('subscriptionid');
29
my $routingid      = $query->param('routingid');
30
my $rank           = $query->param('rank');
31
32
checkauth( $query, 0, { serials => 1 }, 'intranet' );
33
34
reorder_members( $subscriptionid, $routingid, $rank );
35
36
print $query->redirect(
37
    "/cgi-bin/koha/serials/routing.pl?subscriptionid=$subscriptionid");
38
(-)a/serials/routing-preview-slip.pl (+144 lines)
Line 0 Link Here
1
#!/usr/bin/perl
2
3
# Copyright 2011 BibLibre SARL
4
# This file is part of Koha.
5
#
6
# Koha is free software; you can redistribute it and/or modify it under the
7
# terms of the GNU General Public License as published by the Free Software
8
# Foundation; either version 2 of the License, or (at your option) any later
9
# version.
10
#
11
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
12
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
13
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
14
#
15
# You should have received a copy of the GNU General Public License along
16
# with Koha; if not, write to the Free Software Foundation, Inc.,
17
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
18
19
=head1 NAME
20
21
routing-preview-slip.pl
22
23
=head1 DESCRIPTION
24
25
Preview a routing list for printing.
26
27
=cut
28
29
use Modern::Perl;
30
31
use CGI;
32
use C4::Auth;
33
use C4::Output;
34
35
use C4::Biblio;
36
use C4::Branch;
37
use C4::Members;
38
use C4::Serials;
39
use C4::Serials::RoutingLists qw/GetRoutingList GetRoutingLists/;
40
41
my $input = new CGI;
42
my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
43
    template_name   => 'serials/routing-preview-slip.tt',
44
    query           => $input,
45
    type            => 'intranet',
46
    authnotrequired => 0,
47
    flagsrequired   => { 'serials' => 'routing' },
48
    debug           => 1,
49
} );
50
51
my $routinglistid = $input->param('routinglistid');
52
my $serialid = $input->param('serialid');
53
54
if (!$routinglistid and !$serialid) {
55
    exit;
56
}
57
58
if (!$routinglistid) {
59
    my $serial = GetSerial($serialid);
60
    my $subscription = GetSubscription($serial->{subscriptionid});
61
    my (undef, $biblio) = GetBiblio($subscription->{subscriptionid});
62
    my @routinglists = GetRoutingLists($subscription->{subscriptionid});
63
    $template->param(
64
        missing_parameter_routinglistid => 1,
65
        serialid => $serialid,
66
        title => $biblio->{title},
67
        routinglists => \@routinglists
68
    );
69
    output_html_with_http_headers $input, $cookie, $template->output;
70
    exit;
71
} elsif (!$serialid) {
72
    my $routinglist = GetRoutingList($routinglistid);
73
    my $subscription = GetSubscription($routinglist->{subscriptionid});
74
    my (undef, $biblio) = GetBiblio($subscription->{subscriptionid});
75
    my @serials = GetSerials2($subscription->{subscriptionid}, '1,2,3,4,5,6,7');
76
    $template->param(
77
        missing_parameter_serialid => 1,
78
        routinglistid => $routinglistid,
79
        title => $biblio->{title},
80
        serials => \@serials
81
    );
82
    output_html_with_http_headers $input, $cookie, $template->output;
83
    exit;
84
}
85
86
my $routinglist = GetRoutingList($routinglistid);
87
my $subscription = GetSubscription($routinglist->{subscriptionid});
88
my $serial = GetSerial($serialid);
89
my (undef, $biblio) = GetBiblio($subscription->{biblionumber});
90
my $branch = GetBranchDetail($subscription->{branchcode});
91
my @memberloop;
92
foreach (@{$routinglist->{borrowers}}) {
93
    my $member = GetMemberDetails($_);
94
    push @memberloop, {
95
        surname => $member->{surname},
96
        firstname => $member->{firstname},
97
    };
98
}
99
100
my $no_holds = $input->param('no_holds');
101
if(C4::Context->preference('RoutingListAddReserves') and !$no_holds) {
102
    my $confirm = $input->param('confirm');
103
    if ($confirm) {
104
        require C4::Reserves;
105
        require C4::Items;
106
        my $itemnumber = GetSerialItemnumber($serialid);
107
        my $item = C4::Items::GetItem($itemnumber);
108
        if ($item) {
109
            my $rank = 1;
110
            foreach my $borrowernumber ( @{$routinglist->{borrowers}} ) {
111
                my $reserve = C4::Reserves::GetReserveInfo($borrowernumber,
112
                    $item->{biblionumber});
113
                if($reserve) {
114
                    C4::Reserves::ModReserve($rank, $item->{biblionumber},
115
                        $borrowernumber, $item->{holdingbranch}, $itemnumber);
116
                } else {
117
                    my @bibitems = GetBiblioItemByBiblioNumber($item->{biblionumber});
118
                    C4::Reserves::AddReserve($item->{holdingbranch}, $borrowernumber,
119
                        $item->{biblionumber}, 'a', \@bibitems, $rank, undef,
120
                        undef, undef, $biblio->{title}, $itemnumber);
121
                }
122
                $rank++;
123
            }
124
        } else {
125
            $template->param(error_no_item => 1);
126
        }
127
    } else {
128
        $template->param(need_confirm => 1);
129
    }
130
}
131
132
$template->param(
133
    routinglistid   => $routinglistid,
134
    serialid        => $serialid,
135
    libraryname     => $branch->{branchname},
136
    title           => $biblio->{title},
137
    serial          => $serial,
138
    memberloop      => \@memberloop,
139
    routingnotes    => $routinglist->{notes},
140
    generalroutingnote  => C4::Context->preference('RoutingListNote'),
141
    routinglisttitle    => $routinglist->{title},
142
);
143
144
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/serials/routing-preview.pl (-139 lines)
Lines 1-139 Link Here
1
#!/usr/bin/perl
2
3
# This file is part of Koha.
4
#
5
# Koha is free software; you can redistribute it and/or modify it under the
6
# terms of the GNU General Public License as published by the Free Software
7
# Foundation; either version 2 of the License, or (at your option) any later
8
# version.
9
#
10
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
11
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
12
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
13
#
14
# You should have received a copy of the GNU General Public License along
15
# with Koha; if not, write to the Free Software Foundation, Inc.,
16
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17
18
# Routing Preview.pl script used to view a routing list after creation
19
# lets one print out routing slip and create (in this instance) the heirarchy
20
# of reserves for the serial
21
use strict;
22
use warnings;
23
use CGI;
24
use C4::Koha;
25
use C4::Auth;
26
use C4::Dates;
27
use C4::Output;
28
use C4::Acquisition;
29
use C4::Reserves;
30
use C4::Circulation;
31
use C4::Context;
32
use C4::Members;
33
use C4::Biblio;
34
use C4::Items;
35
use C4::Serials;
36
use URI::Escape;
37
use C4::Branch;
38
39
my $query = new CGI;
40
my $subscriptionid = $query->param('subscriptionid');
41
my $issue = $query->param('issue');
42
my $routingid;
43
my $ok = $query->param('ok');
44
my $edit = $query->param('edit');
45
my $delete = $query->param('delete');
46
my $dbh = C4::Context->dbh;
47
48
if($delete){
49
    delroutingmember($routingid,$subscriptionid);
50
    my $sth = $dbh->prepare("UPDATE serial SET routingnotes = NULL WHERE subscriptionid = ?");
51
    $sth->execute($subscriptionid);
52
    print $query->redirect("routing.pl?subscriptionid=$subscriptionid&op=new");
53
}
54
55
if($edit){
56
    print $query->redirect("routing.pl?subscriptionid=$subscriptionid");
57
}
58
59
my @routinglist = getroutinglist($subscriptionid);
60
my $subs = GetSubscription($subscriptionid);
61
my ($tmp ,@serials) = GetSerials($subscriptionid);
62
my ($template, $loggedinuser, $cookie);
63
64
if($ok){
65
    # get biblio information....
66
    my $biblio = $subs->{'biblionumber'};
67
	my ($count2,@bibitems) = GetBiblioItemByBiblioNumber($biblio);
68
	my @itemresults = GetItemsInfo( $subs->{biblionumber} );
69
	my $branch = $itemresults[0]->{'holdingbranch'};
70
	my $branchname = GetBranchName($branch);
71
72
	if (C4::Context->preference('RoutingListAddReserves')){
73
		# get existing reserves .....
74
		my ($count,$reserves) = GetReservesFromBiblionumber($biblio);
75
		my $totalcount = $count;
76
		foreach my $res (@$reserves) {
77
			if ($res->{'found'} eq 'W') {
78
				$count--;
79
			}
80
		}
81
		my $const = 'o';
82
		my $notes;
83
		my $title = $subs->{'bibliotitle'};
84
        for my $routing ( @routinglist ) {
85
            my $sth = $dbh->prepare('SELECT * FROM reserves WHERE biblionumber = ? AND borrowernumber = ? LIMIT 1');
86
            $sth->execute($biblio,$routing->{borrowernumber});
87
            my $reserve = $sth->fetchrow_hashref;
88
89
            if($routing->{borrowernumber} == $reserve->{borrowernumber}){
90
                ModReserve($routing->{ranking},$biblio,$routing->{borrowernumber},$branch);
91
            } else {
92
                AddReserve($branch,$routing->{borrowernumber},$biblio,$const,\@bibitems,$routing->{ranking}, undef, undef, $notes,$title);
93
        }
94
    }
95
	}
96
97
    ($template, $loggedinuser, $cookie)
98
= get_template_and_user({template_name => "serials/routing-preview-slip.tmpl",
99
				query => $query,
100
				type => "intranet",
101
				authnotrequired => 0,
102
				flagsrequired => {serials => '*'},
103
				debug => 1,
104
				});
105
    $template->param("libraryname"=>$branchname);
106
} else {
107
    ($template, $loggedinuser, $cookie)
108
= get_template_and_user({template_name => "serials/routing-preview.tmpl",
109
				query => $query,
110
				type => "intranet",
111
				authnotrequired => 0,
112
				flagsrequired => {serials => '*'},
113
				debug => 1,
114
				});
115
}
116
117
my $memberloop = [];
118
for my $routing (@routinglist) {
119
    my $member = GetMember( borrowernumber => $routing->{borrowernumber} );
120
    $member->{name}           = "$member->{firstname} $member->{surname}";
121
    push @{$memberloop}, $member;
122
}
123
124
my $routingnotes = $serials[0]->{'routingnotes'};
125
$routingnotes =~ s/\n/\<br \/\>/g;
126
127
$template->param(
128
    title => $subs->{'bibliotitle'},
129
    issue => $issue,
130
    issue_escaped => URI::Escape::uri_escape($issue),
131
    subscriptionid => $subscriptionid,
132
    memberloop => $memberloop,
133
    routingnotes => $routingnotes,
134
    generalroutingnote => C4::Context->preference('RoutingListNote'),
135
    hasRouting => check_routing($subscriptionid),
136
    (uc(C4::Context->preference("marcflavour"))) => 1
137
    );
138
139
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/serials/routing.pl (-128 lines)
Lines 1-128 Link Here
1
#!/usr/bin/perl
2
3
# This file is part of Koha
4
#
5
# Koha is free software; you can redistribute it and/or modify it under the
6
# terms of the GNU General Public License as published by the Free Software
7
# Foundation; either version 2 of the License, or (at your option) any later
8
# version.
9
#
10
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
11
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
12
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
13
#
14
# You should have received a copy of the GNU General Public License along
15
# with Koha; if not, write to the Free Software Foundation, Inc.,
16
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17
18
19
=head1 Routing.pl
20
21
script used to create a routing list for a serial subscription
22
In this instance it is in fact a setting up of a list of reserves for the item
23
where the hierarchical order can be changed on the fly and a routing list can be
24
printed out
25
26
=cut
27
28
use strict;
29
use warnings;
30
use CGI;
31
use C4::Koha;
32
use C4::Auth;
33
use C4::Dates;
34
use C4::Output;
35
use C4::Acquisition;
36
use C4::Output;
37
use C4::Context;
38
39
use C4::Members;
40
use C4::Serials;
41
42
use URI::Escape;
43
44
my $query = new CGI;
45
my $subscriptionid = $query->param('subscriptionid');
46
my $serialseq = $query->param('serialseq');
47
my $routingid = $query->param('routingid');
48
my $borrowernumber = $query->param('borrowernumber');
49
my $notes = $query->param('notes');
50
my $op = $query->param('op') || q{};
51
my $date_selected = $query->param('date_selected');
52
$date_selected ||= q{};
53
my $dbh = C4::Context->dbh;
54
55
if($op eq 'delete'){
56
    delroutingmember($routingid,$subscriptionid);
57
}
58
59
if($op eq 'add'){
60
    addroutingmember($borrowernumber,$subscriptionid);
61
}
62
if($op eq 'save'){
63
    my $sth = $dbh->prepare('UPDATE serial SET routingnotes = ? WHERE subscriptionid = ?');
64
    $sth->execute($notes,$subscriptionid);
65
    my $urldate = URI::Escape::uri_escape($date_selected);
66
    print $query->redirect("routing-preview.pl?subscriptionid=$subscriptionid&issue=$urldate");
67
}
68
69
my @routinglist = getroutinglist($subscriptionid);
70
my $subs = GetSubscription($subscriptionid);
71
my ($count,@serials) = GetSerials($subscriptionid);
72
my $serialdates = GetLatestSerials($subscriptionid,$count);
73
74
my $dates = [];
75
foreach my $dateseq (@{$serialdates}) {
76
    my $d = {};
77
    $d->{planneddate} = $dateseq->{planneddate};
78
    $d->{serialseq} = $dateseq->{serialseq};
79
    $d->{serialid} = $dateseq->{serialid};
80
    if($date_selected eq $dateseq->{serialid}){
81
        $d->{selected} = ' selected';
82
    } else {
83
        $d->{selected} = q{};
84
    }
85
    push @{$dates}, $d;
86
}
87
88
my ($template, $loggedinuser, $cookie)
89
= get_template_and_user({template_name => 'serials/routing.tmpl',
90
				query => $query,
91
				type => 'intranet',
92
				authnotrequired => 0,
93
				flagsrequired => {serials => 'routing'},
94
				debug => 1,
95
				});
96
97
my $member_loop = [];
98
for my $routing ( @routinglist ) {
99
    my $member=GetMember('borrowernumber' => $routing->{borrowernumber});
100
    $member->{location} = $member->{branchcode};
101
    if ($member->{firstname} ) {
102
        $member->{name} = $member->{firstname} . q| |;
103
    }
104
    else {
105
        $member->{name} = q{};
106
    }
107
    if ($member->{surname} ) {
108
        $member->{name} .= $member->{surname};
109
    }
110
    $member->{routingid}=$routing->{routingid} || q{};
111
    $member->{ranking} = $routing->{ranking} || q{};
112
113
    push(@{$member_loop}, $member);
114
}
115
116
$template->param(
117
    title => $subs->{bibliotitle},
118
    subscriptionid => $subscriptionid,
119
    memberloop => $member_loop,
120
    op => $op eq 'new',
121
    dates => $dates,
122
    routingnotes => $serials[0]->{'routingnotes'},
123
    hasRouting => check_routing($subscriptionid),
124
    (uc(C4::Context->preference("marcflavour"))) => 1
125
126
    );
127
128
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/serials/routinglist.pl (+114 lines)
Line 0 Link Here
1
#!/usr/bin/perl
2
3
# Copyright 2011 BibLibre SARL
4
# This file is part of Koha.
5
#
6
# Koha is free software; you can redistribute it and/or modify it under the
7
# terms of the GNU General Public License as published by the Free Software
8
# Foundation; either version 2 of the License, or (at your option) any later
9
# version.
10
#
11
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
12
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
13
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
14
#
15
# You should have received a copy of the GNU General Public License along
16
# with Koha; if not, write to the Free Software Foundation, Inc.,
17
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
18
19
=head1 NAME
20
21
routinglist.pl
22
23
=head1 DESCRIPTION
24
25
Create or modify a routing list
26
27
=cut
28
29
use Modern::Perl;
30
31
use CGI;
32
use C4::Auth;
33
use C4::Output;
34
35
use C4::Members;
36
use C4::Serials;
37
use C4::Serials::RoutingLists qw/AddRoutingList ModRoutingList GetRoutingList/;
38
39
my $input = new CGI;
40
my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
41
    template_name   => 'serials/routinglist.tt',
42
    query           => $input,
43
    type            => 'intranet',
44
    authnotrequired => 0,
45
    flagsrequired   => { serials => 'routing' },
46
    debug           => 1,
47
} );
48
49
my $op = $input->param('op');
50
my $routinglistid;
51
52
if($op && $op eq 'new') {
53
    my $subscriptionid = $input->param('subscriptionid');
54
    $template->param(
55
        new => 1,
56
        subscriptionid => $subscriptionid,
57
    );
58
    output_html_with_http_headers $input, $cookie, $template->output;
59
    exit;
60
}
61
62
if($op && $op eq 'savenew') {
63
    my $title = $input->param('title');
64
    my $subscriptionid = $input->param('subscriptionid');
65
66
    $routinglistid = AddRoutingList($subscriptionid, $title);
67
} else {
68
    $routinglistid = $input->param('routinglistid');
69
}
70
71
if($op && $op eq 'mod') {
72
    my $borrowersids = $input->param('borrowersids');
73
    my $notes = $input->param('notes');
74
    my @borrowernumbers = split /:/, $borrowersids;
75
    ModRoutingList($routinglistid, undef, undef, $notes, @borrowernumbers);
76
    my $routinglist = GetRoutingList($routinglistid);
77
    print $input->redirect("/cgi-bin/koha/serials/routinglists.pl?subscriptionid=".$routinglist->{'subscriptionid'});
78
    exit;
79
}
80
81
my $routinglist = GetRoutingList($routinglistid);
82
my @borrowers;
83
my $rank = 1;
84
foreach my $borrowernumber (@{$routinglist->{borrowers}}) {
85
    my @ranking_loop;
86
    for(my $i = 0 ; $i < scalar(@{$routinglist->{borrowers}}) ; $i++){
87
        my $selected = 0;
88
        $selected = 1 if ($rank == $i+1);
89
        push @ranking_loop, {
90
            rank => $i+1,
91
            selected => $selected,
92
        };
93
    }
94
    my $member = GetMemberDetails($borrowernumber);
95
    push @borrowers, {
96
        borrowernumber => $borrowernumber,
97
        surname => $member->{surname},
98
        firstname => $member->{firstname},
99
        ranking_loop => \@ranking_loop
100
    };
101
    $rank ++;
102
}
103
104
$template->param(
105
    borrowers_loop => \@borrowers,
106
    borrowersids => join(':', map ($_->{borrowernumber}, @borrowers)),
107
    max_rank => scalar(@borrowers),
108
    title => $routinglist->{title},
109
    notes => $routinglist->{notes},
110
    subscriptionid => $routinglist->{subscriptionid},
111
    routinglistid => $routinglistid,
112
);
113
114
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/serials/routinglists.pl (+79 lines)
Line 0 Link Here
1
#!/usr/bin/perl
2
3
# Copyright 2011 BibLibre SARL
4
# This file is part of Koha.
5
#
6
# Koha is free software; you can redistribute it and/or modify it under the
7
# terms of the GNU General Public License as published by the Free Software
8
# Foundation; either version 2 of the License, or (at your option) any later
9
# version.
10
#
11
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
12
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
13
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
14
#
15
# You should have received a copy of the GNU General Public License along
16
# with Koha; if not, write to the Free Software Foundation, Inc.,
17
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
18
19
=head1 NAME
20
21
routinglists.pl
22
23
=head1 DESCRIPTION
24
25
View all routing lists for a subscription
26
27
=cut
28
29
use Modern::Perl;
30
31
use CGI;
32
use C4::Auth;
33
use C4::Output;
34
35
use C4::Biblio;
36
use C4::Serials;
37
use C4::Serials::RoutingLists qw/GetRoutingLists GetRoutingList DelRoutingList GetRoutingListAsCSV/;
38
39
my $input = new CGI;
40
my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
41
    template_name   => 'serials/routinglists.tt',
42
    query           => $input,
43
    type            => 'intranet',
44
    authnotrequired => 0,
45
    flagsrequired   => { serials => 'routing' },
46
    debug           => 1,
47
} );
48
49
my $subscriptionid = $input->param('subscriptionid');
50
my $op = $input->param('op');
51
52
if($op && $op eq "export") {
53
    my $routinglistid = $input->param('routinglistid');
54
    print $input->header(
55
        -type       => 'text/csv',
56
        -attachment => 'routinglist' . $routinglistid . '.csv',
57
    );
58
    print GetRoutingListAsCSV($routinglistid);
59
    exit;
60
} elsif($op && $op eq "del") {
61
    my $routinglistid = $input->param('routinglistid');
62
    if(!defined $subscriptionid){
63
        my $routinglist = GetRoutingList($routinglistid);
64
        $subscriptionid = $routinglist->{subscriptionid};
65
    }
66
    DelRoutingList($routinglistid);
67
}
68
69
my $subscription = GetSubscription($subscriptionid);
70
my (undef,$biblio) = GetBiblio($subscription->{biblionumber});
71
my @routinglists = GetRoutingLists($subscriptionid);
72
73
$template->param(
74
    subscriptionid => $subscriptionid,
75
    routinglists_loop => \@routinglists,
76
    title => $biblio->{title},
77
);
78
79
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/serials/serials-collection.pl (-2 / +5 lines)
Lines 26-31 use C4::Auth; Link Here
26
use C4::Koha;
26
use C4::Koha;
27
use C4::Dates qw/format_date/;
27
use C4::Dates qw/format_date/;
28
use C4::Serials;
28
use C4::Serials;
29
use C4::Serials::RoutingLists qw/GetRoutingListsCount/;
29
use C4::Letters;
30
use C4::Letters;
30
use C4::Output;
31
use C4::Output;
31
use C4::Context;
32
use C4::Context;
Lines 140-147 my $yearmax=($subscriptions->[0]{year} eq "manage" && scalar(@$subscriptions)>1) Link Here
140
my $yearmin=$subscriptions->[scalar(@$subscriptions)-1]{year};
141
my $yearmin=$subscriptions->[scalar(@$subscriptions)-1]{year};
141
my $subscriptionidlist="";
142
my $subscriptionidlist="";
142
foreach my $subscription (@$subscriptiondescs){
143
foreach my $subscription (@$subscriptiondescs){
143
  $subscriptionidlist.=$subscription->{'subscriptionid'}."," ;
144
    $subscriptionidlist.=$subscription->{'subscriptionid'}."," ;
144
  $biblionumber = $subscription->{'bibnum'} unless ($biblionumber);
145
    $biblionumber = $subscription->{'bibnum'} unless ($biblionumber);
146
    $subscription->{routinglistscount}
147
        = GetRoutingListsCount($subscription->{subscriptionid});
145
}
148
}
146
149
147
# warn "title : $title yearmax : $yearmax nombre d'elements dans le tableau :".scalar(@$subscriptions);
150
# warn "title : $title yearmax : $yearmax nombre d'elements dans le tableau :".scalar(@$subscriptions);
(-)a/serials/serials-search.pl (-1 / +3 lines)
Lines 35-40 use C4::Branch; Link Here
35
use C4::Context;
35
use C4::Context;
36
use C4::Output;
36
use C4::Output;
37
use C4::Serials;
37
use C4::Serials;
38
use C4::Serials::RoutingLists qw/GetRoutingListsCount/;
38
39
39
my $query         = new CGI;
40
my $query         = new CGI;
40
my $title         = $query->param('title_filter') || '';
41
my $title         = $query->param('title_filter') || '';
Lines 76-82 if ($searched){ Link Here
76
# to toggle between create or edit routing list options
77
# to toggle between create or edit routing list options
77
if ($routing) {
78
if ($routing) {
78
    for my $subscription ( @subscriptions) {
79
    for my $subscription ( @subscriptions) {
79
        $subscription->{routingedit} = check_routing( $subscription->{subscriptionid} );
80
        $subscription->{routinglistscount}
81
            = GetRoutingListsCount($subscription->{subscriptionid});
80
        $subscription->{branchname} = GetBranchName ( $subscription->{branchcode} );
82
        $subscription->{branchname} = GetBranchName ( $subscription->{branchcode} );
81
    }
83
    }
82
}
84
}
(-)a/serials/subscription-detail.pl (-1 / +2 lines)
Lines 22-27 use C4::Auth; Link Here
22
use C4::Koha;
22
use C4::Koha;
23
use C4::Dates qw/format_date/;
23
use C4::Dates qw/format_date/;
24
use C4::Serials;
24
use C4::Serials;
25
use C4::Serials::RoutingLists qw/GetRoutingListsCount/;
25
use C4::Output;
26
use C4::Output;
26
use C4::Context;
27
use C4::Context;
27
use C4::Search qw/enabled_staff_search_views/;
28
use C4::Search qw/enabled_staff_search_views/;
Lines 93-99 if ($op eq 'del') { Link Here
93
		exit;
94
		exit;
94
    }
95
    }
95
}
96
}
96
my $hasRouting = check_routing($subscriptionid);
97
my $hasRouting = GetRoutingListsCount($subscriptionid);
97
98
98
(undef, $cookie, undef, undef)
99
(undef, $cookie, undef, undef)
99
    = checkauth($query, 0, {catalogue => 1}, "intranet");
100
    = checkauth($query, 0, {catalogue => 1}, "intranet");
(-)a/t/db_dependent/lib/KohaTest/Serials.pm (-6 lines)
Lines 46-56 sub methods : Test( 1 ) { Link Here
46
                      removeMissingIssue
46
                      removeMissingIssue
47
                      updateClaim
47
                      updateClaim
48
                      getsupplierbyserialid
48
                      getsupplierbyserialid
49
                      check_routing
50
                      addroutingmember
51
                      reorder_members
52
                      delroutingmember
53
                      getroutinglist
54
                      countissuesfrom
49
                      countissuesfrom
55
                      abouttoexpire
50
                      abouttoexpire
56
                      in_array
51
                      in_array
57
- 

Return to bug 7957