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

(-)a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js (-1 / +1 lines)
Lines 235-241 $(document).ready(function() { Link Here
235
                        return title;
235
                        return title;
236
                    }
236
                    }
237
                },
237
                },
238
                { "mDataProp": "itemtype" },
238
                { "mDataProp": "itemtype_description" },
239
                { "mDataProp": "issuedate_formatted" },
239
                { "mDataProp": "issuedate_formatted" },
240
                { "mDataProp": "branchname" },
240
                { "mDataProp": "branchname" },
241
                { "mDataProp": "itemcallnumber" },
241
                { "mDataProp": "itemcallnumber" },
(-)a/svc/checkouts (-7 / +14 lines)
Lines 46-54 my @sort_columns = qw/date_due title itype issuedate branchcode itemcallnumber/; Link Here
46
my @borrowernumber   = $input->param('borrowernumber');
46
my @borrowernumber   = $input->param('borrowernumber');
47
my $offset           = $input->param('iDisplayStart');
47
my $offset           = $input->param('iDisplayStart');
48
my $results_per_page = $input->param('iDisplayLength') || -1;
48
my $results_per_page = $input->param('iDisplayLength') || -1;
49
my $sorting_column   = $sort_columns[ $input->param('iSortCol_0') ]
49
50
  || 'issuedate';
50
my $sorting_column = $input->param('iSortCol_0') || q{};
51
my $sorting_direction = $input->param('sSortDir_0') eq 'asc' ? 'asc' : 'desc';
51
$sorting_column = ( $sorting_column && $sort_columns[$sorting_column] ) ? $sort_columns[$sorting_column] : 'issuedate';
52
53
my $sorting_direction = $input->param('sSortDir_0') || q{};
54
$sorting_direction = $sorting_direction eq 'asc' ? 'asc' : 'desc';
52
55
53
$results_per_page = undef if ( $results_per_page == -1 );
56
$results_per_page = undef if ( $results_per_page == -1 );
54
57
Lines 78-85 my $sql = ' Link Here
78
        issues.branchcode,
81
        issues.branchcode,
79
        branchname,
82
        branchname,
80
83
81
        itype,
84
        items.itype,
82
        itemtype,
85
        itemtype_item.description AS itype_description,
86
        biblioitems.itemtype,
87
        itemtype_bib.description AS itemtype_description,
83
88
84
        borrowernumber,
89
        borrowernumber,
85
        surname,
90
        surname,
Lines 93-98 my $sql = ' Link Here
93
        LEFT JOIN biblioitems USING ( biblionumber )
98
        LEFT JOIN biblioitems USING ( biblionumber )
94
        LEFT JOIN borrowers USING ( borrowernumber )
99
        LEFT JOIN borrowers USING ( borrowernumber )
95
        LEFT JOIN branches ON ( issues.branchcode = branches.branchcode )
100
        LEFT JOIN branches ON ( issues.branchcode = branches.branchcode )
101
        LEFT JOIN itemtypes itemtype_bib ON ( biblioitems.itemtype = itemtype_bib.itemtype )
102
        LEFT JOIN itemtypes itemtype_item ON ( items.itype = itemtype_item.itemtype )
96
    WHERE borrowernumber
103
    WHERE borrowernumber
97
';
104
';
98
105
Lines 120-126 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
120
    my ( $can_renew, $can_renew_error ) =
127
    my ( $can_renew, $can_renew_error ) =
121
      CanBookBeRenewed( $c->{borrowernumber}, $c->{itemnumber} );
128
      CanBookBeRenewed( $c->{borrowernumber}, $c->{itemnumber} );
122
    my $can_renew_date =
129
    my $can_renew_date =
123
      $can_renew_error eq 'too_soon'
130
      $can_renew_error && $can_renew_error eq 'too_soon'
124
      ? output_pref(
131
      ? output_pref(
125
        {
132
        {
126
            dt => GetSoonestRenewDate( $c->{borrowernumber}, $c->{itemnumber} ),
133
            dt => GetSoonestRenewDate( $c->{borrowernumber}, $c->{itemnumber} ),
Lines 138-143 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
138
        author     => $c->{author},
145
        author     => $c->{author},
139
        barcode    => $c->{barcode},
146
        barcode    => $c->{barcode},
140
        itemtype   => $item_level_itypes ? $c->{itype} : $c->{itemtype},
147
        itemtype   => $item_level_itypes ? $c->{itype} : $c->{itemtype},
148
        itemtype_description => $item_level_itypes ? $c->{itype_description} : $c->{itemtype_description},
141
        itemnotes  => $c->{itemnotes},
149
        itemnotes  => $c->{itemnotes},
142
        branchcode => $c->{branchcode},
150
        branchcode => $c->{branchcode},
143
        branchname => $c->{branchname},
151
        branchname => $c->{branchname},
144
- 

Return to bug 13195