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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts.js.inc (+4 lines)
Lines 1-6 Link Here
1
[% USE Asset %]
1
[% USE Asset %]
2
[% USE Koha %]
2
[% USE Koha %]
3
[% USE raw %]
3
[% USE raw %]
4
[% USE ItemTypes %]
5
[% USE To %]
4
6
5
<script>
7
<script>
6
  [% IF Koha.Preference('ServerSideCheckoutsTables') %]
8
  [% IF Koha.Preference('ServerSideCheckoutsTables') %]
Lines 10-17 Link Here
10
  [% END %]
12
  [% END %]
11
  var AllowCirculate = [% (CAN_user_circulate_circulate_remaining_permissions)? 1 : 0 %];
13
  var AllowCirculate = [% (CAN_user_circulate_circulate_remaining_permissions)? 1 : 0 %];
12
  var AllowRenewalLimitOverride = [% (CAN_user_circulate_override_renewals && Koha.Preference('AllowRenewalLimitOverride'))? 1 : 0 %];
14
  var AllowRenewalLimitOverride = [% (CAN_user_circulate_override_renewals && Koha.Preference('AllowRenewalLimitOverride'))? 1 : 0 %];
15
  var itemtypes = [% To.json(ItemTypes.Get()) %];
13
16
14
  var MSG_DT_LOADING_RECORDS = _("Loading... you may continue scanning.");
17
  var MSG_DT_LOADING_RECORDS = _("Loading... you may continue scanning.");
18
  var MSG_COLUMN_FILTER_FROM_TO = _("From %s<br>to %s").format('{from}', '{to}');
15
19
16
  var borrowernumber = "[% borrowernumber | $raw %]";
20
  var borrowernumber = "[% borrowernumber | $raw %]";
17
  var relatives_borrowernumbers = new Array();
21
  var relatives_borrowernumbers = new Array();
