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

(-)a/Koha/Illrequest/Config.pm (-1 / +1 lines)
Lines 19-25 package Koha::Illrequest::Config; Link Here
19
19
20
use Modern::Perl;
20
use Modern::Perl;
21
21
22
use File::Basename;
22
use File::Basename qw/basename/;
23
23
24
use C4::Context;
24
use C4::Context;
25
25
(-)a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css (-4 lines)
Lines 3137-3143 fieldset.rows + fieldset.action { Link Here
3137
table#ill-requests {
3137
table#ill-requests {
3138
    width: 100% !important;
3138
    width: 100% !important;
3139
}
3139
}
3140
3141
table#ill-requests th {
3142
    text-transform: capitalize;
3143
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt (-20 / +20 lines)
Lines 1-5 Link Here
1
[% USE Branches %]
1
[% USE Branches %]
2
[% USE Koha %]
2
[% USE Koha %]
3
[% USE KohaDates %]
3
4
4
[% INCLUDE 'doc-head-open.inc' %]
5
[% INCLUDE 'doc-head-open.inc' %]
5
<title>Koha &rsaquo; ILL requests  &rsaquo;</title>
6
<title>Koha &rsaquo; ILL requests  &rsaquo;</title>
Lines 113-119 Link Here
113
                    null :
114
                    null :
114
                    row[thisCol];
115
                    row[thisCol];
115
            });
116
            });
116
        }
117
        };
117
118
118
        // Strip the expand prefix if it exists, we do this for display
119
        // Strip the expand prefix if it exists, we do this for display
119
        var stripPrefix = function(value) {
120
        var stripPrefix = function(value) {
Lines 125-131 Link Here
125
        };
126
        };
126
127
127
        // Our 'render' function for borrowerlink
128
        // Our 'render' function for borrowerlink
128
        var createBorrowerLink = function(data, type, row) {
129
        var createPatronLink = function(data, type, row) {
129
            return '<a title="View borrower details" ' +
130
            return '<a title="View borrower details" ' +
130
                'href="/cgi-bin/koha/members/moremember.pl?' +
131
                'href="/cgi-bin/koha/members/moremember.pl?' +
131
                'borrowernumber='+row.borrowernumber+'">' +
132
                'borrowernumber='+row.borrowernumber+'">' +
Lines 157-163 Link Here
157
                'method=illview&amp;illrequest_id=' +
158
                'method=illview&amp;illrequest_id=' +
158
                row.illrequest_id +
159
                row.illrequest_id +
159
                '">Manage request</a>' +
160
                '">Manage request</a>' +
160
                '</div>'
161
                '</div>';
161
        };
162
        };
162
163
163
        // Columns that require special treatment
164
        // Columns that require special treatment
Lines 167-174 Link Here
167
                func: createActionLink
168
                func: createActionLink
168
            },
169
            },
169
            borrowername: {
170
            borrowername: {
170
                name: 'Borrower',
171
                name: 'Patron',
171
                func: createBorrowerLink
172
                func: createPatronLink
172
            },
173
            },
173
            illrequest_id: {
174
            illrequest_id: {
174
                name: 'Request number',
175
                name: 'Request number',
Lines 179-188 Link Here
179
                func: createStatus
180
                func: createStatus
180
            },
181
            },
181
            biblio_id: {
182
            biblio_id: {
182
                name: 'Biblio number'
183
                name: 'Biblio ID'
183
            },
184
            },
184
            branchcode: {
185
            branchcode: {
185
                name: 'Branch code'
186
                name: 'Library'
186
            }
187
            }
187
        };
188
        };
188
189
Lines 192-198 Link Here
192
                .replace(/^filter/, '')
193
                .replace(/^filter/, '')
193
                .replace(/([A-Z])/g, "_$1")
194
                .replace(/([A-Z])/g, "_$1")
194
                .replace(/^_/,'').toLowerCase();
195
                .replace(/^_/,'').toLowerCase();
195
        };
196
        }
196
197
197
        // Toggle request attributes in Illview
198
        // Toggle request attributes in Illview
198
        $('#toggle_requestattributes').click(function() {
199
        $('#toggle_requestattributes').click(function() {
Lines 238-244 Link Here
238
                    extra.forEach(function(thisExtra) {
239
                    extra.forEach(function(thisExtra) {
239
                        allCols[thisExtra] = 1;
240
                        allCols[thisExtra] = 1;
240
                    });
241
                    });
241
                };
242
                }
242
                // Different requests will have different columns,
243
                // Different requests will have different columns,
243
                // make sure they all have the same
244
                // make sure they all have the same
244
                $.each(dataCopy, function(k, row) {
245
                $.each(dataCopy, function(k, row) {
Lines 272-278 Link Here
272
                    ) {
273
                    ) {
273
                        colObj.render = specialCols[thisCol].func;
274
                        colObj.render = specialCols[thisCol].func;
274
                    } else {
275
                    } else {
275
                        colObj.data = thisCol
276
                        colObj.data = thisCol;
276
                    }
277
                    }
277
                    colData.push(colObj);
278
                    colData.push(colObj);
278
                });
279
                });
Lines 492-506 Link Here
492
                            <legend>Request details</legend>
493
                            <legend>Request details</legend>
