From 135248b31da4cd867f08fd17d975c3eb0e372268 Mon Sep 17 00:00:00 2001 From: Matthias Meusburger Date: Thu, 23 Aug 2012 16:02:52 +0200 Subject: [PATCH] Bug 7684: multiple fixes for inventory * when a file was uploaded and the comparison with catalogue range requested, the comparison was wrong: the logic was wrong * items that were not supposed to be scanned (ie: supposed to be on another shelf) didn't had the author and title, it was hard to retrieve them on the shelved * some useful fields were missing, like homebranch, location, status * the CSV export contained all the item information. It should contain the same informations as the screen Behaviour now: * scan a list of barcode & select a range of location * if a barcode has been scanned and should not be (mis placed item), the information is displayed * if you choose "compare barcodes list to result option", the resulting list contains all items that have been scanned and those that were supposed to be. Any item not in both list appears with a specific message on the last column --- C4/Auth.pm | 2 +- C4/Items.pm | 41 ++- .../prog/en/modules/tools/inventory.tmpl | 296 ++++++++++++++++++++ tools/inventory.pl | 243 +++++++++++----- 4 files changed, 493 insertions(+), 89 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl diff --git a/C4/Auth.pm b/C4/Auth.pm index f9b15ef..459260e 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -1091,7 +1091,7 @@ sub check_api_auth { unless ($query->param('userid')) { $sessionID = $query->cookie("CGISESSID"); } - if ($sessionID && not ($cas && $query->param('PT')) ) { + if ( $sessionID && not ($cas && $query->param('PT')) ) { my $session = get_session($sessionID); C4::Context->_new_userenv($sessionID); if ($session) { diff --git a/C4/Items.pm b/C4/Items.pm index a9c0a16..0ffc2f9 100644 --- a/C4/Items.pm +++ b/C4/Items.pm @@ -968,9 +968,11 @@ sub GetLostItems { =head2 GetItemsForInventory - $itemlist = GetItemsForInventory($minlocation, $maxlocation, - $location, $itemtype $datelastseen, $branch, - $offset, $size, $statushash); +=over 4 + +($itemlist, $iTotalRecords) = GetItemsForInventory($minlocation, $maxlocation, $location, $itemtype, $ignoreissued, $datelastseen, $branchcode, $offset, $size, $statushash); + +=back Retrieve a list of title/authors/barcode/callnumber, for biblio inventory. @@ -983,6 +985,8 @@ the datelastseen can be used to specify that you want to see items not seen sinc offset & size can be used to retrieve only a part of the whole listing (defaut behaviour) $statushash requires a hashref that has the authorized values fieldname (intems.notforloan, etc...) as keys, and an arrayref of statuscodes we are searching for as values. +$iTotalRecords is the number of rows that would have been returned without the $offset, $size limit clause + =cut sub GetItemsForInventory { @@ -991,7 +995,7 @@ sub GetItemsForInventory { my ( @bind_params, @where_strings ); my $query = <<'END_SQL'; -SELECT items.itemnumber, barcode, itemcallnumber, title, author, biblio.biblionumber, datelastseen +SELECT SQL_CALC_FOUND_ROWS items.itemnumber, barcode, itemcallnumber, title, author, biblio.biblionumber, biblio.frameworkcode, datelastseen, homebranch, location, notforloan, damaged, itemlost, stocknumber FROM items LEFT JOIN biblio ON items.biblionumber = biblio.biblionumber LEFT JOIN biblioitems on items.biblionumber = biblioitems.biblionumber @@ -1050,20 +1054,33 @@ END_SQL $query .= join ' AND ', @where_strings; } $query .= ' ORDER BY items.cn_sort, itemcallnumber, title'; + $query .= " LIMIT $offset, $size" if ($offset and $size); my $sth = $dbh->prepare($query); $sth->execute( @bind_params ); my @results; - $size--; - while ( my $row = $sth->fetchrow_hashref ) { - $offset-- if ($offset); - $row->{datelastseen}=format_date($row->{datelastseen}); - if ( ( !$offset ) && $size ) { - push @results, $row; - $size--; + my $tmpresults = $sth->fetchall_arrayref({}); + $sth = $dbh->prepare("SELECT FOUND_ROWS()"); + $sth->execute(); + my ($iTotalRecords) = $sth->fetchrow_array(); + + foreach my $row (@$tmpresults) { + $row->{datelastseen} = format_date( $row->{datelastseen} ); + + # Auth values + foreach (keys %$row) { + # If the koha field is mapped to a marc field + my ($f, $sf) = GetMarcFromKohaField("items.$_", $row->{'frameworkcode'}); + if ($f and $sf) { + # We replace the code with it's description + my $authvals = C4::Koha::GetKohaAuthorisedValuesFromField($f, $sf, $row->{'frameworkcode'}); + $row->{$_} = $authvals->{$row->{$_}} if $authvals->{$row->{$_}}; + } } + push @results, $row; } - return \@results; + + return (\@results, $iTotalRecords); } =head2 GetItemsCount diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl new file mode 100644 index 0000000..e5ecbf7 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl @@ -0,0 +1,296 @@ + +Koha › Tools › Inventory + +/css/datatables.css" /> + + + + + + + + + + + + +
+ +
+
+
+

