Attachment #101646 for bug #24857

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




use Modern::Perl;

use CGI qw ( -utf8 );
use List::MoreUtils qw/any/;
use MARC::File::XML;
use Storable qw(thaw freeze);
use URI::Escape;

use C4::Auth;
use C4::Output;
use C4::Biblio;
use C4::Items;
use C4::Context;
use C4::Circulation;
use C4::Koha;
use C4::ClassSource;
use C4::Context;
use C4::Items;
use C4::Koha;
use C4::Members;
use C4::Output;
use C4::Search;

use Koha::Biblio::Volume::Items;
use Koha::Biblio::Volumes;
use Koha::DateUtils;
use Koha::Items;
use Koha::ItemTypes;
use Koha::Items;
use Koha::Libraries;
use Koha::Patrons;
use List::MoreUtils qw/any/;
use C4::Search;
use Storable qw(thaw freeze);
use URI::Escape;
use C4::Members;

use MARC::File::XML;
use URI::Escape;

our $dbh = C4::Context->dbh;


    }
}

sub add_item_to_volume {
    my ( $biblionumber, $itemnumber, $volume, $volume_description ) = @_;

    return unless $volume;

    my $volume_id;
    if ( $volume eq 'create' ) {
        my $volume = Koha::Biblio::Volume->new(
            {
                biblionumber => $biblionumber,
                description  => $volume_description,
            }
        )->store();

        $volume_id = $volume->id;
    }
    else {
        $volume_id = $volume;
    }

    my $volume_item = Koha::Biblio::Volume::Item->new(
        {
            itemnumber => $itemnumber,
            volume_id  => $volume_id,
        }
    )->store();
}

