Jonathan Druart
0c8496a85a
The selector is not correct, we must to not rely on the number.
This patch fixes a regression caused by bug 28445, but also a
long-standing bug.
* Regression:
The barcode plugin is broken is autoBarcode=<branchcode>yymm0001
There is a JS error in the console:
Uncaught TypeError: form.field_value is undefined
Focustag_952_subfield_p_878344
Focustag_952_subfield_p_878344_handler
jQuery 11
BindEventstag_952_subfield_p_878344
* Long standing bug:
If there are several item forms on the same page, the branchcode is not
correctly retrieved. For instance on the "Serial edition" page there are
2 item forms, the homebranch that is used by the barcode plugin will be
the one from the last form.
Test plan:
* regression
Set autoBarcode=<branchcode>yymm0001
Catalogue a new item, click into the barcode input
Notice that without this patch you get a JS error in the console
* long standing bug
Create a new subscription, select "Create an item record when receiving this serial".
Receive a serial
Open the 2 item forms ("Click to add item")
Select 2 different home library and click the barcode inputs.
The prefix (branchcode) should be correct with this patch applied.
QA Note: it would be way easier if all add item forms were using the new
methods, it could be:
let loc = document.getElementsByName('items.homebranch')[0].value;
Yes, that's all!
Signed-off-by: Hayley Pelham <hayleypelham@catalyst.net.nz>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
106 lines
3.3 KiB
Perl
106 lines
3.3 KiB
Perl
package C4::Barcodes::ValueBuilder;
|
|
|
|
# Copyright 2008-2010 Foundations Bible College
|
|
# Parts copyright 2012 C & P Bibliography Services
|
|
#
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
package C4::Barcodes::ValueBuilder::incremental;
|
|
use Modern::Perl;
|
|
use C4::Context;
|
|
|
|
sub get_barcode {
|
|
my ($args) = @_;
|
|
my $nextnum;
|
|
# not the best, two catalogers could add the same barcode easily this way :/
|
|
my $query = "select max(abs(barcode)) from items";
|
|
my $sth = C4::Context->dbh->prepare($query);
|
|
$sth->execute();
|
|
while (my ($count)= $sth->fetchrow_array) {
|
|
$nextnum = $count;
|
|
}
|
|
$nextnum++;
|
|
return $nextnum;
|
|
}
|
|
|
|
1;
|
|
|
|
package C4::Barcodes::ValueBuilder::hbyymmincr;
|
|
use C4::Context;
|
|
|
|
sub get_barcode {
|
|
my ($args) = @_;
|
|
my $nextnum = 0;
|
|
my $year = substr($args->{year}, -2);
|
|
my $month = $args->{mon};
|
|
my $query = "SELECT MAX(CAST(SUBSTRING(barcode,-4) AS signed)) AS number FROM items WHERE barcode REGEXP ?";
|
|
my $sth = C4::Context->dbh->prepare($query);
|
|
$sth->execute("^[-a-zA-Z]{1,}$year$month");
|
|
while (my ($count)= $sth->fetchrow_array) {
|
|
$nextnum = $count if $count;
|
|
$nextnum = 0 if $nextnum == 9999; # this sequence only allows for cataloging 9999 items per month
|
|
}
|
|
$nextnum++;
|
|
$nextnum = sprintf("%0*d", "4",$nextnum);
|
|
$nextnum = $year . $month . $nextnum;
|
|
my $scr = qq~
|
|
let elt = \$("#"+id);
|
|
let homebranch = elt.parents('fieldset.rows:first')
|
|
.find('input[name="kohafield"][value="items.homebranch"]')
|
|
.siblings("select")
|
|
.val();
|
|
|
|
if ( \$(elt).val() == '' ) {
|
|
\$(elt).val(homebranch + '$nextnum');
|
|
}
|
|
~;
|
|
return $nextnum, $scr;
|
|
}
|
|
|
|
|
|
package C4::Barcodes::ValueBuilder::annual;
|
|
use C4::Context;
|
|
|
|
sub get_barcode {
|
|
my ($args) = @_;
|
|
my $nextnum;
|
|
my $query = "select max(cast( substring_index(barcode, '-',-1) as signed)) from items where barcode like ?";
|
|
my $sth=C4::Context->dbh->prepare($query);
|
|
$sth->execute($args->{year} . '-%');
|
|
while (my ($count)= $sth->fetchrow_array) {
|
|
$nextnum = $count if $count;
|
|
}
|
|
$nextnum++;
|
|
$nextnum = sprintf("%0*d", "4",$nextnum);
|
|
$nextnum = "$args->{year}-$nextnum";
|
|
return $nextnum;
|
|
}
|
|
|
|
1;
|
|
|
|
|
|
=head1 Barcodes::ValueBuilder
|
|
|
|
This module is intended as a shim to ease the eventual transition from
|
|
having all barcode-related code in the value builder plugin .pl file
|
|
to using C4::Barcodes. Since the shift will require a rather significant
|
|
amount of refactoring, this module will return value builder-formatted
|
|
results, at first by merely running the code that was formerly in the
|
|
barcodes.pl value builder, but later by using C4::Barcodes.
|
|
|
|
=cut
|
|
|
|
1;
|