(-)a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js (-2 / +9 lines)
Lines 25-40 function disableGrouping(datatable) { Link Here
25
function enableFiltering(datatable) {
25
function enableFiltering(datatable) {
26
    var oSettings = datatable.fnSettings();
26
    var oSettings = datatable.fnSettings();
27
    var filters_row = $(oSettings.nTable).find('thead tr.filters_row');
27
    var filters_row = $(oSettings.nTable).find('thead tr.filters_row');
28
    var itemtypes_options = itemtypes.map(function (itemtype) {
29
        return {
30
            label: itemtype.translated_description.escapeHtml(),
31
            value: itemtype.itemtype.escapeHtml(),
32
        };
33
    });
28
    if (!filters_row.hasClass('columnFilter')) {
34
    if (!filters_row.hasClass('columnFilter')) {
29
        datatable.columnFilter({
35
        datatable.columnFilter({
30
            sPlaceHolder: "head:after",
36
            sPlaceHolder: "head:after",
31
            bUseColVis: true,
37
            bUseColVis: true,
32
            sRangeFormat: "From {from}<br>to {to}",
38
            sRangeFormat: MSG_COLUMN_FILTER_FROM_TO,
33
            aoColumns: [
39
            aoColumns: [
34
                null,
40
                null,
35
                null,
41
                null,
36
                { type: "date-range" },
42
                { type: "date-range" },
37
                { type: "text" },
43
                { type: "text" },
44
                { type: "select", values: itemtypes_options },
38
                { type: "text" },
45
                { type: "text" },
39
                { type: "text" },
46
                { type: "text" },
40
                { type: "text" },
47
                { type: "text" },
Lines 593-599 $(document).ready(function() { Link Here
593
                    }
600
                    }
594
                },
601
                },
595
                {
602
                {
596
                    "data": "branchcode",
603
                    "data": "branchname",
597
                    "render": {
604
                    "render": {
598
                        "display": renderers.branch
605
                        "display": renderers.branch
599
                    }
606
                    }
(-)a/svc/checkouts (-9 / +8 lines)
Lines 71-78 if (!$orderby || $orderby =~ m/ORDER BY issued_today desc\s*$/) { Link Here
71
    };
71
    };
72
}
72
}
73
73
74
my $item_level_itypes = C4::Context->preference('item-level_itypes');
75
my $itemtype_field = $item_level_itypes ? 'items.itype' : 'biblioitems.itemtype';
76
74
my @parameters;
77
my @parameters;
75
my $sql = '
78
my $sql = qq{
76
    SELECT SQL_CALC_FOUND_ROWS
79
    SELECT SQL_CALC_FOUND_ROWS
77
        issuedate,
80
        issuedate,
78
        date_due,
81
        date_due,
Lines 96-103 my $sql = ' Link Here
96
        issues.branchcode,
99
        issues.branchcode,
97
        branches.branchname,
100
        branches.branchname,
98
101
99
        items.itype,
102
        $itemtype_field AS itemtype,
100
        biblioitems.itemtype,
101
103
102
        items.ccode AS collection,
104
        items.ccode AS collection,
103
105
Lines 120-126 my $sql = ' Link Here
120
        LEFT JOIN branches ON ( issues.branchcode = branches.branchcode )
122
        LEFT JOIN branches ON ( issues.branchcode = branches.branchcode )
121
        LEFT JOIN branches branches2 ON ( items.homebranch = branches2.branchcode )
123
        LEFT JOIN branches branches2 ON ( items.homebranch = branches2.branchcode )
122
    WHERE
124
    WHERE
123
';
125
};
124
126
125
my $borrowernumber_sql = 'borrowernumber';
127
my $borrowernumber_sql = 'borrowernumber';
126
if ( @borrowernumber == 1 ) {
128
if ( @borrowernumber == 1 ) {
Lines 148-155 my $sth = $dbh->prepare($sql); Link Here
148
$sth->execute(@parameters);
150
$sth->execute(@parameters);
149
my ($iTotalDisplayRecords) = $dbh->selectrow_array('SELECT FOUND_ROWS()');
151
my ($iTotalDisplayRecords) = $dbh->selectrow_array('SELECT FOUND_ROWS()');
150
152
151
my $item_level_itypes = C4::Context->preference('item-level_itypes');
152
153
my @checkouts;
153
my @checkouts;
154
while ( my $c = $sth->fetchrow_hashref() ) {
154
while ( my $c = $sth->fetchrow_hashref() ) {
155
    my ($charge) = GetIssuingCharges( $c->{itemnumber}, $c->{borrowernumber} );
155
    my ($charge) = GetIssuingCharges( $c->{itemnumber}, $c->{borrowernumber} );
Lines 170-176 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
170
    my ( $renewals_count, $renewals_allowed, $renewals_remaining ) =
170
    my ( $renewals_count, $renewals_allowed, $renewals_remaining ) =
171
      GetRenewCount( $c->{borrowernumber}, $c->{itemnumber} );
171
      GetRenewCount( $c->{borrowernumber}, $c->{itemnumber} );
172
172
173
    my $itemtype = Koha::ItemTypes->find( $item_level_itypes ? $c->{itype} : $c->{itemtype} );
173
    my $itemtype = Koha::ItemTypes->find( $c->{itemtype} );
174
    my $location;
174
    my $location;
175
    if ( $c->{location} ) {
175
    if ( $c->{location} ) {
176
        my $av = Koha::AuthorisedValues->search({ category => 'LOC', authorised_value => $c->{location} });
176
        my $av = Koha::AuthorisedValues->search({ category => 'LOC', authorised_value => $c->{location} });
Lines 196-202 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
196
        title                => $c->{title},
196
        title                => $c->{title},
197
        author               => $c->{author},
197
        author               => $c->{author},
198
        barcode              => $c->{barcode},
198
        barcode              => $c->{barcode},
199
        itemtype             => $item_level_itypes ? $c->{itype} : $c->{itemtype},
199
        itemtype             => $c->{itemtype},
200
        itemtype_description => $itemtype ? $itemtype->translated_description : q{},
200
        itemtype_description => $itemtype ? $itemtype->translated_description : q{},
201
        collection           => $collection,
201
        collection           => $collection,
202
        location             => $location,
202
        location             => $location,
203
- 

Return to bug 15235