# NOTE: This code is subject to change in the future with the implemenation of ajax based autobarcode code
# NOTE: 'incremental' is the ONLY autoBarcode option available to those not using javascript
sub _increment_barcode {

my $fa_branch             = $input->param('branch');
my $fa_stickyduedate      = $input->param('stickyduedate');
my $fa_duedatespec        = $input->param('duedatespec');
my $volume                = $input->param('volume');
my $volume_description    = $input->param('volume_description');

my $frameworkcode = &GetFrameworkCode($biblionumber);


        unless ($exist_itemnumber) {
            my ( $oldbiblionumber, $oldbibnum, $oldbibitemnum ) = AddItemFromMarc( $record, $biblionumber );
            set_item_default_location($oldbibitemnum);
            add_item_to_volume( $oldbiblionumber, $oldbibitemnum, $volume, $volume_description );

            # Pushing the last created item cookie back
            if ($prefillitem && defined $record) {

        if (!$exist_itemnumber) {
            my ($oldbiblionumber,$oldbibnum,$oldbibitemnum) = AddItemFromMarc($record,$biblionumber);
            set_item_default_location($oldbibitemnum);
            add_item_to_volume( $oldbiblionumber, $oldbibitemnum, $volume, $volume_description );

            # We count the item only if it was really added
            # That way, all items are added, even if there was some already existing barcodes


# what's the next op ? it's what we are not in : an add if we're editing, otherwise, and edit.
$template->param(
    volumes      => scalar Koha::Biblio::Volumes->search({ biblionumber => $biblionumber }),
    biblionumber => $biblionumber,
    title        => $oldrecord->{title},
    author       => $oldrecord->{author},

Lines 15-20 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt (+30 lines)
15	[% INCLUDE 'calendar.inc' %]	15	[% INCLUDE 'calendar.inc' %]
16	[% INCLUDE 'str/cataloging_additem.inc' %]	16	[% INCLUDE 'str/cataloging_additem.inc' %]
17	[% Asset.js("js/cataloging_additem.js") \| $raw %]	17	[% Asset.js("js/cataloging_additem.js") \| $raw %]
		18	<script>
		19	var has_volumes = [% volumes.count %];
		20	</script>
18	</head>	21	</head>
19		22
20	<body id="cat_additem" class="cat">	23	<body id="cat_additem" class="cat">
Lines 210-215 Link Here
210	<input type="hidden" name="indicator" value=" " />	213	<input type="hidden" name="indicator" value=" " />
211	<input type="hidden" name="itemnumber" value="[% itemnumber \| html %]" />	214	<input type="hidden" name="itemnumber" value="[% itemnumber \| html %]" />
212		215
		216	[% IF volumes.count && op != 'saveitem' %]
		217	<fieldset class="rows">
		218	<legend><i class="fa fa-plus"></i> Add to volume</legend>
		219
		220	<p>
		221	<label for="select_volume">Options: </label>
		222	<select name="volume" id="volume-add-or-create-form-select">
		223	<optgroup label="Use existing volume">
		224	[% FOREACH v IN volumes %]
		225	<option value="[% v.id \| html %]">Use: [% v.description \| html %]</option>
		226	[% END %]
		227	</optgroup>
		228	<optgroup label="Other options">
		229	<option id="volume-add-or-create-form-no-add" value="">Do not add to volume</option>
		230	<option value="create">Create new volume</option>
		231	</optgroup>
		232	</select>
		233	</p>
		234
		235	<p id="volume-add-or-create-form-description-block">
		236	<label for="volume_description" class="required">Name: </label>
		237	<input name="volume_description" id="volume-add-or-create-form-description" type="text" size="30" class="required" />
		238	<span class="required">Required</span>
		239	</p>
		240	</fieldset>
		241	[% END %]
		242
213	<fieldset class="action"> [% IF op != 'saveitem' %]	243	<fieldset class="action"> [% IF op != 'saveitem' %]
214	<input type="submit" name="phony_submit" value="phony_submit" id="phony_submit" style="display:none;" onclick="return false;" />	244	<input type="submit" name="phony_submit" value="phony_submit" id="phony_submit" style="display:none;" onclick="return false;" />
215	<!-- Note : We use here a false submit button because we have several submit buttons and we don't want the user to believe they validated the adding of multiple items	245	<!-- Note : We use here a false submit button because we have several submit buttons and we don't want the user to believe they validated the adding of multiple items




    });

    $('.subfield_line select').select2();

    // Add new item to volume
    if ( has_volumes ) {
        $('#volume-add-or-create-form-description-block').hide();
        $('#volume-add-or-create-form-no-add').attr('selected', 'selected' );

        $('#volume-add-or-create-form-select').on('change', function(){
            if ( $(this).val() == 'create' ) {
                $('#volume-add-or-create-form-description')
                    .addClass('required')
                    .attr( 'required', 'required' );
                $('#volume-add-or-create-form-description-block').show();
            } else {
                $('#volume-add-or-create-form-description')
                    .removeClass('required')
                    .removeAttr('required');
                $('#volume-add-or-create-form-description-block').hide();
            }
        });
    }

});

function Check(f) {
- 

Return to bug 24857

Lines 73-78 $(document).ready(function(){ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/cataloging_additem.js (-1 / +21 lines)
73	});	73	});
74		74
75	$('.subfield_line select').select2();	75	$('.subfield_line select').select2();
		76
		77	// Add new item to volume
		78	if ( has_volumes ) {
		79	$('#volume-add-or-create-form-description-block').hide();
		80	$('#volume-add-or-create-form-no-add').attr('selected', 'selected' );
		81
		82	$('#volume-add-or-create-form-select').on('change', function(){
		83	if ( $(this).val() == 'create' ) {
		84	$('#volume-add-or-create-form-description')
		85	.addClass('required')
		86	.attr( 'required', 'required' );
		87	$('#volume-add-or-create-form-description-block').show();
		88	} else {
		89	$('#volume-add-or-create-form-description')
		90	.removeClass('required')
		91	.removeAttr('required');
		92	$('#volume-add-or-create-form-description-block').hide();
		93	}
		94	});
		95	}
		96
76	});	97	});
77		98
78	function Check(f) {	99	function Check(f) {
79	-

Lines 22-48 Link Here

(-)a/cataloguing/additem.pl (-13 / +48 lines)
22	use Modern::Perl;	22	use Modern::Perl;
23		23
24	use CGI qw ( -utf8 );	24	use CGI qw ( -utf8 );
		25	use List::MoreUtils qw/any/;
		26	use MARC::File::XML;
		27	use Storable qw(thaw freeze);
		28	use URI::Escape;
		29
25	use C4::Auth;	30	use C4::Auth;
26	use C4::Output;
27	use C4::Biblio;	31	use C4::Biblio;
28	use C4::Items;
29	use C4::Context;
30	use C4::Circulation;	32	use C4::Circulation;
31	use C4::Koha;
32	use C4::ClassSource;	33	use C4::ClassSource;
		34	use C4::Context;
		35	use C4::Items;
		36	use C4::Koha;
		37	use C4::Members;
		38	use C4::Output;
		39	use C4::Search;
		40
		41	use Koha::Biblio::Volume::Items;
		42	use Koha::Biblio::Volumes;
33	use Koha::DateUtils;	43	use Koha::DateUtils;
34	use Koha::Items;
35	use Koha::ItemTypes;	44	use Koha::ItemTypes;
		45	use Koha::Items;
36	use Koha::Libraries;	46	use Koha::Libraries;
37	use Koha::Patrons;	47	use Koha::Patrons;
38	use List::MoreUtils qw/any/;
39	use C4::Search;
40	use Storable qw(thaw freeze);
41	use URI::Escape;
42	use C4::Members;
43
44	use MARC::File::XML;
45	use URI::Escape;
46		48
47	our $dbh = C4::Context->dbh;	49	our $dbh = C4::Context->dbh;
48		50
Lines 91-96 sub set_item_default_location { Link Here
91	}	93	}
92	}	94	}
93		95
		96	sub add_item_to_volume {
		97	my ( $biblionumber, $itemnumber, $volume, $volume_description ) = @_;
		98
		99	return unless $volume;
		100
		101	my $volume_id;
		102	if ( $volume eq 'create' ) {
		103	my $volume = Koha::Biblio::Volume->new(
		104	{
		105	biblionumber => $biblionumber,
		106	description => $volume_description,
		107	}
		108	)->store();
		109
		110	$volume_id = $volume->id;
		111	}
		112	else {
		113	$volume_id = $volume;
		114	}
		115
		116	my $volume_item = Koha::Biblio::Volume::Item->new(
		117	{
		118	itemnumber => $itemnumber,
		119	volume_id => $volume_id,
		120	}
		121	)->store();
		122	}
		123
