Attachment #21971 for bug #7684

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




    my $dbh = C4::Context->dbh;
    my ( @bind_params, @where_strings );

    my $select_columns = q{
        SELECT items.itemnumber, barcode, itemcallnumber, title, author, biblio.biblionumber, biblio.frameworkcode, datelastseen, homebranch, location, notforloan, damaged, itemlost, stocknumber
    };
    my $select_count = q{SELECT COUNT(*)};
    my $query = q{
        FROM items
        LEFT JOIN biblio ON items.biblionumber = biblio.biblionumber
        LEFT JOIN biblioitems on items.biblionumber = biblioitems.biblionumber
    };
    if ($statushash){
        for my $authvfield (keys %$statushash){
            if ( scalar @{$statushash->{$authvfield}} > 0 ){

        $query .= join ' AND ', @where_strings;
    }
    $query .= ' ORDER BY items.cn_sort, itemcallnumber, title';
    my $count_query = $select_count . $query;
    $query .= " LIMIT $offset, $size" if ($offset and $size);
    $query = $select_columns . $query;
    my $sth = $dbh->prepare($query);
    $sth->execute( @bind_params );

    my @results = ();
    my $tmpresults = $sth->fetchall_arrayref({});
    $sth = $dbh->prepare( $count_query );
    $sth->execute( @bind_params );
    my ($iTotalRecords) = $sth->fetchrow_array();

    foreach my $row (@$tmpresults) {
        $row->{datelastseen} = format_date( $row->{datelastseen} );

        # Auth values
        foreach (keys %$row) {

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt (-34 / +41 lines)
		1	[% USE KohaDates %]
1	[% INCLUDE 'doc-head-open.inc' %]	2	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Koha &rsaquo; Tools &rsaquo; Inventory</title>	3	<title>Koha &rsaquo; Tools &rsaquo; Inventory</title>
3	[% INCLUDE 'doc-head-close.inc' %]	4	[% INCLUDE 'doc-head-close.inc' %]
Lines 12-23 $(document).ready(function(){ Link Here
12		13
13	inventorydt = $('#inventoryt').dataTable($.extend(true, {}, dataTablesDefaults, {	14	inventorydt = $('#inventoryt').dataTable($.extend(true, {}, dataTablesDefaults, {
14	'sPaginationType': 'full_numbers',	15	'sPaginationType': 'full_numbers',
15	"aoColumnDefs": [ { "bSortable": false, "aTargets": [ 0 ] } ]	16	[% IF compareinv2barcd %]
		17	"aoColumnDefs": [ { "bSortable": false, "aTargets": [ 1 ] } ]
		18	[% ELSE %]
		19	"aoColumnDefs": [ { "bSortable": false, "aTargets": [ 0 ] } ]
		20	[% END %]
16	} ));	21	} ));
17		22
18		23
19	$("#continuewithoutmarkingbutton").click(function(){	24	$("#continuewithoutmarkingbutton").click(function(){
20	inventorydt.fnPageChange( 'next' );	25	inventorydt.fnPageChange( 'next' );
21	return false;	26	return false;
22	});	27	});
23		28
Lines 47-53 $(document).ready(function(){ Link Here
47	});	52	});
48		53
49		54
50
51	$(".checkall").click(function(){	55	$(".checkall").click(function(){
52	$(".checkboxed").checkCheckboxes();	56	$(".checkboxed").checkCheckboxes();
53	return false;	57	return false;
Lines 56-71 $(document).ready(function(){ Link Here
56	$(".checkboxed").unCheckCheckboxes();	60	$(".checkboxed").unCheckCheckboxes();
57	return false;	61	return false;
58	});	62	});
59	[% IF ( offset ) %]$("#markseen").before("<input type=\"submit\" value=\"<< " + _("Mark seen and continue") + "\" id=\"markback\" /> ");[% END %]
60	[% IF ( nextoffset ) %]$("#markseen").after(" <input type=\"submit\" id=\"marknext\" value=\"" + _("Mark seen and continue") + " >>\" />");[% END %]
61	$("#markback").click(function(){
62	$(".checkboxed").find("input").filter("[name=offset]").attr("value","[% prevoffset %]");
63	return true;
64	});
65	$("#marknext").click(function(){
66	$(".checkboxed").find("input").filter("[name=offset]").attr("value","[% nextoffset %]");
67	return true;
68	});
69	});	63	});
70	//]]>	64	//]]>
71	</script>	65	</script>
Lines 82-88 $(document).ready(function(){ Link Here
82	<div id="yui-main">	76	<div id="yui-main">
83	<div class="yui-b">	77	<div class="yui-b">
84	<h1>Inventory/Stocktaking</h1>	78	<h1>Inventory/Stocktaking</h1>
85	[% IF (moddatecount) %]<div class="dialog message">[% moddatecount %] items modified : datelastseen set to [% date %]</div>[% END %]	79	[% IF (moddatecount) %]<div class="dialog message">[% moddatecount %] items modified : datelastseen set to [% date \| $KohaDates %]</div>[% END %]
86	[% IF (errorfile) %]<div class="dialog alert">[% errorfile %] can't be opened</div>[% END %]	80	[% IF (errorfile) %]<div class="dialog alert">[% errorfile %] can't be opened</div>[% END %]
87	[% FOREACH error IN errorloop %]	81	[% FOREACH error IN errorloop %]
88	<div class="dialog alert">	82	<div class="dialog alert">
Lines 100-106 $(document).ready(function(){ Link Here
100	<legend>Use a barcode file</legend>	94	<legend>Use a barcode file</legend>
101	<ol>	95	<ol>
102	<li><label for="uploadbarcodes">Barcode file: </label> <input type="file" id="uploadbarcodes" name="uploadbarcodes" /></li>	96	<li><label for="uploadbarcodes">Barcode file: </label> <input type="file" id="uploadbarcodes" name="uploadbarcodes" /></li>
103	<li><label for="setdate">Set inventory date to:</label> <input type="text" id="setdate" name="setdate" value="[% today %]" class="datepickerfrom" />	97	<li><label for="setdate">Set inventory date to:</label> <input type="text" id="setdate" name="setdate" value="[% today \| $KohaDates %]" class="datepickerfrom" />
104	</li>	98	</li>
105	</ol>	99	</ol>
106	</fieldset>	100	</fieldset>
Lines 109-118 $(document).ready(function(){ Link Here
109	<ol><li>	103	<ol><li>
110	<label for="branch">Library: </label>	104	<label for="branch">Library: </label>
111	<input type="radio" name="branch" value="homebranch"> Home library</input>	105	<input type="radio" name="branch" value="homebranch"> Home library</input>
112	<input type="radio" name="branch" value="holdingbranch"> Current location</input>	106	<input type="radio" name="branch" value="holdingbranch"> Current library</input>
113	</li><li>	107	</li><li>
114	<label for="branchloop">Library: </label><select id="branchloop" name="branchcode" style="width:12em;">	108	<label for="branchloop">Library: </label><select id="branchloop" name="branchcode" style="width:12em;">
115	<option value="">All locations</option>	109	<option value="">All libraries</option>
116	[% FOREACH branchloo IN branchloop %]	110	[% FOREACH branchloo IN branchloop %]
117	[% IF ( branchloo.selected ) %]	111	[% IF ( branchloo.selected ) %]
118	<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>	112	<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>
Lines 172-178 $(document).ready(function(){ Link Here
172	[% END %]	166	[% END %]
173		167
174	<li><label for="datelastseen">Inventory date:</label>	168	<li><label for="datelastseen">Inventory date:</label>
175	<input type="text" id="datelastseen" name="datelastseen" value="[% datelastseen %]" class="datepickerfrom" />	169	<input type="text" id="datelastseen" name="datelastseen" value="[% datelastseen \| $KohaDates %]" class="datepickerfrom" />
176	</li>	170	</li>
177	<li><label for="ignoreissued">Skip copies on loan: </label>	171	<li><label for="ignoreissued">Skip copies on loan: </label>
178	[% IF (ignoreissued) %]	172	[% IF (ignoreissued) %]
Lines 204-218 $(document).ready(function(){ Link Here
204	<input type="hidden" name="location" value="[% location %]" />	198	<input type="hidden" name="location" value="[% location %]" />
205	<input type="hidden" name="branchcode" value="[% branchcode %]" />	199	<input type="hidden" name="branchcode" value="[% branchcode %]" />
206	<input type="hidden" name="datelastseen" value="[% datelastseen %]" />	200	<input type="hidden" name="datelastseen" value="[% datelastseen %]" />
207	<input type="hidden" name="pagesize" value="[% pagesize %]" />	201
208	<input type="hidden" name="offset" value="[% offset %]" />	202	[% UNLESS compareinv2barcd %]
209	<div><a href="#" class="checkall">[Select All]</a> <a href="#" class="clearall">[Clear All]</a></div>	203	<div><a href="#" class="checkall">[Select all]</a> <a href="#" class="clearall">[Clear all]</a></div>
		204	[% END %]
		205
210	<table id="inventoryt">	206	<table id="inventoryt">
211	<thead>	207	<thead>
212	<tr>	208	<tr>
213	<th>Seen</th>	209	[% UNLESS compareinv2barcd %]<th>Seen</th>[% END %]
214	<th>Barcode</th>	210	<th>Barcode</th>
215	<th>Location</th>	211	<th>Library</th>
216	<th>Title</th>	212	<th>Title</th>
217	<th>Status</th>	213	<th>Status</th>
218	<th>Lost</th>	214	<th>Lost</th>
Lines 224-232 $(document).ready(function(){ Link Here
224	<tbody>	220	<tbody>
225	[% FOREACH result IN loop %]	221	[% FOREACH result IN loop %]
226	<tr>	222	<tr>
227	<td>	223	[% UNLESS compareinv2barcd %]
228	<input type="checkbox" name="SEEN-[% result.itemnumber %]" value="1" />	224	<td>
229	</td>	225	<input type="checkbox" name="SEEN-[% result.itemnumber %]" value="1" />
		226	</td>
		227	[% END %]
230	<td>	228	<td>
231	[% result.barcode \| html %]	229	[% result.barcode \| html %]
232	</td>	230	</td>
Lines 246-266 $(document).ready(function(){ Link Here
246	[% result.damaged \| html %]	244	[% result.damaged \| html %]
247	</td>	245	</td>
248	<td>	246	<td>
249	[% result.datelastseen \| html %]	247	[% result.datelastseen \| html \| $KohaDates%]
250	</td>	248	</td>
251	<td>	249	<td>
252	[% IF (result.wrongplace) %]<p>Item should not have been scanned</p>[% ELSIF (result.missingitem) %]<p>Item missing</p>[% ELSIF (result.changestatus) %]<p>Change item status</p>[% END %]	250	[% IF result.problem == 'wrongplace' %]
		251	<p>Item should not have been scanned</p>
		252	[% ELSIF result.problem == 'missingitem' %]
		253	<p>Item missing</p>
		254	[% ELSIF result.problem == 'changestatus' %]
		255	<p>Change item status</p>
		256	[% ELSIF result.problem == 'not_scanned' %]
		257	<p>Item should have been scanned</p>
		258	[% END %]
253	</td>	259	</td>
254	</tr>	260	</tr>
255	[% END %]	261	[% END %]
256	</tbody>	262	</tbody>
257	</table>	263	</table>
258	<div class="spacer"></div>	264	<div class="spacer"></div>
259	<p style="display:block;"><span class="exportSelected"></span></p>	265	[% UNLESS compareinv2barcd %]
260	<div style="padding : .3em 0"><a href="#" class="checkall">[Select All]</a> <a href="#" class="clearall">[Clear All]</a></div>	266	<div style="padding : .3em 0"><a href="#" class="checkall">[Select all]</a> <a href="#" class="clearall">[Clear all]</a></div>
261	<input type="submit" id="markseenandquit" value="Mark seen and quit" />	267	<input type="submit" id="markseenandquit" value="Mark seen and quit" />
262	<input type="submit" value="Mark Seen and Continue >>" id="markseenandcontinuebutton" />	268	<input type="submit" value="Mark Seen and Continue >>" id="markseenandcontinuebutton" />
263	<input type="submit" value="Continue without Marking >>" id="continuewithoutmarkingbutton" class="submit" />	269	<input type="submit" value="Continue without Marking >>" id="continuewithoutmarkingbutton" class="submit" />
		270	[% END %]
264	</form>	271	</form>
265		272
266	</div>	273	</div>




#!/usr/bin/perl
#

use Modern::Perl;

use CGI;
use JSON;

use C4::Auth;
use C4::Items qw( ModDateLastSeen );
use C4::Context;
use C4::Koha qw/getitemtypeimagelocation/;
use C4::Reserves qw/CheckReserves/;
use C4::Utils::DataTables;
use C4::Output;
use C4::Biblio;
use C4::Items;
use C4::Dates qw/format_date format_date_in_iso/;
use C4::Koha;
use C4::Branch;    # GetBranches
use C4::Reports::Guided;    #_get_column_defs
use C4::Charset;
use List::MoreUtils qw /none/;


my $input = new CGI;


    /SEEN-(.+)/ and &ModDateLastSeen($1);
}


print $input->header('application/json');





use C4::Output;
use C4::Biblio;
use C4::Items;
use C4::Dates qw/format_date format_date_in_iso/;
use C4::Koha;
use C4::Branch; # GetBranches
use C4::Circulation;
use C4::Reports::Guided;    #_get_column_defs
use C4::Charset;
use Koha::DateUtils;
use List::MoreUtils qw( none );


my $minlocation=$input->param('minlocation') || '';

my $itemtype=$input->param('itemtype'); # FIXME note, template does not currently supply this
my $ignoreissued=$input->param('ignoreissued');
my $datelastseen = $input->param('datelastseen');
my $offset = $input->param('offset');
my $markseen = $input->param('markseen');
$offset=0 unless $offset;
my $pagesize = $input->param('pagesize');
$pagesize=50 unless $pagesize;
my $branchcode = $input->param('branchcode') || '';
my $branch     = $input->param('branch');
my $op         = $input->param('op');
my $compareinv2barcd = $input->param('compareinv2barcd');
my $res;                                            #contains the results loop

my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
    {   template_name   => "tools/inventory.tt",
        query           => $input,
        type            => "intranet",
        authnotrequired => 0,

$template->param(
    branchloop               => \@branch_loop,
    authorised_values        => \@authorised_value_list,
    today                    => dt_from_string,
    minlocation              => $minlocation,
    maxlocation              => $maxlocation,
    location                 => $location,
    ignoreissued             => $ignoreissued,
    branchcode               => $branchcode,
    branch                   => $branch,
    offset                   => $offset,
    pagesize                 => $pagesize,
    datelastseen             => $datelastseen,
    compareinv2barcd         => $compareinv2barcd,
    notforloanlist           => $notforloanlist

    @notforloans = split(/,/, $notforloanlist);
}

my @scanned_items;

my @brcditems;
my $barcodelist;
my @errorloop;
if ( $uploadbarcodes && length($uploadbarcodes) > 0 ) {
    my $dbh = C4::Context->dbh;
    my $date = dt_from_string( $input->param('setdate') );
    $date = output_pref( $date, 'iso' );

    my $strsth  = "select * from issues, items where items.itemnumber=issues.itemnumber and items.barcode =?";
    my $qonloan = $dbh->prepare($strsth);


    while (my $barcode=<$uploadbarcodes>){
        $barcode =~ s/\r?\n$//;
        next unless $barcode;
        if ( $qwithdrawn->execute($barcode) && $qwithdrawn->rows ) {
            push @errorloop, { 'barcode' => $barcode, 'ERR_WTHDRAWN' => 1 };
        } else {
            my $item = GetItem( '', $barcode );
            if ( defined $item && $item->{'itemnumber'} ) {
                ModItem( { datelastseen => $date }, undef, $item->{'itemnumber'} );
                push @scanned_items, $item;
                $count++;
                $qonloan->execute($barcode);
                if ($qonloan->rows){

        }

    }
    $qonloan->finish;
    $qwithdrawn->finish;
    $template->param( date => format_date($date), Number => $count );
    $template->param( errorloop => \@errorloop ) if (@errorloop);

    $template->param( date => $date, Number => $count );
    $template->param( errorloop => \@errorloop ) if (@errorloop);
}
$template->param(barcodelist => $barcodelist);

# now build the result list: inventoried items if requested, and mis-placed items -always-
my $inventorylist;
my @items_with_problems;
if ( $markseen or $op ) {
    # retrieve all items in this range.
    my $totalrecords;
    ($inventorylist, $totalrecords) = GetItemsForInventory($minlocation, $maxlocation, $location, $itemtype, $ignoreissued, '', $branchcode, $branch, 0, undef , $staton);
}

# If "compare barcodes list to results" has been checked, we want to alert for missing items
if ( $compareinv2barcd ) {
    # set "missing" flags for all items with a datelastseen (dls) before the choosen datelastseen (cdls)
    my $dls = output_pref( dt_from_string( $datelastseen ), 'iso' );
    foreach my $item ( @$inventorylist ) {
        my $cdls = output_pref( dt_from_string( $_->{datelastseen} ), 'iso' );
        if ( $cdls lt $dls ) {
            $item->{problem} = 'missingitem';
            # We have to push a copy of the item, not the reference
            push @items_with_problems, { %$item };
        }
    }
    $res = \@res_copy;
}

# set "missing" flags for all items with a datelastseen before the choosen datelastseen
foreach (@$res) { $_->{missingitem}=1 if C4::Dates->new($_->{datelastseen})->output('iso') lt C4::Dates->new($datelastseen)->output('iso'); }

# removing missing items from loop if "Compare barcodes list to results" has not been checked
@$res = grep {!$_->{missingitem} == 1 } @$res if (!$input->param('compareinv2barcd'));

# insert "wrongplace" to all scanned items that are not supposed to be in this range
# note this list is always displayed, whatever the librarian has choosen for comparison
my $moddatecount = 0;
foreach my $item ( @scanned_items ) {

  # Saving notforloan code before it's replaced by it's authorised value for later comparison
  $item->{notforloancode} = $item->{notforloan};

  # Populating with authorised values
  foreach my $field ( keys %$item ) {
        # If the koha field is mapped to a marc field
        my $fc = $item->{'frameworkcode'} || '';
        my ($f, $sf) = GetMarcFromKohaField("items.$field", $fc);
        if ($f and $sf) {
            # We replace the code with it's description
            my $authvals = C4::Koha::GetKohaAuthorisedValuesFromField($f, $sf, $fc);
            if ($authvals and defined $item->{$field} and defined $authvals->{$item->{$field}}) {
              $item->{$field} = $authvals->{$item->{$field}};
            }
        }
    }

    next if $item->{onloan}; # skip checked out items

    # If we have scanned items with a non-matching notforloan value
    if (none { $item->{'notforloancode'} eq $_ } @notforloans) {
        $item->{problem} = 'changestatus';
        push @items_with_problems, { %$item };
        $temp->{title} = $biblio->{title};
        $temp->{author} = $biblio->{author};
        $temp->{datelastseen} = format_date($temp->{datelastseen});
        push @$res, $temp;

    }
    if (none { $item->{barcode} eq $_->{barcode} && !$_->{'onloan'} } @$inventorylist) {
        $item->{problem} = 'wrongplace';
        push @items_with_problems, { %$item };
        my $biblio = C4::Biblio::GetBiblioData($temp->{biblionumber});
        $temp2->{title} = $biblio->{title};
        $temp2->{author} = $biblio->{author};
        $temp2->{datelastseen} = format_date($temp->{datelastseen});
        push @$res, $temp2;
    }

    # Modify date last seen for scanned items
    ModDateLastSeen($_->{'itemnumber'});
    $moddatecount++;
}

if ( $compareinv2barcd ) {
    my @scanned_barcodes = map {$_->{barcode}} @scanned_items;
    for my $should_be_scanned ( @$inventorylist ) {
        my $barcode = $should_be_scanned->{barcode};
        unless ( grep /^$barcode$/, @scanned_barcodes ) {
            $should_be_scanned->{problem} = 'not_scanned';
            push @items_with_problems, { %$should_be_scanned };
        }
    }
}

for my $item ( @items_with_problems ) {
    my $biblio = C4::Biblio::GetBiblioData($item->{biblionumber});
    $item->{title} = $biblio->{title};
    $item->{author} = $biblio->{author};
}

# If a barcode file is given, we want to show problems, else all items
my @results;
@results = $uploadbarcodes
            ? @items_with_problems
            : $op
                ? @$inventorylist
                : ();

$template->param(
    moddatecount => $moddatecount,
    loop       => \@results,
    nextoffset => ( $offset + $pagesize ),
    prevoffset => ( $offset ? $offset - $pagesize : 0 ),
    op         => $op
);


                      / ) {
       push @translated_keys, $columns_def_hashref->{$key};
    }
    push @translated_keys, 'problem' if $uploadbarcodes;

    $csv->combine(@translated_keys);
    print $csv->string, "\n";

    my @keys = qw / title author barcode itemnumber homebranch location itemcallnumber notforloan lost damaged stocknumber /;
    for my $item ( @results ) {
        my @line;
        for my $key (@keys) {
            push @line, $item->{$key};
        }
        if ( defined $item->{problem} ) {
            if ( $item->{problem} eq 'wrongplace' ) {
                push @line, "wrong place";
            } elsif ( $item->{problem} eq 'missingitem' ) {
                push @line, "missing item";
            } elsif ( $item->{problem} eq 'changestatus' ) {
                push @line, "change item status";
            } elsif ($item->{problem} eq 'not_scanned' ) {
                push @line, "item not scanned";
            }
        }
        $csv->combine(@line);
        print $csv->string, "\n";
    }
    # Adding not found barcodes
    foreach my $error (@errorloop) {
        my @line;
        if ($error->{'ERR_BARCODE'}) {
            push @line, map { $_ eq 'barcode' ? $error->{'barcode'} : ''} @keys;
            push @line, "barcode not found";
            $csv->combine(@line);
            print $csv->string, "\n";
        }
    }
    exit;
}
- 

Return to bug 7684

Lines 997-1008 sub GetItemsForInventory { Link Here

(-)a/C4/Items.pm (-10 / +14 lines)
997	my $dbh = C4::Context->dbh;	997	my $dbh = C4::Context->dbh;
998	my ( @bind_params, @where_strings );	998	my ( @bind_params, @where_strings );
999		999
1000	my $query = <<'END_SQL';	1000	my $select_columns = q{
1001	SELECT SQL_CALC_FOUND_ROWS items.itemnumber, barcode, itemcallnumber, title, author, biblio.biblionumber, biblio.frameworkcode, datelastseen, homebranch, location, notforloan, damaged, itemlost, stocknumber	1001	SELECT items.itemnumber, barcode, itemcallnumber, title, author, biblio.biblionumber, biblio.frameworkcode, datelastseen, homebranch, location, notforloan, damaged, itemlost, stocknumber
1002	FROM items	1002	};
1003	LEFT JOIN biblio ON items.biblionumber = biblio.biblionumber	1003	my $select_count = q{SELECT COUNT(*)};
1004	LEFT JOIN biblioitems on items.biblionumber = biblioitems.biblionumber	1004	my $query = q{
1005	END_SQL	1005	FROM items
		1006	LEFT JOIN biblio ON items.biblionumber = biblio.biblionumber
		1007	LEFT JOIN biblioitems on items.biblionumber = biblioitems.biblionumber
		1008	};
1006	if ($statushash){	1009	if ($statushash){
1007	for my $authvfield (keys %$statushash){	1010	for my $authvfield (keys %$statushash){
1008	if ( scalar @{$statushash->{$authvfield}} > 0 ){	1011	if ( scalar @{$statushash->{$authvfield}} > 0 ){
Lines 1057-1074 END_SQL Link Here
1057	$query .= join ' AND ', @where_strings;	1060	$query .= join ' AND ', @where_strings;
1058	}	1061	}
1059	$query .= ' ORDER BY items.cn_sort, itemcallnumber, title';	1062	$query .= ' ORDER BY items.cn_sort, itemcallnumber, title';
		1063	my $count_query = $select_count . $query;
1060	$query .= " LIMIT $offset, $size" if ($offset and $size);	1064	$query .= " LIMIT $offset, $size" if ($offset and $size);
		1065	$query = $select_columns . $query;
1061	my $sth = $dbh->prepare($query);	1066	my $sth = $dbh->prepare($query);
1062	$sth->execute( @bind_params );	1067	$sth->execute( @bind_params );
1063		1068
1064	my @results;	1069	my @results = ();
1065	my $tmpresults = $sth->fetchall_arrayref({});	1070	my $tmpresults = $sth->fetchall_arrayref({});
1066	$sth = $dbh->prepare("SELECT FOUND_ROWS()");	1071	$sth = $dbh->prepare( $count_query );
1067	$sth->execute();	1072	$sth->execute( @bind_params );
1068	my ($iTotalRecords) = $sth->fetchrow_array();	1073	my ($iTotalRecords) = $sth->fetchrow_array();
1069		1074
1070	foreach my $row (@$tmpresults) {	1075	foreach my $row (@$tmpresults) {
1071	$row->{datelastseen} = format_date( $row->{datelastseen} );
1072		1076
1073	# Auth values	1077	# Auth values
1074	foreach (keys %$row) {	1078	foreach (keys %$row) {

Lines 1-27 Link Here

(-)a/tools/ajax-inventory.pl (-21 / +1 lines)
1	#!/usr/bin/perl	1	#!/usr/bin/perl
2	#
3		2
4	use Modern::Perl;	3	use Modern::Perl;
5
6	use CGI;	4	use CGI;
7	use JSON;
8
9	use C4::Auth;	5	use C4::Auth;
10	use C4::Circulation qw/CanBookBeRenewed/;	6	use C4::Items qw( ModDateLastSeen );
11	use C4::Context;
12	use C4::Koha qw/getitemtypeimagelocation/;
13	use C4::Reserves qw/CheckReserves/;
14	use C4::Utils::DataTables;
15	use C4::Output;
16	use C4::Biblio;
17	use C4::Items;
18	use C4::Dates qw/format_date format_date_in_iso/;
19	use C4::Koha;
20	use C4::Branch; # GetBranches
21	use C4::Reports::Guided; #_get_column_defs
22	use C4::Charset;
23	use List::MoreUtils qw /none/;
24
25		7
26	my $input = new CGI;	8	my $input = new CGI;
27		9
Lines 38-43 foreach ( @seent ) { Link Here
38	/SEEN-(.+)/ and &ModDateLastSeen($1);	20	/SEEN-(.+)/ and &ModDateLastSeen($1);
39	}	21	}
40		22
41
42	print $input->header('application/json');	23	print $input->header('application/json');
43

Lines 31-43 use C4::Context; Link Here

(-)a/tools/inventory.pl (-83 / +85 lines)
31	use C4::Output;	31	use C4::Output;
32	use C4::Biblio;	32	use C4::Biblio;
33	use C4::Items;	33	use C4::Items;
34	use C4::Dates qw/format_date format_date_in_iso/;
35	use C4::Koha;	34	use C4::Koha;
36	use C4::Branch; # GetBranches	35	use C4::Branch; # GetBranches
37	use C4::Circulation;	36	use C4::Circulation;
38	use C4::Reports::Guided; #_get_column_defs	37	use C4::Reports::Guided; #_get_column_defs
39	use C4::Charset;	38	use C4::Charset;
40	use List::MoreUtils qw/none/;	39	use Koha::DateUtils;
		40	use List::MoreUtils qw( none );
41		41
42		42
43	my $minlocation=$input->param('minlocation') \|\| '';	43	my $minlocation=$input->param('minlocation') \|\| '';
Lines 47-65 my $location=$input->param('location') \|\| ''; Link Here
47	my $itemtype=$input->param('itemtype'); # FIXME note, template does not currently supply this	47	my $itemtype=$input->param('itemtype'); # FIXME note, template does not currently supply this
48	my $ignoreissued=$input->param('ignoreissued');	48	my $ignoreissued=$input->param('ignoreissued');
49	my $datelastseen = $input->param('datelastseen');	49	my $datelastseen = $input->param('datelastseen');
50	my $offset = $input->param('offset');
51	my $markseen = $input->param('markseen');	50	my $markseen = $input->param('markseen');
52	$offset=0 unless $offset;
53	my $pagesize = $input->param('pagesize');
54	$pagesize=50 unless $pagesize;
55	my $branchcode = $input->param('branchcode') \|\| '';	51	my $branchcode = $input->param('branchcode') \|\| '';
56	my $branch = $input->param('branch');	52	my $branch = $input->param('branch');
57	my $op = $input->param('op');	53	my $op = $input->param('op');
58	my $compareinv2barcd = $input->param('compareinv2barcd');	54	my $compareinv2barcd = $input->param('compareinv2barcd');
59	my $res; #contains the results loop
60		55
61	my ( $template, $borrowernumber, $cookie ) = get_template_and_user(	56	my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
62	{ template_name => "tools/inventory.tmpl",	57	{ template_name => "tools/inventory.tt",
63	query => $input,	58	query => $input,
64	type => "intranet",	59	type => "intranet",
65	authnotrequired => 0,	60	authnotrequired => 0,
Lines 134-148 $statussth =~ s, and $,,g; Link Here
134	$template->param(	129	$template->param(
135	branchloop => \@branch_loop,	130	branchloop => \@branch_loop,
136	authorised_values => \@authorised_value_list,	131	authorised_values => \@authorised_value_list,
137	today => C4::Dates->today(),	132	today => dt_from_string,
138	minlocation => $minlocation,	133	minlocation => $minlocation,
139	maxlocation => $maxlocation,	134	maxlocation => $maxlocation,
140	location => $location,	135	location => $location,
141	ignoreissued => $ignoreissued,	136	ignoreissued => $ignoreissued,
142	branchcode => $branchcode,	137	branchcode => $branchcode,
143	branch => $branch,	138	branch => $branch,
144	offset => $offset,
145	pagesize => $pagesize,
146	datelastseen => $datelastseen,	139	datelastseen => $datelastseen,
147	compareinv2barcd => $compareinv2barcd,	140	compareinv2barcd => $compareinv2barcd,
148	notforloanlist => $notforloanlist	141	notforloanlist => $notforloanlist
Lines 153-166 if (defined $notforloanlist) { Link Here
153	@notforloans = split(/,/, $notforloanlist);	146	@notforloans = split(/,/, $notforloanlist);
154	}	147	}
155		148
156		149	my @scanned_items;
157
158	my @brcditems;
159	my $barcodelist;
160	my @errorloop;	150	my @errorloop;
161	if ( $uploadbarcodes && length($uploadbarcodes) > 0 ) {	151	if ( $uploadbarcodes && length($uploadbarcodes) > 0 ) {
162	my $dbh = C4::Context->dbh;	152	my $dbh = C4::Context->dbh;
163	my $date = format_date_in_iso( $input->param('setdate') ) \|\| C4::Dates->today('iso');	153	my $date = dt_from_string( $input->param('setdate') );
		154	$date = output_pref( $date, 'iso' );
164		155
165	my $strsth = "select * from issues, items where items.itemnumber=issues.itemnumber and items.barcode =?";	156	my $strsth = "select * from issues, items where items.itemnumber=issues.itemnumber and items.barcode =?";
166	my $qonloan = $dbh->prepare($strsth);	157	my $qonloan = $dbh->prepare($strsth);
Lines 171-184 if ( $uploadbarcodes && length($uploadbarcodes) > 0 ) { Link Here
171		162
172	while (my $barcode=<$uploadbarcodes>){	163	while (my $barcode=<$uploadbarcodes>){
173	$barcode =~ s/\r?\n$//;	164	$barcode =~ s/\r?\n$//;
174	$barcodelist .= ($barcodelist) ? '\|' . $barcode : $barcode;	165	next unless $barcode;
175	if ( $qwithdrawn->execute($barcode) && $qwithdrawn->rows ) {	166	if ( $qwithdrawn->execute($barcode) && $qwithdrawn->rows ) {
176	push @errorloop, { 'barcode' => $barcode, 'ERR_WTHDRAWN' => 1 };	167	push @errorloop, { 'barcode' => $barcode, 'ERR_WTHDRAWN' => 1 };
177	} else {	168	} else {
178	my $item = GetItem( '', $barcode );	169	my $item = GetItem( '', $barcode );
179	if ( defined $item && $item->{'itemnumber'} ) {	170	if ( defined $item && $item->{'itemnumber'} ) {
180	ModItem( { datelastseen => $date }, undef, $item->{'itemnumber'} );	171	ModItem( { datelastseen => $date }, undef, $item->{'itemnumber'} );
181	push @brcditems, $item;	172	push @scanned_items, $item;
182	$count++;	173	$count++;
183	$qonloan->execute($barcode);	174	$qonloan->execute($barcode);
184	if ($qonloan->rows){	175	if ($qonloan->rows){
Lines 196-291 if ( $uploadbarcodes && length($uploadbarcodes) > 0 ) { Link Here
196	}	187	}
197		188
198	}	189	}
199	$qonloan->finish;
200	$qwithdrawn->finish;
201	$template->param( date => format_date($date), Number => $count );
202	$template->param( errorloop => \@errorloop ) if (@errorloop);
203		190
		191	$template->param( date => $date, Number => $count );
		192	$template->param( errorloop => \@errorloop ) if (@errorloop);
204	}	193	}
205	$template->param(barcodelist => $barcodelist);
206		194
207	# now build the result list: inventoried items if requested, and mis-placed items -always-	195	# now build the result list: inventoried items if requested, and mis-placed items -always-
208	my $inventorylist;	196	my $inventorylist;
		197	my @items_with_problems;
209	if ( $markseen or $op ) {	198	if ( $markseen or $op ) {
210	# retrieve all items in this range.	199	# retrieve all items in this range.
211	my $totalrecords;	200	my $totalrecords;
212	($inventorylist, $totalrecords) = GetItemsForInventory($minlocation, $maxlocation, $location, $itemtype, $ignoreissued, '', $branchcode, $branch, 0, undef , $staton);	201	($inventorylist, $totalrecords) = GetItemsForInventory($minlocation, $maxlocation, $location, $itemtype, $ignoreissued, '', $branchcode, $branch, 0, undef , $staton);
		202	}
213		203
214	# Real copy	204	# If "compare barcodes list to results" has been checked, we want to alert for missing items
215	my @res_copy;	205	if ( $compareinv2barcd ) {
216	foreach (@$inventorylist) {	206	# set "missing" flags for all items with a datelastseen (dls) before the choosen datelastseen (cdls)
217	push @res_copy, $_;	207	my $dls = output_pref( dt_from_string( $datelastseen ), 'iso' );
		208	foreach my $item ( @$inventorylist ) {
		209	my $cdls = output_pref( dt_from_string( $_->{datelastseen} ), 'iso' );
		210	if ( $cdls lt $dls ) {
		211	$item->{problem} = 'missingitem';
		212	# We have to push a copy of the item, not the reference
		213	push @items_with_problems, { %$item };
		214	}
218	}	215	}
219	$res = \@res_copy;
220	}	216	}
221		217
222	# set "missing" flags for all items with a datelastseen before the choosen datelastseen
223	foreach (@$res) { $_->{missingitem}=1 if C4::Dates->new($_->{datelastseen})->output('iso') lt C4::Dates->new($datelastseen)->output('iso'); }
224		218
225	# removing missing items from loop if "Compare barcodes list to results" has not been checked
226	@$res = grep {!$_->{missingitem} == 1 } @$res if (!$input->param('compareinv2barcd'));
227		219
228	# insert "wrongplace" to all scanned items that are not supposed to be in this range	220	# insert "wrongplace" to all scanned items that are not supposed to be in this range
229	# note this list is always displayed, whatever the librarian has choosen for comparison	221	# note this list is always displayed, whatever the librarian has choosen for comparison
230	foreach my $temp (@brcditems) {	222	my $moddatecount = 0;
		223	foreach my $item ( @scanned_items ) {
231		224
232	# Saving notforloan code before it's replaced by it's authorised value for later comparison	225	# Saving notforloan code before it's replaced by it's authorised value for later comparison
233	$temp->{'notforloancode'} = $temp->{'notforloan'};	226	$item->{notforloancode} = $item->{notforloan};
234		227
235	# Populating with authorised values	228	# Populating with authorised values
236	foreach (keys %$temp) {	229	foreach my $field ( keys %$item ) {
237	# If the koha field is mapped to a marc field	230	# If the koha field is mapped to a marc field
238	my $fc = $temp->{'frameworkcode'} \|\| '';	231	my $fc = $item->{'frameworkcode'} \|\| '';
239	my ($f, $sf) = GetMarcFromKohaField("items.$_", $fc);	232	my ($f, $sf) = GetMarcFromKohaField("items.$field", $fc);
240	if ($f and $sf) {	233	if ($f and $sf) {
241	# We replace the code with it's description	234	# We replace the code with it's description
242	my $authvals = C4::Koha::GetKohaAuthorisedValuesFromField($f, $sf, $fc);	235	my $authvals = C4::Koha::GetKohaAuthorisedValuesFromField($f, $sf, $fc);
243	if ($authvals and defined $temp->{$_} and defined $authvals->{$temp->{$_}}) {	236	if ($authvals and defined $item->{$field} and defined $authvals->{$item->{$field}}) {
244	$temp->{$_} = $authvals->{$temp->{$_}};	237	$item->{$field} = $authvals->{$item->{$field}};
245	}	238	}
246	}	239	}
247	}	240	}
248		241
249	next if $temp->{onloan}; # skip checked out items	242	next if $item->{onloan}; # skip checked out items
250		243
251	# If we have scanned items with a non-matching notforloan value	244	# If we have scanned items with a non-matching notforloan value
252	if (none { $temp->{'notforloancode'} eq $_ } @notforloans) {	245	if (none { $item->{'notforloancode'} eq $_ } @notforloans) {
253	$temp->{'changestatus'} = 1;	246	$item->{problem} = 'changestatus';
254	my $biblio = C4::Biblio::GetBiblioData($temp->{biblionumber});	247	push @items_with_problems, { %$item };
255	$temp->{title} = $biblio->{title};
256	$temp->{author} = $biblio->{author};
257	$temp->{datelastseen} = format_date($temp->{datelastseen});
258	push @$res, $temp;
259
260	}	248	}
261	if (none { $temp->{barcode} eq $_->{barcode} && !$_->{'onloan'} } @$inventorylist) {	249	if (none { $item->{barcode} eq $_->{barcode} && !$_->{'onloan'} } @$inventorylist) {
262	my $temp2 = { %$temp };	250	$item->{problem} = 'wrongplace';
263	$temp2->{wrongplace}=1;	251	push @items_with_problems, { %$item };
264	my $biblio = C4::Biblio::GetBiblioData($temp->{biblionumber});
265	$temp2->{title} = $biblio->{title};
266	$temp2->{author} = $biblio->{author};
267	$temp2->{datelastseen} = format_date($temp->{datelastseen});
268	push @$res, $temp2;
269	}	252	}
		253
		254	# Modify date last seen for scanned items
		255	ModDateLastSeen($_->{'itemnumber'});
		256	$moddatecount++;
270	}	257	}
271		258
272	# Finally, modifying datelastseen for remaining items	259	if ( $compareinv2barcd ) {
273	my $moddatecount = 0;	260	my @scanned_barcodes = map {$_->{barcode}} @scanned_items;
274	foreach (@$res) {	261	for my $should_be_scanned ( @$inventorylist ) {
275	unless ($_->{'missingitem'}) {	262	my $barcode = $should_be_scanned->{barcode};
276	ModDateLastSeen($_->{'itemnumber'});	263	unless ( grep /^$barcode$/, @scanned_barcodes ) {
277	$moddatecount++;	264	$should_be_scanned->{problem} = 'not_scanned';
		265	push @items_with_problems, { %$should_be_scanned };
		266	}
278	}	267	}
279	}	268	}
280		269
281	# Removing items that don't have any problems from loop	270	for my $item ( @items_with_problems ) {
282	@$res = grep { $_->{missingitem} \|\| $_->{wrongplace} \|\| $_->{changestatus} } @$res;	271	my $biblio = C4::Biblio::GetBiblioData($item->{biblionumber});
		272	$item->{title} = $biblio->{title};
		273	$item->{author} = $biblio->{author};
		274	}
		275
		276	# If a barcode file is given, we want to show problems, else all items
		277	my @results;
		278	@results = $uploadbarcodes
		279	? @items_with_problems
		280	: $op
		281	? @$inventorylist
		282	: ();
283		283
284	$template->param(	284	$template->param(
285	moddatecount => $moddatecount,	285	moddatecount => $moddatecount,
286	loop => $res,	286	loop => \@results,
287	nextoffset => ( $offset + $pagesize ),
288	prevoffset => ( $offset ? $offset - $pagesize : 0 ),
289	op => $op	287	op => $op
290	);	288	);
291		289
Lines 316-350 if (defined $input->param('CSVexport') && $input->param('CSVexport') eq 'on'){ Link Here
316	/ ) {	314	/ ) {
317	push @translated_keys, $columns_def_hashref->{$key};	315	push @translated_keys, $columns_def_hashref->{$key};
318	}	316	}
		317	push @translated_keys, 'problem' if $uploadbarcodes;
319		318
320	$csv->combine(@translated_keys);	319	$csv->combine(@translated_keys);
321	print $csv->string, "\n";	320	print $csv->string, "\n";
322		321
323	my @keys = qw / title author barcode itemnumber homebranch location itemcallnumber notforloan lost damaged stocknumber /;	322	my @keys = qw / title author barcode itemnumber homebranch location itemcallnumber notforloan lost damaged stocknumber /;
324	for my $re (@$res) {	323	for my $item ( @results ) {
325	my @line;	324	my @line;
326	for my $key (@keys) {	325	for my $key (@keys) {
327	push @line, $re->{$key};	326	push @line, $item->{$key};
328	}	327	}
329	if ($re->{wrongplace}) {	328	if ( defined $item->{problem} ) {
330	push @line, "wrong place";	329	if ( $item->{problem} eq 'wrongplace' ) {
331	} elsif ($re->{missingitem}) {	330	push @line, "wrong place";
332	push @line, "missing item";	331	} elsif ( $item->{problem} eq 'missingitem' ) {
333	} elsif ($re->{changestatus}) {	332	push @line, "missing item";
334	push @line, "change item status";	333	} elsif ( $item->{problem} eq 'changestatus' ) {
		334	push @line, "change item status";
		335	} elsif ($item->{problem} eq 'not_scanned' ) {
		336	push @line, "item not scanned";
		337	}
335	}	338	}
336	$csv->combine(@line);	339	$csv->combine(@line);
337	print $csv->string, "\n";	340	print $csv->string, "\n";
338	}	341	}
339	# Adding not found barcodes	342	# Adding not found barcodes
340	foreach my $error (@errorloop) {	343	foreach my $error (@errorloop) {
341	my @line;	344	my @line;
342	if ($error->{'ERR_BARCODE'}) {	345	if ($error->{'ERR_BARCODE'}) {
343	push @line, map { $_ eq 'barcode' ? $error->{'barcode'} : ''} @keys;	346	push @line, map { $_ eq 'barcode' ? $error->{'barcode'} : ''} @keys;
344	push @line, "barcode not found";	347	push @line, "barcode not found";
345	$csv->combine(@line);	348	$csv->combine(@line);
346	print $csv->string, "\n";	349	print $csv->string, "\n";
347	}	350	}
348	}	351	}
349	exit;	352	exit;
350	}	353	}
351	-