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

(-)a/C4/Reserves.pm (-32 / +32 lines)
Lines 138-146 BEGIN { Link Here
138
138
139
        GetMaxPatronHoldsForRecord
139
        GetMaxPatronHoldsForRecord
140
140
141
        &AddReserveGroup
141
        &AddHoldGroup
142
        &DeleteReserveGroup
142
        &DeleteHoldGroup
143
        &GetReserveGroupReserves
143
        &GetHoldGroupHolds
144
    );
144
    );
145
    @EXPORT_OK = qw( MergeHolds );
145
    @EXPORT_OK = qw( MergeHolds );
146
}
146
}
Lines 167-173 sub AddReserve { Link Here
167
        $branch,   $borrowernumber, $biblionumber, $bibitems,
167
        $branch,   $borrowernumber, $biblionumber, $bibitems,
168
        $priority, $resdate,        $expdate,      $notes,
168
        $priority, $resdate,        $expdate,      $notes,
169
        $title,    $checkitem,      $found,        $itemtype,
169
        $title,    $checkitem,      $found,        $itemtype,
170
        $reserve_group_id
170
        $hold_group_id
171
    ) = @_;
171
    ) = @_;
172
172
173
    $resdate = output_pref( { str => dt_from_string( $resdate ), dateonly => 1, dateformat => 'iso' })
173
    $resdate = output_pref( { str => dt_from_string( $resdate ), dateonly => 1, dateformat => 'iso' })
Lines 216-222 sub AddReserve { Link Here
216
            expirationdate => $expdate,
216
            expirationdate => $expdate,
217
            itemtype       => $itemtype,
217
            itemtype       => $itemtype,
218
            item_level_hold => $checkitem ? 1 : 0,
218
            item_level_hold => $checkitem ? 1 : 0,
219
            reserve_group_id => $reserve_group_id,
219
            hold_group_id => $hold_group_id,
220
        }
220
        }
221
    )->store();
221
    )->store();
222
    $hold->set_waiting() if $found eq 'W';
222
    $hold->set_waiting() if $found eq 'W';