94	# NOTE: This code is subject to change in the future with the implemenation of ajax based autobarcode code	124	# NOTE: This code is subject to change in the future with the implemenation of ajax based autobarcode code
95	# NOTE: 'incremental' is the ONLY autoBarcode option available to those not using javascript	125	# NOTE: 'incremental' is the ONLY autoBarcode option available to those not using javascript
96	sub _increment_barcode {	126	sub _increment_barcode {
Lines 394-399 my $fa_barcode = $input->param('barcode'); Link Here
394	my $fa_branch = $input->param('branch');	424	my $fa_branch = $input->param('branch');
395	my $fa_stickyduedate = $input->param('stickyduedate');	425	my $fa_stickyduedate = $input->param('stickyduedate');
396	my $fa_duedatespec = $input->param('duedatespec');	426	my $fa_duedatespec = $input->param('duedatespec');
		427	my $volume = $input->param('volume');
		428	my $volume_description = $input->param('volume_description');
397		429
398	my $frameworkcode = &GetFrameworkCode($biblionumber);	430	my $frameworkcode = &GetFrameworkCode($biblionumber);
399		431
Lines 503-508 if ($op eq "additem") { Link Here
503	unless ($exist_itemnumber) {	535	unless ($exist_itemnumber) {
504	my ( $oldbiblionumber, $oldbibnum, $oldbibitemnum ) = AddItemFromMarc( $record, $biblionumber );	536	my ( $oldbiblionumber, $oldbibnum, $oldbibitemnum ) = AddItemFromMarc( $record, $biblionumber );
505	set_item_default_location($oldbibitemnum);	537	set_item_default_location($oldbibitemnum);
		538	add_item_to_volume( $oldbiblionumber, $oldbibitemnum, $volume, $volume_description );
506		539
507	# Pushing the last created item cookie back	540	# Pushing the last created item cookie back
508	if ($prefillitem && defined $record) {	541	if ($prefillitem && defined $record) {
Lines 602-607 if ($op eq "additem") { Link Here
602	if (!$exist_itemnumber) {	635	if (!$exist_itemnumber) {
603	my ($oldbiblionumber,$oldbibnum,$oldbibitemnum) = AddItemFromMarc($record,$biblionumber);	636	my ($oldbiblionumber,$oldbibnum,$oldbibitemnum) = AddItemFromMarc($record,$biblionumber);
604	set_item_default_location($oldbibitemnum);	637	set_item_default_location($oldbibitemnum);
		638	add_item_to_volume( $oldbiblionumber, $oldbibitemnum, $volume, $volume_description );
605		639
606	# We count the item only if it was really added	640	# We count the item only if it was really added
607	# That way, all items are added, even if there was some already existing barcodes	641	# That way, all items are added, even if there was some already existing barcodes
Lines 938-943 my $item = Koha::Items->find($itemnumber); # We certainly want to fetch it earli Link Here
938		972
939	# what's the next op ? it's what we are not in : an add if we're editing, otherwise, and edit.	973	# what's the next op ? it's what we are not in : an add if we're editing, otherwise, and edit.
940	$template->param(	974	$template->param(
		975	volumes => scalar Koha::Biblio::Volumes->search({ biblionumber => $biblionumber }),
941	biblionumber => $biblionumber,	976	biblionumber => $biblionumber,
942	title => $oldrecord->{title},	977	title => $oldrecord->{title},
943	author => $oldrecord->{author},	978	author => $oldrecord->{author},