'status',
'updated',
'illrequest_id',
- 'action'
+ 'comments',
+ 'action' // Action should always be last
];
// Remove any fields we're ignoring
'</a>';
};
+ // Our 'render' function for biblio_id
+ var createBiblioLink = function(data, type, row) {
+ return (row.biblio_id) ?
+ '<a title="' + _("View biblio details") + '" ' +
+ 'href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=' +
+ row.biblio_id + '">' +
+ row.biblio_id +
+ '</a>' : '';
+ };
+
// Our 'render' function for the library name
var createLibrary = function(data, type, row) {
return row.library.branchname;
func: createStatus
},
biblio_id: {
- name: _("Bibliograpic Record ID")
+ name: _("Bibliograpic record ID"),
+ func: createBiblioLink
},
library: {
name: _("Library"),
}
};
+ // Toggle request attributes in Illview
+ $('#toggle_requestattributes').on('click', function(e) {
+ e.preventDefault();
+ $('#requestattributes').toggleClass('content_hidden');
+ });
+
+ // Toggle new comment form in Illview
+ $('#toggle_addcomment').on('click', function(e) {
+ e.preventDefault();
+ $('#addcomment').toggleClass('content_hidden');
+ });
+
// Filter partner list
$('#partner_filter').keyup(function() {
var needle = $('#partner_filter').val();
// Get our data from the API and process it prior to passing
// it to datatables
var ajax = $.ajax(
- '/api/v1/illrequests?embed=metadata,patron,capabilities,library'
+ '/api/v1/illrequests?embed=metadata,patron,capabilities,library,comments'
).done(function() {
var data = JSON.parse(ajax.responseText);
// Make a copy, we'll be removing columns next and need
[% IF query_type == 'create' %]
<h1>New ILL request</h1>
- [% IF whole.stage == 'copyrightclearance' %]
- <div>
- <p>
- [% Koha.Preference('ILLModuleCopyrightClearance') | $raw %]
- </p>
- <a href="?method=create&stage=copyrightclearance&backend=[% whole.value.backend | html %]"
- class="btn btn-sm btn-default btn-group"><i class="fa fa-check">Yes</i></a>
- <a href="/cgi-bin/koha/ill/ill-requests.pl"
- class="btn btn-sm btn-default btn-group"><i class="fa fa-times">No</i></a>
- </div>
- [% ELSE %]
- [% PROCESS $whole.template %]
- [% END %]
+ [% PROCESS $whole.template %]
[% ELSIF query_type == 'confirm' %]
<h1>Confirm ILL request</h1>
</fieldset>
<fieldset class="action">
<input type="submit" class="btn btn-default" value="Send email"/>
- <span><a href="[% ill_url | html %]" title="Return to request details">Cancel</a></span>
+ <span><a href="[% ill_url | uri %]" title="Return to request details">Cancel</a></span>
</fieldset>
</form>
[% ELSE %]
<legend>Interlibrary loan request details</legend>
<p>No partners have been defined yet. Please create appropriate patron records (by default ILLLIBS category).</p>
<p>Be sure to provide email addresses for these patrons.</p>
- <p><span><a href="[% ill_url | html %]" title="Return to request details">Cancel</a></span></p>
+ <p><span><a href="[% ill_url | uri %]" title="Return to request details">Cancel</a></span></p>
</fieldset>
[% END %]
<!-- generic_confirm ends here -->
<ol>
<li class="borrowernumber">
<label for="borrowernumber">Patron ID:</label>
- <input name="borrowernumber" id="borrowernumber" type="text" value="[% request.borrowernumber | html %]">
+ [% request.borrowernumber | html %]
</li>
<li class="biblio_id">
- <label for="biblio_id" class="biblio_id">Bibliographic Record ID:</label>
+ <label for="biblio_id" class="biblio_id">Bibliographic record ID:</label>
<input name="biblio_id" id="biblio_id" type="text" value="[% request.biblio_id | html %]">
</li>
<li class="branchcode">
</li>
<li class="status">
<label class="status">Status:</label>
- [% stat = request.status | html %]
+ [% stat = request.status %]
[% request.capabilities.$stat.name | html %]
</li>
<li class="updated">
</li>
<li class="cost">
<label class="cost">Cost:</label>
- [% request.cost || 'N/A' | html %]
+ [% IF request.cost %][% request.cost | html %][% ELSE %]<span>N/A</span>[% END %]
+ </li>
+ <li class="price_paid">
+ <label class="price_paid">Price paid:</label>
+ <input name="price_paid" id="price_paid" type="text" value="[% request.price_paid | html %]">
</li>
<li class="req_id">
<label class="req_id">Request number:</label>
<input type="hidden" value="edit_action" name="method">
<input type="hidden" value="form" name="stage">
<input type="hidden" value="[% request.illrequest_id | html %]" name="illrequest_id">
+ <input type="hidden" value="[% request.borrowernumber | html %]" name="borrowernumber">
<input type="submit" value="Submit">
<a class="cancel" href="/cgi-bin/koha/ill/ill-requests.pl?method=illview&illrequest_id=[% request.id | html %]">Cancel</a>
</fieldset>
</div>
[% ELSIF query_type == 'illview' %]
- [% actions = request.available_actions | html %]
- [% capabilities = request.capabilities | html %]
- [% req_status = request.status | html %]
+ [% req_status = request.status %]
<h1>Manage ILL request</h1>
<div id="toolbar" class="btn-toolbar">
<a title="Edit request" id="ill-toolbar-btn-edit-action" class="btn btn-sm btn-default" href="/cgi-bin/koha/ill/ill-requests.pl?method=edit_action&illrequest_id=[% request.illrequest_id | html %]">
<span class="fa fa-pencil"></span>
Edit request
</a>
- [% FOREACH action IN actions %]
+ [% FOREACH action IN request.available_actions %]
[% IF action.method != 0 %]
<a title="[% action.ui_method_name | html %]" id="ill-toolbar-btn-[% action.id | lower | html %]" class="btn btn-sm btn-default" href="/cgi-bin/koha/ill/ill-requests.pl?method=[% action.method | html %]&illrequest_id=[% request.illrequest_id | html %]">
<span class="fa [% action.ui_method_icon | html %]"></span>
<div class="rows">
<div class="orderid">
<span class="label orderid">Order ID:</span>
- [% request.orderid || "N/A" | html %]
+ [% IF request.orderid %][% request.orderid | html %][% ELSE %]<span>N/A</span>[% END %]
</div>
<div class="borrowernumber">
<span class="label borrowernumber">Patron:</span>
[% borrowerlink = "/cgi-bin/koha/members/moremember.pl" _ "?borrowernumber=" _ request.patron.borrowernumber %]
- <a href="[% borrowerlink | html %]" title="View borrower details">
+ <a href="[% borrowerlink | uri %]" title="View borrower details">
[% request.patron.firstname _ " " _ request.patron.surname _ " [" _ request.patron.cardnumber _ "]" | html %]
</a>
</div>
<div class="biblio_id">
<span class="label biblio_id">Bibliographic record ID:</span>
- [% request.biblio_id || "N/A" | html %]
+ [% IF request.biblio_id %]
+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% request.biblio_id | uri %]">[% request.biblio_id | html %]</a>
+ [% ELSE %]
+ <span>N/A</span>
+ [% END %]
</div>
<div class="branchcode">
<span class="label branchcode">Library:</span>
</div>
<div class="status">
<span class="label status">Status:</span>
- [% capabilities.$req_status.name | html %]
+ [% request.capabilities.$req_status.name | html %]
</div>
<div class="updated">
<span class="label updated">Last updated:</span>
</div>
<div class="cost">
<span class="label cost">Cost:</span>
- [% request.cost || "N/A" | html %]
+ [% IF request.cost %][% request.cost | html %][% ELSE %]<span>N/A</span>[% END %]
+ </div>
+ <div class="price_paid">
+ <span class="label price_paid">Price paid:</span>
+ [% IF request.price_paid %][% request.price_paid | html %][% ELSE %]<span>N/A</span>[% END %]
</div>
<div class="req_id">
<span class="label req_id">Request number:</span>
<div class="rows">
<h4>Details from supplier ([% request.backend | html %])</h4>
[% FOREACH meta IN request.metadata %]
- <div class="requestmeta-[% meta.key | html %]">
+ <div class="requestmeta-[% meta.key.replace('\s','_') | html %]">
<span class="label">[% meta.key | html %]:</span>
[% meta.value | html %]
</div>
</div>
</div>
+ <div id="ill-view-panel" class="panel panel-default">
+ <div class="panel-heading">
+ <h3>[% request.illcomments.count | html %] comments</h3>
+ </div>
+ <div class="panel-body">
+ [% IF request.illcomments.count && request.illcomments.count > 0 %]
+ [% FOREACH comment IN request.illcomments %]
+ <div class="rows comment_[% comment.patron.categorycode | html %]">
+ <h5>Comment by:
+ <a href="[% borrowerlink | html %]" title="View borrower details">
+ [% comment.patron.firstname _ " " _ comment.patron.surname _ " [" _ comment.patron.cardnumber _ "]" | html %]</a>
+ [% comment.timestamp | $KohaDates with_hours => 1 %]</h5>
+ <p>[% comment.comment | html %]</p>
+ </div>
+ [% END %]
+ [% END %]
+ <div class="rows">
+ <h3><a id="toggle_addcomment" href="#">Add comment</a></h3>
+ <div id="addcomment" class="content_hidden">
+ <form class="validated" method="post" action="/cgi-bin/koha/ill/ill-requests.pl">
+ <input type="hidden" value="save_comment" name="method">
+ <input type="hidden" value="[% csrf_token | html %]" name="csrf_token">
+ <input type="hidden" value="[% request.illrequest_id | html %]" name="illrequest_id">
+ <fieldset class="rows">
+ <ol>
+ <li>
+ <label class="required" for="comment">Comment: </label>
+ <textarea type="text" class="required" required="required" value="" cols="80" rows="10" id="comment" name="comment"></textarea>
+ <span class="required">Required</span>
+ </li>
+ </ol>
+ </fieldset>
+ <fieldset class="action">
+ <input type="submit" value="Submit">
+ </fieldset>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
[% ELSIF query_type == 'illlist' %]
<!-- illlist -->
<h1>View ILL requests</h1>
<th>Author</th>
<th>Title</th>
<th>Patron</th>
- <th>Bibliographic Record ID</th>
+ <th>Bibliographic record ID</th>
<th>Library</th>
<th>Status</th>
<th>Updated on</th>
<th>Request number</th>
+ <th>Comments</th>
<th class="actions"></th>
</tr>
</thead>
</div>
[% ELSE %]
<!-- Custom Backend Action -->
- [% INCLUDE $whole.template %]
+ [% PROCESS $whole.template %]
[% END %]
[% END %]
projects / koha.git / blobdiff