Lines 535-541 sub GetReserveCount { Link Here
535
        SELECT COUNT(*) AS counter
535
        SELECT COUNT(*) AS counter
536
        FROM reserves
536
        FROM reserves
537
        WHERE borrowernumber = ?
537
        WHERE borrowernumber = ?
538
        AND reserve_group_id is NULL"; #added by 15516
538
        AND hold_group_id is NULL"; #added by 15516
539
    my $sth = $dbh->prepare($query);
539
    my $sth = $dbh->prepare($query);
540
    $sth->execute($borrowernumber);
540
    $sth->execute($borrowernumber);
541
    my $row = $sth->fetchrow_hashref;
541
    my $row = $sth->fetchrow_hashref;
Lines 544-553 sub GetReserveCount { Link Here
544
    $count += $row->{counter};
544
    $count += $row->{counter};
545
545
546
    $query = "
546
    $query = "
547
        SELECT COUNT(DISTINCT reserve_group_id) AS counter
547
        SELECT COUNT(DISTINCT hold_group_id) AS counter
548
        FROM reserves
548
        FROM reserves
549
        WHERE borrowernumber = ?
549
        WHERE borrowernumber = ?
550
        AND reserve_group_id is not NULL
550
        AND hold_group_id is not NULL
551
    ";
551
    ";
552
    $sth = $dbh->prepare($query);
552
    $sth = $dbh->prepare($query);
553
    $sth->execute($borrowernumber);
553
    $sth->execute($borrowernumber);
Lines 1122-1135 sub ModReserveAffect { Link Here
1122
    $hold->itemnumber($itemnumber);
1122
    $hold->itemnumber($itemnumber);
1123
    $hold->set_waiting($transferToDo);
1123
    $hold->set_waiting($transferToDo);
1124
1124
1125
    if ($hold->reserve_group_id) {
1125
    if ($hold->hold_group_id) {
1126
        # Delete other reserves from same group
1126
        # Delete other reserves from same group
1127
        $dbh->do(q{
1127
        $dbh->do(q{
1128
            DELETE FROM reserves
1128
            DELETE FROM reserves
1129
            WHERE reserve_group_id = ?
1129
            WHERE hold_group_id = ?
1130
              AND reserve_id != ?
1130
              AND reserve_id != ?
1131
        }, undef, $hold->reserve_group_id, $hold->reserve_id);
1131
        }, undef, $hold->hold_group_id, $hold->reserve_id);
1132
        DeleteReserveGroup($hold->reserve_group_id);
1132
        DeleteHoldGroup($hold->hold_group_id);
1133
    }
1133
    }
1134
1134
1135
    _koha_notify_reserve( $hold->reserve_id )
1135
    _koha_notify_reserve( $hold->reserve_id )
Lines 2231-2284 sub GetHoldRule { Link Here
2231
    return $sth->fetchrow_hashref();
2231
    return $sth->fetchrow_hashref();
2232
}
2232
}
2233
2233
2234
=head2 AddReserveGroup
2234
=head2 AddHoldGroup
2235
2235
2236
    my $reserve_group_id = AddReserveGroup();
2236
    my $hold_group_id = AddHoldGroup();
2237
2237
2238
Creates a new reserve group and returns its ID
2238
Creates a new hold group and returns its ID
2239
2239
2240
=cut
2240
=cut
2241
2241
2242
sub AddReserveGroup {
2242
sub AddHoldGroup {
2243
    my $dbh = C4::Context->dbh;
2243
    my $dbh = C4::Context->dbh;
2244
2244
2245
    $dbh->do('INSERT INTO reserve_group VALUES ()');
2245
    $dbh->do('INSERT INTO hold_group VALUES ()');
2246
    return $dbh->last_insert_id(undef, undef, 'reserve_group', undef);
2246
    return $dbh->last_insert_id(undef, undef, 'hold_group', undef);
2247
}
2247
}
2248
2248
2249
=head2 DeleteReserveGroup
2249
=head2 DeleteHoldGroup
2250
2250
2251
    DeleteReserveGroup($reserve_group_id);
2251
    DeleteHoldGroup($hold_group_id);
2252
2252
2253
Delete a reserve group. Reserves that belong to this group are not removed.
2253
Delete a hold group. Reserves that belong to this group are not removed.
2254
2254
2255
=cut
2255
=cut
2256
2256
2257
sub DeleteReserveGroup {
2257
sub DeleteHoldGroup {
2258
    my ($reserve_group_id) = @_;
2258
    my ($hold_group_id) = @_;
2259
2259
2260
    my $dbh = C4::Context->dbh;
2260
    my $dbh = C4::Context->dbh;
2261
    my $query = 'DELETE FROM reserve_group WHERE reserve_group_id = ?';
2261
    my $query = 'DELETE FROM hold_group WHERE hold_group_id = ?';
2262
    $dbh->do($query, undef, $reserve_group_id);
2262
    $dbh->do($query, undef, $hold_group_id);
2263
}
2263
}
2264
2264
2265
=head2 GetReserveGroupReserves
2265
=head2 GetHoldGroupHolds
2266
2266
2267
    my @reserves = GetReserveGroupReserves($reserve_group_id);
2267
    my @reserves = GetHoldGroupHolds($hold_group_id);
2268
2268
2269
Fetch all reserve from a reserve group.
2269
Fetch all reserve from a hold group.
2270
2270
2271
=cut
2271
=cut
2272
2272
2273
sub GetReserveGroupReserves {
2273
sub GetHoldGroupHolds {
2274
    my ($reserve_group_id) = @_;
2274
    my ($hold_group_id) = @_;
2275
2275
2276
    my $dbh = C4::Context->dbh;
2276
    my $dbh = C4::Context->dbh;
2277
2277
2278
    my $reserves = $dbh->selectall_arrayref(q{
2278
    my $reserves = $dbh->selectall_arrayref(q{
2279
        SELECT * FROM reserves
2279
        SELECT * FROM reserves
2280
        WHERE reserve_group_id = ?
2280
        WHERE hold_group_id = ?
2281
    }, { Slice => {} }, $reserve_group_id);
2281
    }, { Slice => {} }, $hold_group_id);
2282
2282
2283
    return () unless defined $reserves;
2283
    return () unless defined $reserves;
2284
2284
(-)a/installer/data/mysql/atomicupdate/bug_15516.sql (-8 / +8 lines)
Lines 1-11 Link Here
1
DROP TABLE IF EXISTS reserve_group;
1
DROP TABLE IF EXISTS hold_group;
2
CREATE TABLE reserve_group (
2
CREATE TABLE hold_group (
3
  reserve_group_id int unsigned NOT NULL AUTO_INCREMENT,
3
  hold_group_id int unsigned NOT NULL AUTO_INCREMENT,
4
  PRIMARY KEY (reserve_group_id)
4
  PRIMARY KEY (hold_group_id)
5
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
5
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
6
6
7
ALTER TABLE reserves ADD COLUMN reserve_group_id int unsigned NULL DEFAULT NULL;
7
ALTER TABLE reserves ADD COLUMN hold_group_id int unsigned NULL DEFAULT NULL;
8
ALTER TABLE reserves ADD CONSTRAINT reserves_ibfk_6 FOREIGN KEY (reserve_group_id) REFERENCES reserve_group (reserve_group_id) ON DELETE SET NULL ON UPDATE CASCADE;
8
ALTER TABLE reserves ADD CONSTRAINT reserves_ibfk_6 FOREIGN KEY (hold_group_id) REFERENCES hold_group (hold_group_id) ON DELETE SET NULL ON UPDATE CASCADE;
9
9
10
ALTER TABLE old_reserves ADD COLUMN reserve_group_id int unsigned NULL DEFAULT NULL;
10
ALTER TABLE old_reserves ADD COLUMN hold_group_id int unsigned NULL DEFAULT NULL;
11
ALTER TABLE old_reserves ADD CONSTRAINT old_reserves_ibfk_5 FOREIGN KEY (reserve_group_id) REFERENCES reserve_group (reserve_group_id) ON DELETE SET NULL ON UPDATE CASCADE;
11
ALTER TABLE old_reserves ADD CONSTRAINT old_reserves_ibfk_5 FOREIGN KEY (hold_group_id) REFERENCES hold_group (hold_group_id) ON DELETE SET NULL ON UPDATE CASCADE;
(-)a/installer/data/mysql/kohastructure.sql (-9 / +9 lines)
Lines 1714-1720 CREATE TABLE `old_issues` ( -- lists items that were checked out and have been r Link Here
1714
    ON DELETE SET NULL ON UPDATE SET NULL,
1714
    ON DELETE SET NULL ON UPDATE SET NULL,
1715
  CONSTRAINT `old_issues_ibfk_2` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`)
1715
  CONSTRAINT `old_issues_ibfk_2` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`)
1716
    ON DELETE SET NULL ON UPDATE SET NULL,
1716
    ON DELETE SET NULL ON UPDATE SET NULL,
1717
  CONSTRAINT `old_reserves_ibfk_5` FOREIGN KEY (reserve_group_id) REFERENCES reserve_group (reserve_group_id)
1717
  CONSTRAINT `old_reserves_ibfk_5` FOREIGN KEY (hold_group_id) REFERENCES hold_group (hold_group_id)
1718
    ON DELETE SET NULL ON UPDATE CASCADE
1718
    ON DELETE SET NULL ON UPDATE CASCADE
1719
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1719
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1720
1720
Lines 1819-1825 CREATE TABLE `reserves` ( -- information related to holds/reserves in Koha Link Here
1819
  `suspend_until` DATETIME NULL DEFAULT NULL,
1819
  `suspend_until` DATETIME NULL DEFAULT NULL,
1820
  `itemtype` VARCHAR(10) NULL DEFAULT NULL, -- If record level hold, the optional itemtype of the item the patron is requesting
1820
  `itemtype` VARCHAR(10) NULL DEFAULT NULL, -- If record level hold, the optional itemtype of the item the patron is requesting
1821
  `item_level_hold` BOOLEAN NOT NULL DEFAULT 0, -- Is the hpld placed at item level
1821
  `item_level_hold` BOOLEAN NOT NULL DEFAULT 0, -- Is the hpld placed at item level
1822
  `reserve_group_id` int unsigned NULL DEFAULT NULL,  -- Id used on reservations spanning multiple titles
1822
  `hold_group_id` int unsigned NULL DEFAULT NULL,  -- Id used on reservations spanning multiple titles
1823
  PRIMARY KEY (`reserve_id`),
1823
  PRIMARY KEY (`reserve_id`),
1824
  KEY priorityfoundidx (priority,found),
1824
  KEY priorityfoundidx (priority,found),
1825
  KEY `borrowernumber` (`borrowernumber`),
1825
  KEY `borrowernumber` (`borrowernumber`),
Lines 1832-1848 CREATE TABLE `reserves` ( -- information related to holds/reserves in Koha Link Here
1832
  CONSTRAINT `reserves_ibfk_3` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1832
  CONSTRAINT `reserves_ibfk_3` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1833
  CONSTRAINT `reserves_ibfk_4` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
1833
  CONSTRAINT `reserves_ibfk_4` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
1834
  CONSTRAINT `reserves_ibfk_5` FOREIGN KEY (`itemtype`) REFERENCES `itemtypes` (`itemtype`) ON DELETE CASCADE ON UPDATE CASCADE,
1834
  CONSTRAINT `reserves_ibfk_5` FOREIGN KEY (`itemtype`) REFERENCES `itemtypes` (`itemtype`) ON DELETE CASCADE ON UPDATE CASCADE,
1835
  CONSTRAINT `reserves_ibfk_6` FOREIGN KEY (`reserve_group_id`) REFERENCES `reserve_group` (`reserve_group_id`) ON DELETE SET NULL ON UPDATE CASCADE
1835
  CONSTRAINT `reserves_ibfk_6` FOREIGN KEY (`hold_group_id`) REFERENCES `hold_group` (`hold_group_id`) ON DELETE SET NULL ON UPDATE CASCADE
1836
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1836
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1837
1837
1838
--
1838
--
1839
-- Table structure for table reserve_group
1839
-- Table structure for table hold_group
1840
--
1840
--
1841
1841
1842
DROP TABLE IF EXISTS `reserve_group`;
1842
DROP TABLE IF EXISTS `hold_group`;
1843
CREATE TABLE `reserve_group` (
1843
CREATE TABLE `hold_group` (
1844
  `reserve_group_id` int unsigned NOT NULL AUTO_INCREMENT,
1844
  `hold_group_id` int unsigned NOT NULL AUTO_INCREMENT,
1845
  PRIMARY KEY(`reserve_group_id`)
1845
  PRIMARY KEY(`hold_group_id`)
1846
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1846
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1847
1847
1848
--
1848
--
Lines 1871-1877 CREATE TABLE `old_reserves` ( -- this table holds all holds/reserves that have b Link Here
1871
  `suspend_until` DATETIME NULL DEFAULT NULL, -- the date this hold is suspended until (NULL for infinitely)
1871
  `suspend_until` DATETIME NULL DEFAULT NULL, -- the date this hold is suspended until (NULL for infinitely)
1872
  `itemtype` VARCHAR(10) NULL DEFAULT NULL, -- If record level hold, the optional itemtype of the item the patron is requesting
1872
  `itemtype` VARCHAR(10) NULL DEFAULT NULL, -- If record level hold, the optional itemtype of the item the patron is requesting
1873
  `item_level_hold` BOOLEAN NOT NULL DEFAULT 0, -- Is the hpld placed at item level
1873
  `item_level_hold` BOOLEAN NOT NULL DEFAULT 0, -- Is the hpld placed at item level
1874
  `reserve_group_id` int unsigned NULL DEFAULT NULL,  -- The id of a group of titles reservations fulfilled when one title is picked
1874
  `hold_group_id` int unsigned NULL DEFAULT NULL,  -- The id of a group of titles reservations fulfilled when one title is picked
1875
  PRIMARY KEY (`reserve_id`),
1875
  PRIMARY KEY (`reserve_id`),
1876
  KEY `old_reserves_borrowernumber` (`borrowernumber`),
1876
  KEY `old_reserves_borrowernumber` (`borrowernumber`),
1877
  KEY `old_reserves_biblionumber` (`biblionumber`),
1877
  KEY `old_reserves_biblionumber` (`biblionumber`),
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc (+27 lines)
Line 0 Link Here
1
<div id="hold-group-modal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="hold-group-modal-label" aria-hidden="true">
2
    <div class="modal-header">
3
        <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
4
        <h3 id="hold-group-modal-label">Reserve group</h3>
5
    </div>
6
    <div class="modal-body">
7
        <div id="loading"> <img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> Loading </div>
8
    </div>
9
    <div class="modal-footer">
10
        <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
11
    </div>
12
</div>
13
14
<script>
15
  $(document).ready(function() {
16
    $('body').on('click', 'a.hold-group', function() {
17
      var href = $(this).attr('href');
18
      $('#hold-group-modal .modal-body').load(href + " #main");
19
      $('#hold-group-modal').modal('show');
20
      return false;
21
    })
22
23
    $('#hold-group-modal').on('hidden', function(){
24
        $('#hold-group-modal .modal-body').html('<div id="loading"><img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> ' + _('Loading') + '</div>');
25
    });
26
  });
27
</script>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc (-2 / +2 lines)
Lines 164-171 Link Here
164
                        <input type="hidden" name="itemnumber" value="" />
164
                        <input type="hidden" name="itemnumber" value="" />
165
                    [% END %]
165
                    [% END %]
166
                [% END %]
166
                [% END %]
167
                [% IF hold.reserve_group_id %]
167
                [% IF hold.hold_group_id %]
168
                    <div>(part of a <a href="/cgi-bin/koha/reserve/reserve-group.pl?reserve_group_id=[% hold.reserve_group_id %]" class="reserve-group">reserve group</a>)</div>
168
                    <div>(part of a <a href="/cgi-bin/koha/reserve/hold-group.pl?hold_group_id=[% hold.hold_group_id %]" class="hold-group">hold group</a>)</div>
169
                [% END %]
169
                [% END %]
170
            </td>
170
            </td>
171
171
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/reserve-group-modal.inc (-27 lines)
Lines 1-27 Link Here
1
<div id="reserve-group-modal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="reserve-group-modal-label" aria-hidden="true">
2
    <div class="modal-header">
3
        <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
4
        <h3 id="reserve-group-modal-label">Reserve group</h3>
5
    </div>
6
    <div class="modal-body">
7
        <div id="loading"> <img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> Loading </div>
8
    </div>
9
    <div class="modal-footer">
10
        <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
11
    </div>
12
</div>
13
14
<script>
15
  $(document).ready(function() {
16
    $('body').on('click', 'a.reserve-group', function() {
17
      var href = $(this).attr('href');
18
      $('#reserve-group-modal .modal-body').load(href + " #main");
19
      $('#reserve-group-modal').modal('show');
20
      return false;
21
    })
22
23
    $('#reserve-group-modal').on('hidden', function(){
24
        $('#reserve-group-modal .modal-body').html('<div id="loading"><img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> ' + _('Loading') + '</div>');
25
    });
26
  });
27
</script>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc (+2 lines)
Lines 46-49 Link Here
46
    var CURRENT = _(" (current) ");
46
    var CURRENT = _(" (current) ");
47
    var MSG_NO_ITEMTYPE = _("No itemtype");
47
    var MSG_NO_ITEMTYPE = _("No itemtype");
48
    var MSG_CHECKOUTS_BY_ITEMTYPE = _("Number of checkouts by item type");
48
    var MSG_CHECKOUTS_BY_ITEMTYPE = _("Number of checkouts by item type");
49
    var PART_OF_A = _("(part of a %s)");
50
    var HOLD_GROUP = _("hold group");
49
</script>
51
</script>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt (-3 / +3 lines)
Lines 80-87 Link Here
80
                    [% INCLUDE 'biblio-title.inc' biblio=reserveloo %]
80
                    [% INCLUDE 'biblio-title.inc' biblio=reserveloo %]
81
                </a></p>
81
                </a></p>
82
                [% IF ( reserveloo.author ) %]<p> by [% reserveloo.author | html %]</p>[% END %]
82
                [% IF ( reserveloo.author ) %]<p> by [% reserveloo.author | html %]</p>[% END %]
83
                [% IF reserveloo.reserve_group_id %]
83
                [% IF reserveloo.hold_group_id %]
84
                    <p>(part of a <a class="reserve-group" href="/cgi-bin/koha/reserve/reserve-group.pl?reserve_group_id=[% reserveloo.reserve_group_id | html %]">reserve group</a>)</p>
84
                    <p>(part of a <a class="hold-group" href="/cgi-bin/koha/reserve/hold-group.pl?hold_group_id=[% reserveloo.hold_group_id | html %]">hold group</a>)</p>
85
                [% END %]
85
                [% END %]
86
            </td>
86
            </td>
87
        [% ELSE %]
87
        [% ELSE %]
Lines 308-312 Link Here
308
[% END %]
308
[% END %]
309
309
310
[%# TODO: this module needs to be separated to html and js part to be included correctly %]
310
[%# TODO: this module needs to be separated to html and js part to be included correctly %]
311
[% INCLUDE 'reserve-group-modal.inc' %]
311
[% INCLUDE 'hold-group-modal.inc' %]
312
[% INCLUDE 'intranet-bottom.inc' %]
312
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-1 / +1 lines)
Lines 957-961 Link Here
957
    </script>
957
    </script>
958
[% END %]
958
[% END %]
959
959
960
[% INCLUDE 'reserve-group-modal.inc' %]
960
[% INCLUDE 'hold-group-modal.inc' %]
961
[% INCLUDE 'intranet-bottom.inc' %]
961
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/reserve-group.tt (-9 / +9 lines)
Lines 1-12 Link Here
1
[% USE Biblio %]
1
[% USE Biblio %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
3
  <title>Koha &rsaquo; Circulation &rsaquo; Holds &rsaquo; Holds group ([% reserve_group_id %])</title>
3
  <title>Koha &rsaquo; Circulation &rsaquo; Holds &rsaquo; Holds group ([% hold_group_id %])</title>
4
  [% INCLUDE 'doc-head-close.inc' %]
4
  [% INCLUDE 'doc-head-close.inc' %]
5
</head>
5
</head>
6
<body id="reserve-reserve-group">
6
<body id="hold.hold-group">
7
  <h1>Holds group ([% reserve_group_id %])</h1>
7
  <h1>Holds group ([% hold_group_id %])</h1>
8
  <div id="main">
8
  <div id="main">
9
    [% IF reserves.size %]
9
    [% IF holds.size %]
10
      <table>
10
      <table>
11
        <thead>
11
        <thead>
12
          <tr>
12
          <tr>
Lines 16-27 Link Here
16
          </tr>
16
          </tr>
17
        </thead>
17
        </thead>
18
        <tbody>
18
        <tbody>
19
          [% FOREACH reserve IN reserves %]
19
          [% FOREACH hold IN holds %]
20
            [% biblio = Biblio.Get(reserve.biblionumber) %]
20
            [% biblio = Biblio.Get(hold.biblionumber) %]
21
            <tr>
21
            <tr>
22
              <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblio.biblionumber %]">[% biblio.title %]</a></td>
22
              <td><a href="/cgi-bin/koha/hold.request.pl?biblionumber=[% biblio.biblionumber %]">[% biblio.title %]</a></td>
23
              <td>[% reserve.priority %]</td>
23
              <td>[% hold.priority %]</td>
24
              <td>[% reserve.reservenotes %]</td>
24
              <td>[% hold.reservenotes %]</td>
25
            </tr>
25
            </tr>
26
          [% END %]
26
          [% END %]
27
        </tbody>
27
        </tbody>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-1 / +1 lines)
Lines 975-980 Link Here
975
    </script>
975
    </script>
976
[% END %]
976
[% END %]
977
977
978
[% INCLUDE 'reserve-group-modal.inc' %]
978
[% INCLUDE 'hold-group-modal.inc' %]
979
979
980
[% INCLUDE 'intranet-bottom.inc' %]
980
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/js/holds.js (-2 / +2 lines)
Lines 44-52 $(document).ready(function() { Link Here
44
                                title += " - <span class='" + span_class + "'>" + oObj.itemnotes.escapeHtml() + "</span>"
44
                                title += " - <span class='" + span_class + "'>" + oObj.itemnotes.escapeHtml() + "</span>"
45
                            }
45
                            }
46
46
47
                            if (oObj.reserve_group_id) {
47
                            if (oObj.hold_group_id) {
48
                              title += '<br>';
48
                              title += '<br>';
49
                              var link = '<a class="reserve-group" href="/cgi-bin/koha/reserve/reserve-group.pl?reserve_group_id=' + oObj.reserve_group_id + '">' + RESERVE_GROUP +'</a>'
49
                              var link = '<a class="hold-group" href="/cgi-bin/koha/reserve/hold-group.pl?hold_group_id=' + oObj.hold_group_id + '">' + HOLD_GROUP +'</a>'
50
                              title += '<span>' + PART_OF_A.format(link) + '</span>';
50
                              title += '<span>' + PART_OF_A.format(link) + '</span>';
51
                            }
51
                            }
52
52
(-)a/reserve/reserve-group.pl (-5 / +5 lines)
Lines 24-42 use C4::Reserves; Link Here
24
24
25
my $cgi = new CGI;
25
my $cgi = new CGI;
26
my ($template, $loggedinuser, $cookie) = get_template_and_user({
26
my ($template, $loggedinuser, $cookie) = get_template_and_user({
27
    template_name   => "reserve/reserve-group.tt",
27
    template_name   => "reserve/hold-group.tt",
28
    query           => $cgi,
28
    query           => $cgi,
29
    type            => "intranet",
29
    type            => "intranet",
30
    authnotrequired => 0,
30
    authnotrequired => 0,
31
    flagsrequired   => { circulate => 'circulate_remaining_permissions' },
31
    flagsrequired   => { circulate => 'circulate_remaining_permissions' },
32
});
32
});
33
33
34
my $reserve_group_id = $cgi->param('reserve_group_id');
34
my $hold_group_id = $cgi->param('hold_group_id');
35
my @reserves = GetReserveGroupReserves($reserve_group_id);
35
my @reserves = GetHoldGroupHolds($hold_group_id);
36
36
37
$template->param(
37
$template->param(
38
    reserve_group_id => $reserve_group_id,
38
    hold_group_id => $hold_group_id,
39
    reserves => \@reserves,
39
    holds => \@holds,
40
);
40
);
41
41
42
output_html_with_http_headers $cgi, $cookie, $template->output;
42
output_html_with_http_headers $cgi, $cookie, $template->output;
(-)a/reserve/placerequest.pl (-2 / +2 lines)
Lines 75-83 my $found; Link Here
75
75
76
if ( $type eq 'str8' && $borrower ) {
76
if ( $type eq 'str8' && $borrower ) {
77
77
78
    my $reserve_group_id;
78
    my $hold_group_id;
79
    if ($multi_hold && $requestany) {
79
    if ($multi_hold && $requestany) {
80
        $reserve_group_id = AddReserveGroup();
80
        $hold_group_id = AddReserveGroup();
81
    }
81
    }
82
82
83
    foreach my $biblionumber ( keys %bibinfos ) {
83
    foreach my $biblionumber ( keys %bibinfos ) {
(-)a/svc/holds (-1 / +1 lines)
Lines 108-114 while ( my $h = $holds_rs->next() ) { Link Here
108
        waiting_here   => $h->branch()->branchcode() eq $branch,
108
        waiting_here   => $h->branch()->branchcode() eq $branch,
109
        priority       => $h->priority(),
109
        priority       => $h->priority(),
110
        itemtype_limit => $itemtype_limit,
110
        itemtype_limit => $itemtype_limit,
111
        reserve_group_id => $h->reserve_group_id,
111
        hold_group_id => $h->hold_group_id,
112
        reservedate_formatted => $h->reservedate() ? output_pref(
112
        reservedate_formatted => $h->reservedate() ? output_pref(
113
            { dt => dt_from_string( $h->reservedate() ), dateonly => 1 }
113
            { dt => dt_from_string( $h->reservedate() ), dateonly => 1 }
114
          )
114
          )
(-)a/t/db_dependent/Reserves/ReserveCount.t (-12 / +11 lines)
Lines 50-56 my $biblio = $builder->build( { source => 'Biblio', } ); Link Here
50
my $biblionumber = $biblio->{biblionumber};
50
my $biblionumber = $biblio->{biblionumber};
51
51
52
# Use AddReserve instead of TestBuilder because i don't manage
52
# Use AddReserve instead of TestBuilder because i don't manage
53
# to make TestBuilder set reserve_group_id to null. Idea ?
53
# to make TestBuilder set hold_group_id to null. Idea ?
54
my $reserve_id = AddReserve($branchcode, $borrowernumber,
54
my $reserve_id = AddReserve($branchcode, $borrowernumber,
55
$biblionumber, $biblionumber, 1, undef, undef, undef
55
$biblionumber, $biblionumber, 1, undef, undef, undef
56
$biblio->{title}, undef, undef, undef);
56
$biblio->{title}, undef, undef, undef);
Lines 58-66 $biblio->{title}, undef, undef, undef); Link Here
58
is(GetReserveCount($borrowernumber), 1, 'Test borrower has 1 reserve.');
58
is(GetReserveCount($borrowernumber), 1, 'Test borrower has 1 reserve.');
59
59
60
my $reserves_group = $builder->build({
60
my $reserves_group = $builder->build({
61
    source => 'ReserveGroup',
61
    source => 'HoldGroup',
62
    value => {
62
    value => {
63
        reserve_group_id => 1
63
        hold_group_id => 1
64
    }
64
    }
65
});
65
});
66
66
Lines 68-113 my $reserve2 = $builder->build({ Link Here
68
    source => 'Reserve',
68
    source => 'Reserve',
69
    value => {
69
    value => {
70
        borrowernumber => $borrowernumber,
70
        borrowernumber => $borrowernumber,
71
        reserve_group_id => 1
71
        hold_group_id => 1
72
    }
72
    }
73
});
73
});
74
my $reserve3 = $builder->build({
74
my $reserve3 = $builder->build({
75
    source => 'Reserve',
75
    source => 'Reserve',
76
    value => {
76
    value => {
77
        borrowernumber => $borrowernumber,
77
        borrowernumber => $borrowernumber,
78
        reserve_group_id => 1
78
        hold_group_id => 1
79
    }
79
    }
80
});
80
});
81
81
82
is(GetReserveCount($borrowernumber), 2, 'Test borrower has 2 reserve.');
82
is(GetReserveCount($borrowernumber), 2, 'Test borrower has 2 reserve.');
83
83
84
my $reserves_group2 = $builder->build({
84
my $reserves_group2 = $builder->build({
85
    source => 'ReserveGroup',
85
    source => 'HoldGroup',
86
    value => {
86
    value => {
87
        reserve_group_id => 2
87
        hold_group_id => 2
88
    }
88
    }
89
});
89
});
90
my $reserve_group_id2 = $reserves_group2->{reserve_group_id};
90
my $hold_group_id2 = $reserves_group2->{hold_group_id};
91
91
92
my $reserve4 = $builder->build({
92
my $reserve4 = $builder->build({
93
    source => 'Reserve',
93
    source => 'Reserve',
94
    value => {
94
    value => {
95
        borrowernumber => $borrowernumber,
95
        borrowernumber => $borrowernumber,
96
        reserve_group_id => 2
96
        hold_group_id => 2
97
    }
97
    }
98
});
98
});
99
my $reserve5 = $builder->build({
99
my $reserve5 = $builder->build({
100
    source => 'Reserve',
100
    source => 'Reserve',
101
    value => {
101
    value => {
102
        borrowernumber => $borrowernumber,
102
        borrowernumber => $borrowernumber,
103
        reserve_group_id => 2
103
        hold_group_id => 2
104
    }
104
    }
105
});
105
});
106
my $reserve6 = $builder->build({
106
my $reserve6 = $builder->build({
107
    source => 'Reserve',
107
    source => 'Reserve',
108
    value => {
108
    value => {
109
        borrowernumber => $borrowernumber,
109
        borrowernumber => $borrowernumber,
110
        reserve_group_id => 2
110
        hold_group_id => 2
111
    }
111
    }
112
});
112
});
113
113
114
- 

Return to bug 15516