493
                            <ol>
494
                            <ol>
494
                                <li class="borrowernumber">
495
                                <li class="borrowernumber">
495
                                    <label for="borrowernumber">Borrower number:</label>
496
                                    <label for="borrowernumber">Patron ID:</label>
496
                                    <input name="borrowernumber" id="borrowernumber" type="text" value="[% request.borrowernumber %]">
497
                                    <input name="borrowernumber" id="borrowernumber" type="text" value="[% request.borrowernumber %]">
497
                                </li>
498
                                </li>
498
                                <li class="biblio_id">
499
                                <li class="biblio_id">
499
                                    <label for="biblio_id" class="biblio_id">Biblio number:</label>
500
                                    <label for="biblio_id" class="biblio_id">Biblio ID:</label>
500
                                    <input name="biblio_id" id="biblio_id" type="text" value="[% request.biblio_id %]">
501
                                    <input name="biblio_id" id="biblio_id" type="text" value="[% request.biblio_id %]">
501
                                </li>
502
                                </li>
502
                                <li class="branchcode">
503
                                <li class="branchcode">
503
                                    <label for="branchcode" class="branchcode">Branch:</label>
504
                                    <label for="branchcode" class="branchcode">Library:</label>
504
                                    <select name="branchcode" id="branch">
505
                                    <select name="branchcode" id="branch">
505
                                        [% FOREACH branch IN branches %]
506
                                        [% FOREACH branch IN branches %]
506
                                            [% IF ( branch.branchcode == request.branchcode ) %]
507
                                            [% IF ( branch.branchcode == request.branchcode ) %]
Lines 522-528 Link Here
522
                                </li>
523
                                </li>
523
                                <li class="updated">
524
                                <li class="updated">
524
                                    <label class="updated">Last updated:</label>
525
                                    <label class="updated">Last updated:</label>
525
                                    [% request.updated %]
526
                                    [% request.updated | $KohaDates with_hours => 1 %]
526
                                </li>
527
                                </li>
527
                                <li class="medium">
528
                                <li class="medium">
528
                                    <label class="medium">Request type:</label>
529
                                    <label class="medium">Request type:</label>
Lines 530-536 Link Here
530
                                </li>
531
                                </li>
531
                                <li class="cost">
532
                                <li class="cost">
532
                                    <label class="cost">Cost:</label>
533
                                    <label class="cost">Cost:</label>
533
                                    [% request.cost %]
534
                                    [% request.cost || 'N/A' %]
534
                                </li>
535
                                </li>
535
                                <li class="req_id">
536
                                <li class="req_id">
536
                                    <label class="req_id">Request number:</label>
537
                                    <label class="req_id">Request number:</label>
Lines 597-603 Link Here
597
                                    [% request.orderid || "N/A" %]
598
                                    [% request.orderid || "N/A" %]
598
                                </div>
599
                                </div>
599
                                <div class="borrowernumber">
600
                                <div class="borrowernumber">
600
                                    <span class="label borrowernumber">Borrower:</span>
601
                                    <span class="label borrowernumber">Patron:</span>
601
                                    [% borrowerlink = "/cgi-bin/koha/members/moremember.pl" _ "?borrowernumber=" _ request.patron.borrowernumber %]
602
                                    [% borrowerlink = "/cgi-bin/koha/members/moremember.pl" _ "?borrowernumber=" _ request.patron.borrowernumber %]
602
                                    <a href="[% borrowerlink %]" title="View borrower details">
603
                                    <a href="[% borrowerlink %]" title="View borrower details">
603
                                    [% request.patron.firstname _ " " _ request.patron.surname _ " [" _ request.patron.cardnumber _ "]" %]
604
                                    [% request.patron.firstname _ " " _ request.patron.surname _ " [" _ request.patron.cardnumber _ "]" %]
Lines 605-615 Link Here
605
                                </div>
606
                                </div>
606
607
607
                                <div class="biblio_id">
608
                                <div class="biblio_id">
608
                                    <span class="label biblio_id">Biblio number:</span>
609
                                    <span class="label biblio_id">Biblio ID:</span>
609
                                    [% request.biblio_id || "N/A" %]
610
                                    [% request.biblio_id || "N/A" %]
610
                                </div>
611
                                </div>
611
                                <div class="branchcode">
612
                                <div class="branchcode">
612
                                    <span class="label branchcode">Branch:</span>
613
                                    <span class="label branchcode">Library:</span>
613
                                    [% Branches.GetName(request.branchcode) %]
614
                                    [% Branches.GetName(request.branchcode) %]
614
                                </div>
615
                                </div>
615
                                <div class="status">
616
                                <div class="status">
Lines 618-624 Link Here
618
                                </div>
619
                                </div>
619
                                <div class="updated">
620
                                <div class="updated">
620
                                    <span class="label updated">Last updated:</span>
621
                                    <span class="label updated">Last updated:</span>
621
                                    [% request.updated %]
622
                                    [% request.updated | $KohaDates with_hours => 1 %]
622
                                </div>
623
                                </div>
623
                                <div class="medium">
624
                                <div class="medium">
624
                                    <span class="label medium">Request type:</span>
625
                                    <span class="label medium">Request type:</span>
625
- 

Return to bug 7317