Owen Leonard
7fba4e3ef8
This patch removes instances of dt_add_type_uk_date() from acquisitions templates and updates sorting configurations according to current guidelines. In cases where a formatted date was passed from a Perl script, the script has been modified to pass an unformatted date. Several instances of the no longer valid align attribute have been removed from <td> tags in favor of an existing "data" class which is suitable for display of currency values. To test, view the following pages in Acquisitions. Columns containing dates should sort correctly regardless of dateformat system preference setting. Columns containing bibliographic titles should ignore articles when sorting. - Add to an order from a staged file: The table of staged files should sort correctly. After clicking "add orders" for one of the staged files, the table of titles in that staged file should also be sorted correctly. - Add to an order from a subscription. The table of subscription search results should sort correctly. - Orders search results should sort correctly. - Late orders should sort correctly. - Search for a vendor. Click on the vendor name to view the vendor detail page. The table of contracts on this page should sort correctly. - From the Acquisitions home page click a number in the "spent" column of the table of available funds. The table of orders should sort correctly. - From the Acquisitions home page click a number in the "ordered" column of the table of available funds. The table of orders should sort correctly. - From a vendor detail page, click the "Receive shipments" button. On the receive shipments page the table of shipments should be sorted correctly. Signed-off-by: David Cook <dcook@prosentient.com.au> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
212 lines
9.6 KiB
Text
212 lines
9.6 KiB
Text
[% USE KohaDates %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Koha › Acquisitions › [% IF ( order_loop ) %]Orders search › Search results[% ELSE %]Order search[% END %]</title>
|
|
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
[% INCLUDE 'calendar.inc' %]
|
|
[% INCLUDE 'datatables.inc' %]
|
|
<script type="text/javascript">
|
|
//<![CDATA[
|
|
$(document).ready(function() {
|
|
$("#histsearcht").dataTable($.extend(true, {}, dataTablesDefaults, {
|
|
"aoColumnDefs": [
|
|
{ "sType": "anti-the", "aTargets" : [ "anti-the" ] },
|
|
{ "sType": "title-string", "aTargets" : [ "title-string" ] }
|
|
],
|
|
"sPaginationType": "four_button"
|
|
} ) );
|
|
});
|
|
//]]>
|
|
</script>
|
|
</head>
|
|
<body id="acq_histsearch" class="acq">
|
|
[% INCLUDE 'header.inc' %]
|
|
[% INCLUDE 'acquisitions-search.inc' %]
|
|
|
|
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › [% IF ( order_loop ) %]<a href="/cgi-bin/koha/acqui/histsearch.pl">Orders search</a> › Search results[% ELSE %]Order search[% END %]</div>
|
|
|
|
<div id="doc3" class="yui-t2">
|
|
|
|
<div id="bd">
|
|
<div id="yui-main">
|
|
<div class="yui-b">
|
|
|
|
[% UNLESS ( order_loop ) %]<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
|
|
<fieldset class="rows">
|
|
<legend>Search orders</legend>
|
|
<ol>
|
|
<li><label for="title">Title: </label> <input type="text" name="title" id="title" value="[% title %]" /></li>
|
|
<li><label for="author">Author: </label> <input type="text" name="author" id="author" value="[% author %]" /></li>
|
|
<li><label for="isbn">ISBN: </label> <input type="text" name="isbn" id="isbn" value="[% isbn %]" /></li>
|
|
[% IF (UNIMARC) %]
|
|
<li><label for="ean">EAN: </label> <input type="text" name="ean" id="ean" value="[% ean %]" /></li>
|
|
[% END %]
|
|
<li><label for="name">Vendor: </label> <input type="text" name="name" id="name" value="[% name %]" /></li>
|
|
<li><label for="basket">Basket: </label> <input type="text" name="basket" id="basket" value="[% basket %]" /></li>
|
|
<li><label for="booksellerinvoicenumber ">Bookseller invoice no: </label> <input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" value="[% booksellerinvoicenumber %]" /></li>
|
|
<li>
|
|
<label for="basketgroupname">Basket group:</label>
|
|
<input type="text" name="basketgroupname" id="basketgroupname" value="[% basketgroupname %]" />
|
|
</li>
|
|
<li>
|
|
<label for="ordernumber">Order line:</label>
|
|
<input type="text" name="ordernumber" id="ordernumber" value="[% ordernumber %]" />
|
|
[% IF search_children_too %]
|
|
<input type="checkbox" name="search_children_too" id="search_children_too" value="1" checked="checked" />
|
|
[% ELSE %]
|
|
<input type="checkbox" name="search_children_too" id="search_children_too" value="1" />
|
|
[% END %]
|
|
<label class="yesno" for="search_children_too">Display children too.</label>
|
|
</li>
|
|
|
|
<li>
|
|
<label for="orderstatus">Order status: </label>
|
|
<select name="orderstatus" id="orderstatus">
|
|
[% IF orderstatus == "" %]
|
|
<option value="">Any status except cancelled</option>
|
|
[% ELSE %]
|
|
<option value="" selected="selected"></option>
|
|
[% END %]
|
|
[% IF orderstatus == "new" %]
|
|
<option value="new" selected="selected">New</option>
|
|
[% ELSE %]
|
|
<option value="new">New</option>
|
|
[% END %]
|
|
[% IF orderstatus == "ordered" %]
|
|
<option value="ordered" selected="selected">Pending</option>
|
|
[% ELSE %]
|
|
<option value="ordered">Pending</option>
|
|
[% END %]
|
|
[% IF orderstatus == "partial" %]
|
|
<option value="partial" selected="selected">Partially received</option>
|
|
[% ELSE %]
|
|
<option value="partial">Partially received</option>
|
|
[% END %]
|
|
[% IF orderstatus == "complete" %]
|
|
<option value="complete" selected="selected">Received</option>
|
|
[% ELSE %]
|
|
<option value="complete">Received</option>
|
|
[% END %]
|
|
[% IF orderstatus == "cancelled" %]
|
|
<option value="cancelled" selected="selected">Cancelled</option>
|
|
[% ELSE %]
|
|
<option value="cancelled">Cancelled</option>
|
|
[% END %]
|
|
</select>
|
|
</li>
|
|
<li>
|
|
<label for="fund">Fund: </label>
|
|
<select name="budget" id="fund">
|
|
<option value="">All funds</option>
|
|
[% FOREACH bp_loo IN bp_loop %]
|
|
<optgroup label="[% bp_loo.budget_period_description %]">
|
|
[% FOREACH h_loo IN bp_loo.hierarchy %]
|
|
[% IF h_loo.budget_id == budget_id %]
|
|
<option type="text" value="[% h_loo.budget_id %]" branchcode="[% h_loo.budget_branchcode %]" selected="selected">
|
|
[% ELSE %]
|
|
<option type="text" value="[% h_loo.budget_id %]" branchcode="[% h_loo.budget_branchcode %]">
|
|
[% END %]
|
|
[% h_loo.budget_display_name %]
|
|
</option>
|
|
[% END %]
|
|
</optgroup>
|
|
[% END %]
|
|
</select>
|
|
</li>
|
|
|
|
<li><label for="from">From: </label>
|
|
<input type="text" size="10" id="from" name="from" value="[% from_placed_on %]" class="datepickerfrom" />
|
|
<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
|
|
</li>
|
|
<li><label for="to">To: </label>
|
|
<input type="text" size="10" id="to" name="to" value="[% to_placed_on %]" class="datepickerto" />
|
|
<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
|
|
</li>
|
|
</ol>
|
|
</fieldset>
|
|
<input type="hidden" name="do_search" value="1" />
|
|
<fieldset class="action"><input type="submit" value="Search" /></fieldset>
|
|
</form>[% END %]
|
|
[% IF ( order_loop ) %]<h1>Search results</h1>
|
|
<div id="acqui_histsearch">
|
|
<table id="histsearcht">
|
|
<thead>
|
|
<tr>
|
|
<th>Order line (parent)</th>
|
|
<th>Status</th>
|
|
<th>Basket</th>
|
|
<th>Basket group</th>
|
|
<th>Invoice number</th>
|
|
<th class="anti-the">Summary</th>
|
|
<th>Vendor</th>
|
|
<th class="title-string">Placed on</th>
|
|
<th class="title-string">Received on</th>
|
|
<th>Quantity received</th>
|
|
<th>Pending order</th>
|
|
<th>Unit cost</th>
|
|
<th>Fund</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH order IN order_loop %]
|
|
<tr>
|
|
<td>
|
|
[% order.ordernumber %]
|
|
[% IF order.ordernumber != order.parent_ordernumber %]([% order.parent_ordernumber %])[% END %]
|
|
</td>
|
|
<td>
|
|
[% SWITCH order.orderstatus %]
|
|
[% CASE 'new' %]New
|
|
[% CASE 'ordered' %]Pending
|
|
[% CASE 'partial' %]Partially received
|
|
[% CASE 'complete' %]Received
|
|
[% CASE 'cancelled' %]Cancelled
|
|
[% END %]
|
|
</td>
|
|
<td>[% order.basketname %] (<a href="basket.pl?basketno=[% order.basketno %]">[% order.basketno %]</a>)</td>
|
|
<td>
|
|
[% IF ( order.basketgroupid ) %]
|
|
[% order.groupname %] (<a href="basketgroup.pl?booksellerid=[% order.id %]">[% order.basketgroupid %]</a>)
|
|
[% ELSE %]
|
|
|
|
[% END %]
|
|
</td>
|
|
<td>[% IF ( order.invoicenumber ) %]
|
|
<a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% order.invoiceid %]">[% order.invoicenumber %]</a>
|
|
[% ELSE %]
|
|
|
|
[% END %]
|
|
</td>
|
|
<td>
|
|
<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">[% order.title |html %]</a>
|
|
<br />[% order.author %] <br /> [% order.isbn %]
|
|
</td>
|
|
<td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.id %]">[% order.name %]</a></td>
|
|
<td><span title="[% order.creationdate %]">[% order.creationdate | $KohaDates %]</span></td>
|
|
<td>
|
|
[% IF order.datereceived %]
|
|
<span title="[% order.datereceived %]">[% order.datereceived | $KohaDates %]</span>
|
|
[% ELSE %]
|
|
<span title="0000-00-00"></span>
|
|
[% END %]
|
|
</td>
|
|
<td>[% order.quantityreceived %]</td>
|
|
<td>[% order.quantity %]</td>
|
|
<td>[% order.ecost %]</td>
|
|
<td>[% order.budget_name %]</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
[% ELSIF search_done %]
|
|
There is no order for this search.
|
|
[% END %]
|
|
|
|
</div>
|
|
</div>
|
|
<div class="yui-b">
|
|
[% INCLUDE 'acquisitions-menu.inc' %]
|
|
</div>
|
|
</div>
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|