Inventory/Stocktaking

+
items modified : datelastseen set to
+
can't be opened
+ +
+ + : barcode not found + : item withdrawn + : item was on loan. It was returned before marked as seen + : item was on loan. couldn't be returned. +
+ + +
+
+
+ Use a barcode file +
    +
    2. +
  2. " /> + /lib/calendar/cal.gif" id="setdate_button" alt="Show Calendar" /> + +
    +
    3. +
+
+
+ Select items you want to check +
  1. + + Home Branch + Holding Branch +
  2. + +
    3. + +
  3. + +
    4. + +
  4. + + " /> (items.itemcallnumber)
    5. +
  5. + " /> +
    6. + +
+
+
+ Item statuses: +
+ + +
+ +
    " style="display: inline;"> + +
  • + + -" id="" /> +
    • + +
+
+ + +
+
+
+
    + + +
  1. + " /> + /lib/calendar/cal.gif" id="datelastseen_button" alt="Show Calendar" /> + +
    +
    2. +
  2. + +
    3. + + + +
  3. + + +
    4. +
  4. + + +
    5. +
+
+ +
+
+
+
+ + +
+ + " /> + " /> + " /> + " /> + " /> + " /> + " /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
SeenBarcodeLocationTitleStatusLostDamagedUnseen sinceProblems
+ " value="1" /> + + + + [] + +

','marcview','width=800,height=600,toolbar=0,scrollbars=1');">

+ 		+ + + + + + + + +

Item should not have been scanned

Item missing

Change item status

+
+
+

