Lines 48-53
Link Here
|
48 |
'biblio_id', |
48 |
'biblio_id', |
49 |
'library', |
49 |
'library', |
50 |
'status', |
50 |
'status', |
|
|
51 |
'additional_status', |
51 |
'updated', |
52 |
'updated', |
52 |
'illrequest_id', |
53 |
'illrequest_id', |
53 |
'action' |
54 |
'action' |
Lines 157-162
Link Here
|
157 |
} |
158 |
} |
158 |
}; |
159 |
}; |
159 |
|
160 |
|
|
|
161 |
// Render function for additional status |
162 |
var createAdditional = function(data, type, row) { |
163 |
return ( |
164 |
row.hasOwnProperty('requested_partners') && |
165 |
row.requested_partners && |
166 |
row.requested_partners.length > 0 |
167 |
) ? |
168 |
"Requested from:<br>" + |
169 |
row.requested_partners.replace('; ','<br>') : |
170 |
''; |
171 |
}; |
172 |
|
160 |
// Render function for creating a row's action link |
173 |
// Render function for creating a row's action link |
161 |
var createActionLink = function(data, type, row) { |
174 |
var createActionLink = function(data, type, row) { |
162 |
return '<a class="btn btn-default btn-sm" ' + |
175 |
return '<a class="btn btn-default btn-sm" ' + |
Lines 184-189
Link Here
|
184 |
name: _("Status"), |
197 |
name: _("Status"), |
185 |
func: createStatus |
198 |
func: createStatus |
186 |
}, |
199 |
}, |
|
|
200 |
additional_status: { |
201 |
name: _("Additional status"), |
202 |
func: createAdditional |
203 |
}, |
187 |
biblio_id: { |
204 |
biblio_id: { |
188 |
name: _("Biblio ID") |
205 |
name: _("Biblio ID") |
189 |
}, |
206 |
}, |
Lines 219-225
Link Here
|
219 |
// Get our data from the API and process it prior to passing |
236 |
// Get our data from the API and process it prior to passing |
220 |
// it to datatables |
237 |
// it to datatables |
221 |
var ajax = $.ajax( |
238 |
var ajax = $.ajax( |
222 |
'/api/v1/illrequests?embed=metadata,patron,capabilities,library' |
239 |
'/api/v1/illrequests?embed=requested_partners,metadata,patron,capabilities,library' |
223 |
).done(function() { |
240 |
).done(function() { |
224 |
var data = JSON.parse(ajax.responseText); |
241 |
var data = JSON.parse(ajax.responseText); |
225 |
// Make a copy, we'll be removing columns next and need |
242 |
// Make a copy, we'll be removing columns next and need |
Lines 264-270
Link Here
|
264 |
'bSearchable': false |
281 |
'bSearchable': false |
265 |
}, |
282 |
}, |
266 |
], |
283 |
], |
267 |
'aaSorting': [[ 6, 'desc' ]], // Default sort, updated descending |
284 |
'aaSorting': [[ 7, 'desc' ]], // Default sort, updated descending |
268 |
'processing': true, // Display a message when manipulating |
285 |
'processing': true, // Display a message when manipulating |
269 |
'iDisplayLength': 10, // 10 results per page |
286 |
'iDisplayLength': 10, // 10 results per page |
270 |
'sPaginationType': "full_numbers", // Pagination display |
287 |
'sPaginationType': "full_numbers", // Pagination display |
Lines 527-532
Link Here
|
527 |
<div class="status"> |
544 |
<div class="status"> |
528 |
<span class="label status">Status:</span> |
545 |
<span class="label status">Status:</span> |
529 |
[% capabilities.$req_status.name %] |
546 |
[% capabilities.$req_status.name %] |
|
|
547 |
[% IF request.requested_partners.length > 0 %] |
548 |
([% request.requested_partners %]) |
549 |
[% END %] |
550 |
|
530 |
</div> |
551 |
</div> |
531 |
<div class="updated"> |
552 |
<div class="updated"> |
532 |
<span class="label updated">Last updated:</span> |
553 |
<span class="label updated">Last updated:</span> |
Lines 592-597
Link Here
|
592 |
<th>Biblio ID</th> |
613 |
<th>Biblio ID</th> |
593 |
<th>Library</th> |
614 |
<th>Library</th> |
594 |
<th>Status</th> |
615 |
<th>Status</th> |
|
|
616 |
<th>Additional status</th> |
595 |
<th>Updated on</th> |
617 |
<th>Updated on</th> |
596 |
<th>Request number</th> |
618 |
<th>Request number</th> |
597 |
<th class="actions"></th> |
619 |
<th class="actions"></th> |
598 |
- |
|
|