Kyle M Hall
54e1ae7ed3
For libraries with large numbers of records, using a file of barcodes in the inventory tool without selecting filters to limit the catalog selection to compare against can result in an error of "could not read headers" or a page timeout. When you upload a file of barcodes, and do not specify any filters on the rest of the form, it effectively runs GetItemsForInventory() such that *every* item in the database is returned. On a large enough database, this takes so long that the script times out. The current documentation in the manual implies that if you upload a file of barcodes, the *only* thing it does is set the date-last-seen field. This is not entirely true; it also tries to compare the list of scanned items to what is expected to be seen in the list of items. The work-around for libraries with a large number of item records is to, when uploading a file of barcodes, to also set the filters (e.g., library, shelving location, call number range, etc.) to specify the range of items that the file of barcodes corresponds to. This patch adds a warning when a librarian attempts to upload a barcode list file for comparison without selecting any filters to limit the catalog selection. Test Plan: 1) Apply this patch 2) Browse to the inventory tool 3) Click the "Choose File" button, select a file 4) Click the "Submit" button 5) You should see a warning message 6) Click "Cancel" 7) Select one of more filters 8) Click the "Submit" button 9) This time the script should proceed without triggering the warning. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Work as described following test plan. No errors Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
301 lines
12 KiB
Text
301 lines
12 KiB
Text
[% USE KohaDates %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Koha › Tools › Inventory</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
|
|
[% INCLUDE 'datatables.inc' %]
|
|
[% INCLUDE 'calendar.inc' %]
|
|
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
|
|
<script type="text/javascript">
|
|
//<![CDATA[
|
|
function checkForm() {
|
|
if ( $('#uploadbarcodes').val() ) {
|
|
if ( !(
|
|
$('#branchloop').val() ||
|
|
$('#locationloop').val() ||
|
|
$('#minlocation').val() ||
|
|
$('#maxlocation').val() ||
|
|
$('#statuses input:checked').length
|
|
) ) {
|
|
return confirm(
|
|
_("You have not selected any catalog filters and are about to compare a file of barcodes to your entire catalog.") + "\n\n" +
|
|
_("For large catalogs this can result in unexpected behavior") + "\n\n" +
|
|
_("Are you sure you want to do this?")
|
|
);
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
$(document).ready(function(){
|
|
inventorydt = $('#inventoryt').dataTable($.extend(true, {}, dataTablesDefaults, {
|
|
'sPaginationType': 'full_numbers',
|
|
[% IF compareinv2barcd %]
|
|
"aoColumnDefs": [ { "bSortable": false, "aTargets": [ 1 ] } ]
|
|
[% ELSE %]
|
|
"aoColumnDefs": [ { "bSortable": false, "aTargets": [ 0 ] } ]
|
|
[% END %]
|
|
} ));
|
|
|
|
|
|
$("#continuewithoutmarkingbutton").click(function(){
|
|
inventorydt.fnPageChange( 'next' );
|
|
return false;
|
|
});
|
|
|
|
$("#markseenandcontinuebutton").click(function(){
|
|
var param = '';
|
|
$("input:checked").each(function() {
|
|
param += "|" + $(this).attr('name');
|
|
});
|
|
$.post('/cgi-bin/koha/tools/ajax-inventory.pl', { seen: param });
|
|
inventorydt.fnPageChange( 'next' );
|
|
return false;
|
|
});
|
|
|
|
$("#markseenandquit").click(function(){
|
|
var param = '';
|
|
$("input:checked").each(function() {
|
|
param += "|" + $(this).attr('name');
|
|
});
|
|
$.ajax({
|
|
type: 'POST',
|
|
url: '/cgi-bin/koha/tools/ajax-inventory.pl',
|
|
data: { seen: param},
|
|
async: false
|
|
});
|
|
document.location.href = '/cgi-bin/koha/tools/inventory.pl';
|
|
return false;
|
|
});
|
|
|
|
|
|
$(".checkall").click(function(){
|
|
$(".checkboxed").checkCheckboxes();
|
|
return false;
|
|
});
|
|
$(".clearall").click(function(){
|
|
$(".checkboxed").unCheckCheckboxes();
|
|
return false;
|
|
});
|
|
});
|
|
//]]>
|
|
</script>
|
|
</head>
|
|
<body id="tools_inventory" class="tools">
|
|
[% INCLUDE 'header.inc' %]
|
|
[% INCLUDE 'cat-search.inc' %]
|
|
|
|
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> › [% IF (loop) %]<a href="/cgi-bin/koha/tools/inventory.pl">Inventory</a> › Results[% ELSE %]Inventory[% END %]</div>
|
|
|
|
<div id="doc3" class="yui-t2">
|
|
|
|
<div id="bd">
|
|
<div id="yui-main">
|
|
<div class="yui-b">
|
|
<h1>Inventory/Stocktaking</h1>
|
|
[% IF (moddatecount) %]<div class="dialog message">[% moddatecount %] items modified : datelastseen set to [% date | $KohaDates %]</div>[% END %]
|
|
[% IF (errorfile) %]<div class="dialog alert">[% errorfile %] can't be opened</div>[% END %]
|
|
[% FOREACH error IN errorloop %]
|
|
<div class="dialog alert">
|
|
[% error.barcode %]
|
|
[% IF (error.ERR_BARCODE) %]: barcode not found[% END %]
|
|
[% IF (error.ERR_WTHDRAWN) %]: item withdrawn[% END %]
|
|
[% IF (error.ERR_ONLOAN_RET) %]: item was on loan. It was returned before marked as seen[% END %]
|
|
[% IF (error.ERR_ONLOAN_NOT_RET) %]: item was on loan. couldn't be returned.[% END %]
|
|
</div>
|
|
[% END %]
|
|
[% UNLESS op %]
|
|
<div class="yui-g">
|
|
<form method="post" action="/cgi-bin/koha/tools/inventory.pl" enctype="multipart/form-data" onsubmit="return checkForm()">
|
|
<fieldset class="rows">
|
|
<legend>Use a barcode file</legend>
|
|
<ol>
|
|
<li><label for="uploadbarcodes">Barcode file: </label> <input type="file" id="uploadbarcodes" name="uploadbarcodes" /></li>
|
|
<li><label for="setdate">Set inventory date to:</label> <input type="text" id="setdate" name="setdate" value="[% today | $KohaDates %]" class="datepickerfrom" />
|
|
</li>
|
|
</ol>
|
|
</fieldset>
|
|
|
|
<fieldset class="rows">
|
|
<legend>Select items you want to check</legend>
|
|
<ol><li>
|
|
<label for="branch">Library: </label>
|
|
<input type="radio" name="branch" value="homebranch"> Home library</input>
|
|
<input type="radio" name="branch" value="holdingbranch"> Current library</input>
|
|
</li><li>
|
|
<label for="branchloop">Library: </label><select id="branchloop" name="branchcode" style="width:12em;">
|
|
<option value="">All libraries</option>
|
|
[% FOREACH branchloo IN branchloop %]
|
|
[% IF ( branchloo.selected ) %]
|
|
<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>
|
|
[% ELSE %]
|
|
<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>
|
|
[% END %]
|
|
[% END %]
|
|
</select>
|
|
</li>
|
|
[% IF (authorised_values) %]
|
|
<li>
|
|
<label for="locationloop">Shelving location (items.location) is: </label>
|
|
<select id="locationloop" name="location">
|
|
<option value="">Filter location</option>
|
|
[% FOREACH value IN authorised_values %]
|
|
[% IF (value.selected) %]
|
|
<option value="[% value.authorised_value %]" selected="selected">[% value.lib %]</option>
|
|
[% ELSE %]
|
|
<option value="[% value.authorised_value %]">[% value.lib %]</option>
|
|
[% END %]
|
|
[% END %]
|
|
</select> </li>
|
|
[% END %]
|
|
<li>
|
|
<label for="minlocation">Item callnumber between: </label>
|
|
<input type="text" name="minlocation" id="minlocation" value="[% minlocation %]" /> (items.itemcallnumber) </li>
|
|
<li><label for="maxlocation">...and: </label>
|
|
<input type="text" name="maxlocation" id="maxlocation" value="[% maxlocation %]" />
|
|
</li>
|
|
[% IF (statuses) %]
|
|
</ol>
|
|
</fieldset>
|
|
<fieldset class="rows">
|
|
<legend>Item statuses</legend>
|
|
<div id="statuses" style="display: block;">
|
|
[% FOREACH status IN statuses %]
|
|
[% IF (status.values) %]
|
|
<fieldset style="float: left; padding: 5px; margin: 5px;text-align:right">
|
|
<legend>[% status.fieldname %]</legend>
|
|
<ul id="statuses-[% fieldname %]" style="display: inline;">
|
|
[% FOREACH value IN status.values %]
|
|
[% IF (value.lib) %]<li>
|
|
<label for="[% value.id %]">
|
|
[% value.lib %]
|
|
</label>
|
|
<input type="checkbox" name="status-[% status.fieldname %]-[% value.authorised_value %]" id="[% value.authorised_value %]" />
|
|
</li>[% END %]
|
|
[% END %]
|
|
</ul>
|
|
</fieldset>
|
|
[% END %]
|
|
[% END %]
|
|
</div>
|
|
</fieldset>
|
|
<fieldset class="rows">
|
|
<ol>
|
|
[% END %]
|
|
|
|
<li><label for="datelastseen">Inventory date:</label>
|
|
<input type="text" id="datelastseen" name="datelastseen" value="[% datelastseen | $KohaDates %]" class="datepickerfrom" />
|
|
</li>
|
|
<li><label for="ignoreissued">Skip items on loan: </label>
|
|
[% IF (ignoreissued) %]
|
|
<input type="checkbox" id="ignoreissued" name="ignoreissued" checked="checked" /></li>
|
|
[% ELSE %]
|
|
<input type="checkbox" id="ignoreissued" name="ignoreissued" /></li>
|
|
[% END %]
|
|
<li>
|
|
<label for="CSVexport">Export to CSV file: </label>
|
|
<input type="checkbox" name="CSVexport" id="CSVexport" />
|
|
</li>
|
|
<li>
|
|
<label for="compareinv2barcd">Compare barcodes list to results: </label>
|
|
<input type="checkbox" name="compareinv2barcd" id="compareinv2barcd" />
|
|
</li>
|
|
</ol>
|
|
</fieldset>
|
|
<input type="hidden" name="op" value="do_it" />
|
|
|
|
<fieldset class="action"><input type="submit" value="Submit" class="button" /></fieldset>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
[% END %]
|
|
[% IF (op) %]
|
|
<form method="post" action="/cgi-bin/koha/tools/inventory.pl" class="checkboxed">
|
|
<input type="hidden" name="markseen" value="1" />
|
|
<input type="hidden" name="minlocation" value="[% minlocation %]" />
|
|
<input type="hidden" name="maxlocation" value="[% maxlocation %]" />
|
|
<input type="hidden" name="location" value="[% location %]" />
|
|
<input type="hidden" name="branchcode" value="[% branchcode %]" />
|
|
<input type="hidden" name="datelastseen" value="[% datelastseen %]" />
|
|
|
|
[% UNLESS compareinv2barcd %]
|
|
<div><a href="#" class="checkall">[Select all]</a> <a href="#" class="clearall">[Clear all]</a></div>
|
|
[% END %]
|
|
|
|
<table id="inventoryt">
|
|
<thead>
|
|
<tr>
|
|
[% UNLESS compareinv2barcd %]<th>Seen</th>[% END %]
|
|
<th>Barcode</th>
|
|
<th>Library</th>
|
|
<th>Title</th>
|
|
<th>Status</th>
|
|
<th>Lost</th>
|
|
<th>Damaged</th>
|
|
<th>Unseen since</th>
|
|
<th>Problems</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH result IN loop %]
|
|
<tr>
|
|
[% UNLESS compareinv2barcd %]
|
|
<td>
|
|
<input type="checkbox" name="SEEN-[% result.itemnumber %]" value="1" />
|
|
</td>
|
|
[% END %]
|
|
<td>
|
|
[% result.barcode | html %]
|
|
</td>
|
|
<td>
|
|
[% result.homebranch | html %] [% result.location | html %] [[% result.itemcallnumber | html %]]
|
|
</td>
|
|
<td>
|
|
<p><a href="#" onclick="window.open('/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% result.biblionumber %]','marcview','width=800,height=600,toolbar=0,scrollbars=1');">[% result.title | html %]</a></p><p>[% result.author | html %]</p>
|
|
</td>
|
|
<td>
|
|
[% result.notforloan | html %]
|
|
</td>
|
|
<td>
|
|
[% result.itemlost | html %]
|
|
</td>
|
|
<td>
|
|
[% result.damaged | html %]
|
|
</td>
|
|
<td>
|
|
[% result.datelastseen | $KohaDates | html %]
|
|
</td>
|
|
<td>
|
|
[% IF result.problem == 'wrongplace' %]
|
|
<p>Item should not have been scanned</p>
|
|
[% ELSIF result.problem == 'missingitem' %]
|
|
<p>Item missing</p>
|
|
[% ELSIF result.problem == 'changestatus' %]
|
|
<p>Change item status</p>
|
|
[% ELSIF result.problem == 'not_scanned' %]
|
|
<p>Item should have been scanned</p>
|
|
[% END %]
|
|
</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table>
|
|
<div class="spacer"></div>
|
|
[% UNLESS compareinv2barcd %]
|
|
<div style="padding : .3em 0"><a href="#" class="checkall">[Select all]</a> <a href="#" class="clearall">[Clear all]</a></div>
|
|
<input type="submit" id="markseenandquit" value="Mark seen and quit" />
|
|
<input type="submit" value="Mark Seen and Continue >>" id="markseenandcontinuebutton" />
|
|
<input type="submit" value="Continue without Marking >>" id="continuewithoutmarkingbutton" class="submit" />
|
|
[% END %]
|
|
</form>
|
|
|
|
</div>
|
|
|
|
[% END %]
|
|
</div>
|
|
<div class="yui-b">
|
|
[% INCLUDE 'tools-menu.inc' %]
|
|
</div>
|
|
</div>
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|