+ + + + +
+ +
+ + + +
+
+ +
+
+ diff --git a/tools/inventory.pl b/tools/inventory.pl index 5e7b198..d3b4250 100755 --- a/tools/inventory.pl +++ b/tools/inventory.pl @@ -35,6 +35,9 @@ 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; + my $minlocation=$input->param('minlocation') || ''; my $maxlocation=$input->param('maxlocation'); @@ -50,19 +53,20 @@ 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 $res; #contains the results loop -# warn "uploadbarcodes : ".$uploadbarcodes; -# use Data::Dumper; warn Dumper($input); - -my ($template, $borrowernumber, $cookie) - = get_template_and_user({template_name => "tools/inventory.tmpl", - query => $input, - type => "intranet", - authnotrequired => 0, - flagsrequired => {tools => 'inventory'}, - debug => 1, - }); +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.tmpl", + query => $input, + type => "intranet", + authnotrequired => 0, + flagsrequired => { tools => 'inventory' }, + debug => 1, + } +); + my $branches = GetBranches(); my @branch_loop; @@ -114,48 +118,63 @@ for my $authvfield (@$statuses) { } } +my $notforloanlist; my $statussth = ''; for my $authvfield (@$statuses) { if ( scalar @{$staton->{$authvfield->{fieldname}}} > 0 ){ my $joinedvals = join ',', @{$staton->{$authvfield->{fieldname}}}; $statussth .= "$authvfield->{fieldname} in ($joinedvals) and "; + $notforloanlist = $joinedvals if ($authvfield->{fieldname} eq "items.notforloan"); } } $statussth =~ s, and $,,g; - -$template->param(branchloop => \@branch_loop, - authorised_values=>\@authorised_value_list, - DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), - today => C4::Dates->today(), - minlocation => $minlocation, - maxlocation => $maxlocation, - location=>$location, - ignoreissued=>$ignoreissued, - branchcode=>$branchcode, - branch => $branch, - offset => $offset, - pagesize => $pagesize, - datelastseen => $datelastseen, - ); +$template->param( + branchloop => \@branch_loop, + authorised_values => \@authorised_value_list, + DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), + today => C4::Dates->today(), + minlocation => $minlocation, + maxlocation => $maxlocation, + location => $location, + ignoreissued => $ignoreissued, + branchcode => $branchcode, + branch => $branch, + offset => $offset, + pagesize => $pagesize, + datelastseen => $datelastseen, + compareinv2barcd => $compareinv2barcd, + notforloanlist => $notforloanlist +); + +my @notforloans; +if (defined $notforloanlist) { + @notforloans = split(/,/, $notforloanlist); +} + + + my @brcditems; -if ($uploadbarcodes && length($uploadbarcodes)>0){ - my $dbh=C4::Context->dbh; - my $date = format_date_in_iso($input->param('setdate')) || C4::Dates->today('iso'); -# warn "$date"; - my $strsth="select * from issues, items where items.itemnumber=issues.itemnumber and items.barcode =?"; +my $barcodelist; +my @errorloop; +if ( $uploadbarcodes && length($uploadbarcodes) > 0 ) { + my $dbh = C4::Context->dbh; + my $date = format_date_in_iso( $input->param('setdate') ) || C4::Dates->today('iso'); + + my $strsth = "select * from issues, items where items.itemnumber=issues.itemnumber and items.barcode =?"; my $qonloan = $dbh->prepare($strsth); $strsth="select * from items where items.barcode =? and items.wthdrawn = 1"; my $qwthdrawn = $dbh->prepare($strsth); - my @errorloop; - my $count=0; - while (my $barcode=<$uploadbarcodes>){ + my $count = 0; + + while ( my $barcode = <$uploadbarcodes> ) { $barcode =~ s/\r?\n$//; - if ($qwthdrawn->execute($barcode) &&$qwthdrawn->rows){ - push @errorloop, {'barcode'=>$barcode,'ERR_WTHDRAWN'=>1}; - }else{ - my $item = GetItem('', $barcode); - if (defined $item && $item->{'itemnumber'}){ - ModItem({ datelastseen => $date }, undef, $item->{'itemnumber'}); + $barcodelist .= ($barcodelist) ? '|' . $barcode : $barcode; + if ( $qwthdrawn->execute($barcode) && $qwthdrawn->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 @brcditems, $item; $count++; $qonloan->execute($barcode); @@ -172,48 +191,83 @@ if ($uploadbarcodes && length($uploadbarcodes)>0){ push @errorloop, {'barcode'=>$barcode,'ERR_BARCODE'=>1}; } } + } $qonloan->finish; $qwthdrawn->finish; - $template->param(date=>format_date($date),Number=>$count); -# $template->param(errorfile=>$errorfile) if ($errorfile); - $template->param(errorloop=>\@errorloop) if (@errorloop); + $template->param( date => format_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; +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); + + $res = $inventorylist ; } -#if we want to compare the results to a list of barcodes, or we have no barcode file -if ( ! ($uploadbarcodes && length($uploadbarcodes)>0 ) || ( $input->param('compareinv2barcd') eq 'on' && length($uploadbarcodes)>0) ) { - if ($markseen) { - foreach ($input->param) { - /SEEN-(.+)/ and &ModDateLastSeen($1); + +# 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 +foreach my $temp (@brcditems) { + next if $temp->{onloan}; # skip checked out items + + # If we have scanned items with a non-matching notforloan value + if (none { $temp->{'notforloan'} eq $_ } @notforloans) { + $temp->{'changestatus'} = 1; + if ($input->param('CSVexport') eq 'on') { + my $biblio = C4::Biblio::GetBiblioData($temp->{biblionumber}); + $temp->{title} = $biblio->{title}; + $temp->{author} = $biblio->{author}; + $temp->{datelastseen} = format_date($temp->{datelastseen}); } + push @$res, $temp; + } - if ($markseen or $op) { - $res = GetItemsForInventory( $minlocation, $maxlocation, $location, $itemtype, $ignoreissued, $datelastseen, $branchcode, $branch, $offset, $pagesize, $staton ); - $template->param(loop =>$res, - nextoffset => ($offset+$pagesize), - prevoffset => ($offset?$offset-$pagesize:0), - ); - } - if ( defined $input->param('compareinv2barcd') && ( ( $input->param('compareinv2barcd') eq 'on' ) && ( scalar @brcditems != scalar @$res ) ) && length($uploadbarcodes) > 0 ){ - if ( scalar @brcditems > scalar @$res ){ - for my $brcditem (@brcditems) { - if (! grep( $_->{barcode} =~ /$brcditem->{barcode}/ , @$res) ){ - $brcditem->{notfoundkoha} = 1; - push @$res, $brcditem; - } - } - } else { - my @notfound; - for my $item (@$res) { - if ( ! grep( $_->{barcode} =~ /$item->{barcode}/ , @brcditems) ){ - $item->{notfoundbarcode} = 1; - push @notfound, $item; - } - } - $res = [@$res, @notfound]; + + if (none { $temp->{barcode} eq $_->{barcode} && !$_->{onloan} } @$inventorylist) { + $temp->{wrongplace}=1; + if ($input->param('CSVexport') eq 'on') { + my $biblio = C4::Biblio::GetBiblioData($temp->{biblionumber}); + $temp->{title} = $biblio->{title}; + $temp->{author} = $biblio->{author}; + $temp->{datelastseen} = format_date($temp->{datelastseen}); } + push @$res, $temp; + } +} + +# Finally, modifying datelastseen for remaining items +my $moddatecount = 0; +foreach (@$res) { + unless ($_->{'missingitem'}) { + ModDateLastSeen($_->{'itemnumber'}); + $moddatecount++; } } +# Removing items that don't have any problems from loop +@$res = grep { $_->{missingitem} || $_->{wrongplace} || $_->{changestatus} } @$res; + +$template->param( + moddatecount => $moddatecount, + loop => $res, + nextoffset => ( $offset + $pagesize ), + prevoffset => ( $offset ? $offset - $pagesize : 0 ), + op => $op +); + if (defined $input->param('CSVexport') && $input->param('CSVexport') eq 'on'){ eval {use Text::CSV}; my $csv = Text::CSV->new or @@ -222,14 +276,51 @@ if (defined $input->param('CSVexport') && $input->param('CSVexport') eq 'on'){ -type => 'text/csv', -attachment => 'inventory.csv', ); - for my $re (@$res){ + + my $columns_def_hashref = C4::Reports::Guided::_get_column_defs(); + foreach my $key ( keys %$columns_def_hashref ) { + my $initkey = $key; + $key =~ s/[^\.]*\.//; + $columns_def_hashref->{$initkey}=NormalizeString($columns_def_hashref->{$initkey}); + $columns_def_hashref->{$key} = $columns_def_hashref->{$initkey}; + } + + my @translated_keys; + for my $key (qw / biblioitems.title biblio.author + items.barcode items.itemnumber + items.homebranch items.location + items.itemcallnumber items.notforloan + items.itemlost items.damaged + items.stocknumber + / ) { + push @translated_keys, $columns_def_hashref->{$key}; + } + + $csv->combine(@translated_keys); + print $csv->string, "\n"; + + my @keys = qw / title author barcode itemnumber homebranch location itemcallnumber notforloan lost damaged stocknumber /; + for my $re (@$res) { my @line; - for my $key (keys %$re) { + for my $key (@keys) { push @line, $re->{$key}; } + push @line, "wrong place" if $re->{wrongplace}; + push @line, "missing item" if $re->{missingitem}; + push @line, "change item status" if $re->{changestatus}; $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; } -- 1.7.9.5