Attachment #136343 for bug #28854

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





                // Toolbar
                var bundle_toolbar = $('<div id="toolbar" class="btn-toolbar"></div>');
                bundle_toolbar.append('<a class="btn btn-default" data-toggle="modal" data-target="#addToBundleModal" data-item="' + itemnumber + '"><i class="fa fa-plus"></i> ' + _("Add to bundle") + '</a>');
                bundle_toolbar.append('<a class="btn btn-default" data-toggle="modal" data-target="#removeFromBundleModal" data-item="' + itemnumber + '"><i class="fa fa-minus"></i> ' + _("Remove from bundle") + '</a>');

                // This is the table we'll convert into a DataTable
                var bundles_table = $('<table class="display tbundle" data-itemnumber="'+itemnumber+'" id="bundle_table_'+itemnumber+'" width="100%"/>');

                    "columns": [
                        {
                            "data": "biblio.title:biblio.medium",
                            "title": _("Title"),
                            "searchable": true,
                            "orderable": true,
                            "render": function(data, type, row, meta) {

                        },
                        {
                            "data": "biblio.author",
                            "title": _("Author"),
                            "searchable": true,
                            "orderable": true,
                        },
                        {
                            "data": "collection_code",
                            "title": _("Collection"),
                            "searchable": true,
                            "orderable": true,
                        },
                        {
                            "data": "item_type",
                            "title": _("Item type"),
                            "searchable": false,
                            "orderable": true,
                        },
                        {
                            "data": "callnumber",
                            "title": _("Callnumber"),
                            "searchable": true,
                            "orderable": true,
                        },
                        {
                            "data": "external_id",
                            "title": _("Barcode"),
                            "searchable": true,
                            "orderable": true,
                        },
                        {
                            "data": "lost_status:last_seen_date:return_claim.patron",
                            "title": _("Status"),
                            "searchable": false,
                            "orderable": true,
                            "render": function(data, type, row, meta) {

                                var result = '<button class="btn btn-default btn-xs remove" role="button" data-itemnumber="'+row.item_id+'"><i class="fa fa-minus" aria-hidden="true"></i> '+_("Remove")+'</button>\n';
                                return result;
                            },
                            "title": _("Actions"),
                            "searchable": false,
                            "orderable": false,
                            "class": "noExport"

                  /* Report the results */
                  posting.done(function(data) {
                      var barcode = $('#external_id').val();
                      $('#addResult').replaceWith('<div id="addResult" class="alert alert-success">'+_("Success: Added '%s'").format(barcode)+'</div>');
                      $('#external_id').val('').focus();
                      bundle_changed = 1;
                  });

                      if ( data.status === 409 ) {
                          var response = data.responseJSON;
                          if ( response.key === "PRIMARY" ) {
                              $('#addResult').replaceWith('<div id="addResult" class="alert alert-warning">'+_("Warning: Item '%s' aready attached").format(barcode)+'</div>');
                          } else {
                              $('#addResult').replaceWith('<div id="addResult" class="alert alert-danger">'+_("Failure: Item '%s' belongs to another bundle").format(barcode)+'</div>');
                          }
                      } else {
                          $('#addResult').replaceWith('<div id="addResult" class="alert alert-danger">'+_("Failure: Check the logs for details")+'</div>');
                      }
                      $('#external_id').val('').focus();
                  });

                        /* Report the results */
                        deleteReq.done(function(data) {
                            var barcode = $('#rm_external_id').val();
                            $('#removeResult').replaceWith('<div id="removeResult" class="alert alert-success">'+_("Success: Removed '%s'").format(barcode)+'</div>');
                            $('#rm_external_id').val('').focus();
                            bundle_changed = 1;
                        });

                            if ( data.status === 409 ) {
                                var response = data.responseJSON;
                                if ( response.key === "PRIMARY" ) {
                                    $('#removeResult').replaceWith('<div id="removeResult" class="alert alert-warning">'+_("Warning: Item '%s' already attached").format(barcode)+'</div>');
                                } else {
                                    $('#removeResult').replaceWith('<div id="removeResult" class="alert alert-danger">'+_("Failure: Item '%s' belongs to another bundle").format(barcode)+'</div>');
                                }
                            } else {
                                $('#removeResult').replaceWith('<div id="removeResult" class="alert alert-danger">'+_("Failure: Check the logs for details")+'</div>');
                            }
                            $('#rm_external_id').val('').focus();
                        });
                    } else {
                        $('#removeResult').replaceWith('<div id="removeResult" class="alert alert-danger">'+_("Failed: Barcode matched more than one item '%s'").format(barcode)+'</div>');
                    }
                });
                itemReq.fail(function(data) {
                     $('#removeResult').replaceWith('<div id="removeResult" class="alert alert-danger">'+_("Failed: Item not found '%s'").format(barcode)+'</div>');
                    $('#rm_external_id').val('').focus();

                });




                                            <table class="table table-condensed table-bordered" id="items-bundle-contents-table">
                                                <thead>
                                                    <tr>
                                                        <th>Title</th>
                                                        <th>Author</th>
                                                        <th>Item type</th>
                                                        <th>Barcode</th>
                                                        [% IF !item.onloan %]
                                                        <th>Status</th>
                                                        [% END %]
                                                    </tr>
                                                </thead>

                                                <label for="verify-items-bundle-contents-barcodes">Barcodes <span id="verify-progress" class="pull-right" style="display: none"><span id="verified">0</span> of <span id="expected"></span> verified</span></label>
                                                <textarea autocomplete="off" id="verify-items-bundle-contents-barcodes" name="verify-items-bundle-contents-barcodes" class="form-control"></textarea>
                                                [% IF item.onloan %]
                                                <div class="help-block">Scan all barcodes of items found in the items bundle. If any items are missing, they will be marked as lost</div>
                                                [% ELSE %]
                                                <div class="help-block">Optionally scan all barcodes of items found in the items bundle to perform an inventory check. If any items are missing, they will be marked as lost</div>
                                                [% END %]
                                            </div>


                                            <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
                                            [% END %]
                                            [% IF item.onloan %]
                                            <button type="submit" class="btn btn-default"><i class="fa fa-check"></i> Confirm checkin and mark missing items as lost</button>
                                            [% ELSE %]
                                            <button type="submit" class="btn btn-default"><i class="fa fa-check"></i> Confirm inventory check and mark items as lost</button>
                                            [% END %]
                                            <button type="button" data-dismiss="modal" class="btn btn-default"><i class="fa fa-close"></i> Cancel</button>
                                        </div>
                                    </form>
                                </div>
- 

Return to bug 28854

Lines 1448-1455 Note that permanent location is a code, and location may be an authval. Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-20 / +20 lines)
1448		1448
1449	// Toolbar	1449	// Toolbar
1450	var bundle_toolbar = $('<div id="toolbar" class="btn-toolbar"></div>');	1450	var bundle_toolbar = $('<div id="toolbar" class="btn-toolbar"></div>');
1451	bundle_toolbar.append('<a class="btn btn-default" data-toggle="modal" data-target="#addToBundleModal" data-item="' + itemnumber + '"><i class="fa fa-plus"></i> Add to bundle</a>');	1451	bundle_toolbar.append('<a class="btn btn-default" data-toggle="modal" data-target="#addToBundleModal" data-item="' + itemnumber + '"><i class="fa fa-plus"></i> ' + _("Add to bundle") + '</a>');
1452	bundle_toolbar.append('<a class="btn btn-default" data-toggle="modal" data-target="#removeFromBundleModal" data-item="' + itemnumber + '"><i class="fa fa-minus"></i> Remove from bundle</a>');	1452	bundle_toolbar.append('<a class="btn btn-default" data-toggle="modal" data-target="#removeFromBundleModal" data-item="' + itemnumber + '"><i class="fa fa-minus"></i> ' + _("Remove from bundle") + '</a>');
1453		1453
1454	// This is the table we'll convert into a DataTable	1454	// This is the table we'll convert into a DataTable
1455	var bundles_table = $('<table class="display tbundle" data-itemnumber="'+itemnumber+'" id="bundle_table_'+itemnumber+'" width="100%"/>');	1455	var bundles_table = $('<table class="display tbundle" data-itemnumber="'+itemnumber+'" id="bundle_table_'+itemnumber+'" width="100%"/>');
Lines 1481-1487 Note that permanent location is a code, and location may be an authval. Link Here
1481	"columns": [	1481	"columns": [
1482	{	1482	{
1483	"data": "biblio.title:biblio.medium",	1483	"data": "biblio.title:biblio.medium",
1484	"title": "Title",	1484	"title": _("Title"),
1485	"searchable": true,	1485	"searchable": true,
1486	"orderable": true,	1486	"orderable": true,
1487	"render": function(data, type, row, meta) {	1487	"render": function(data, type, row, meta) {
Lines 1500-1536 Note that permanent location is a code, and location may be an authval. Link Here
1500	},	1500	},
1501	{	1501	{
1502	"data": "biblio.author",	1502	"data": "biblio.author",
1503	"title": "Author",	1503	"title": _("Author"),
1504	"searchable": true,	1504	"searchable": true,
1505	"orderable": true,	1505	"orderable": true,
1506	},	1506	},
1507	{	1507	{
1508	"data": "collection_code",	1508	"data": "collection_code",
1509	"title": "Collection code",	1509	"title": _("Collection"),
1510	"searchable": true,	1510	"searchable": true,
1511	"orderable": true,	1511	"orderable": true,
1512	},	1512	},
1513	{	1513	{
1514	"data": "item_type",	1514	"data": "item_type",
1515	"title": "Item Type",	1515	"title": _("Item type"),
1516	"searchable": false,	1516	"searchable": false,
1517	"orderable": true,	1517	"orderable": true,
1518	},	1518	},
1519	{	1519	{
1520	"data": "callnumber",	1520	"data": "callnumber",
1521	"title": "Callnumber",	1521	"title": _("Callnumber"),
1522	"searchable": true,	1522	"searchable": true,
1523	"orderable": true,	1523	"orderable": true,
1524	},	1524	},
1525	{	1525	{
1526	"data": "external_id",	1526	"data": "external_id",
1527	"title": "Barcode",	1527	"title": _("Barcode"),
1528	"searchable": true,	1528	"searchable": true,
1529	"orderable": true,	1529	"orderable": true,
1530	},	1530	},
1531	{	1531	{
1532	"data": "lost_status:last_seen_date:return_claim.patron",	1532	"data": "lost_status:last_seen_date:return_claim.patron",
1533	"title": "Status",	1533	"title": _("Status"),
1534	"searchable": false,	1534	"searchable": false,
1535	"orderable": true,	1535	"orderable": true,
1536	"render": function(data, type, row, meta) {	1536	"render": function(data, type, row, meta) {
Lines 1552-1558 Note that permanent location is a code, and location may be an authval. Link Here
1552	var result = '<button class="btn btn-default btn-xs remove" role="button" data-itemnumber="'+row.item_id+'"><i class="fa fa-minus" aria-hidden="true"></i> '+_("Remove")+'</button>\n';	1552	var result = '<button class="btn btn-default btn-xs remove" role="button" data-itemnumber="'+row.item_id+'"><i class="fa fa-minus" aria-hidden="true"></i> '+_("Remove")+'</button>\n';
1553	return result;	1553	return result;
1554	},	1554	},
1555	"title": "Actions",	1555	"title": _("Actions"),
1556	"searchable": false,	1556	"searchable": false,
1557	"orderable": false,	1557	"orderable": false,
1558	"class": "noExport"	1558	"class": "noExport"
Lines 1608-1614 Note that permanent location is a code, and location may be an authval. Link Here
1608	/* Report the results */	1608	/* Report the results */
1609	posting.done(function(data) {	1609	posting.done(function(data) {
1610	var barcode = $('#external_id').val();	1610	var barcode = $('#external_id').val();
1611	$('#addResult').replaceWith('<div id="addResult" class="alert alert-success">Success: Added '+barcode+'</div>');	1611	$('#addResult').replaceWith('<div id="addResult" class="alert alert-success">'+_("Success: Added '%s'").format(barcode)+'</div>');
1612	$('#external_id').val('').focus();	1612	$('#external_id').val('').focus();
1613	bundle_changed = 1;	1613	bundle_changed = 1;
1614	});	1614	});
Lines 1617-1628 Note that permanent location is a code, and location may be an authval. Link Here
1617	if ( data.status === 409 ) {	1617	if ( data.status === 409 ) {
1618	var response = data.responseJSON;	1618	var response = data.responseJSON;
1619	if ( response.key === "PRIMARY" ) {	1619	if ( response.key === "PRIMARY" ) {
1620	$('#addResult').replaceWith('<div id="addResult" class="alert alert-warning">Warning: Item '+barcode+' already attached</div>');	1620	$('#addResult').replaceWith('<div id="addResult" class="alert alert-warning">'+_("Warning: Item '%s' aready attached").format(barcode)+'</div>');
1621	} else {	1621	} else {
1622	$('#addResult').replaceWith('<div id="addResult" class="alert alert-danger">Failure: Item '+barcode+' belongs to another bundle</div>');	1622	$('#addResult').replaceWith('<div id="addResult" class="alert alert-danger">'+_("Failure: Item '%s' belongs to another bundle").format(barcode)+'</div>');
1623	}	1623	}
1624	} else {	1624	} else {
1625	$('#addResult').replaceWith('<div id="addResult" class="alert alert-danger">Failure: Check the logs for details</div>');	1625	$('#addResult').replaceWith('<div id="addResult" class="alert alert-danger">'+_("Failure: Check the logs for details")+'</div>');
1626	}	1626	}
1627	$('#external_id').val('').focus();	1627	$('#external_id').val('').focus();
1628	});	1628	});
Lines 1675-1681 Note that permanent location is a code, and location may be an authval. Link Here
1675	/* Report the results */	1675	/* Report the results */
1676	deleteReq.done(function(data) {	1676	deleteReq.done(function(data) {
1677	var barcode = $('#rm_external_id').val();	1677	var barcode = $('#rm_external_id').val();
1678	$('#removeResult').replaceWith('<div id="removeResult" class="alert alert-success">'+_("Success: Removed ")+barcode+'</div>');	1678	$('#removeResult').replaceWith('<div id="removeResult" class="alert alert-success">'+_("Success: Removed '%s'").format(barcode)+'</div>');
1679	$('#rm_external_id').val('').focus();	1679	$('#rm_external_id').val('').focus();
1680	bundle_changed = 1;	1680	bundle_changed = 1;
1681	});	1681	});
Lines 1684-1704 Note that permanent location is a code, and location may be an authval. Link Here
1684	if ( data.status === 409 ) {	1684	if ( data.status === 409 ) {
1685	var response = data.responseJSON;	1685	var response = data.responseJSON;
1686	if ( response.key === "PRIMARY" ) {	1686	if ( response.key === "PRIMARY" ) {
1687	$('#removeResult').replaceWith('<div id="removeResult" class="alert alert-warning">Warning: Item '+barcode+' already attached</div>');	1687	$('#removeResult').replaceWith('<div id="removeResult" class="alert alert-warning">'+_("Warning: Item '%s' already attached").format(barcode)+'</div>');
1688	} else {	1688	} else {
1689	$('#removeResult').replaceWith('<div id="removeResult" class="alert alert-danger">Failure: Item '+barcode+' belongs to another bundle</div>');	1689	$('#removeResult').replaceWith('<div id="removeResult" class="alert alert-danger">'+_("Failure: Item '%s' belongs to another bundle").format(barcode)+'</div>');
1690	}	1690	}
1691	} else {	1691	} else {
1692	$('#removeResult').replaceWith('<div id="removeResult" class="alert alert-danger">Failure: Check the logs for details</div>');	1692	$('#removeResult').replaceWith('<div id="removeResult" class="alert alert-danger">'+_("Failure: Check the logs for details")+'</div>');
1693	}	1693	}
1694	$('#rm_external_id').val('').focus();	1694	$('#rm_external_id').val('').focus();
1695	});	1695	});
1696	} else {	1696	} else {
1697	$('#removeResult').replaceWith('<div id="removeResult" class="alert alert-danger">'+_("Failed: Barcode matched more than one item ")+barcode+'</div>');	1697	$('#removeResult').replaceWith('<div id="removeResult" class="alert alert-danger">'+_("Failed: Barcode matched more than one item '%s'").format(barcode)+'</div>');
1698	}	1698	}
1699	});	1699	});
1700	itemReq.fail(function(data) {	1700	itemReq.fail(function(data) {
1701	$('#removeResult').replaceWith('<div id="removeResult" class="alert alert-danger">'+_("Failed: Item not found ")+barcode+'</div>');	1701	$('#removeResult').replaceWith('<div id="removeResult" class="alert alert-danger">'+_("Failed: Item not found '%s'").format(barcode)+'</div>');
1702	$('#rm_external_id').val('').focus();	1702	$('#rm_external_id').val('').focus();
1703		1703
1704	});	1704	});

Lines 436-447 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-11 / +10 lines)
436	<table class="table table-condensed table-bordered" id="items-bundle-contents-table">	436	<table class="table table-condensed table-bordered" id="items-bundle-contents-table">
437	<thead>	437	<thead>
438	<tr>	438	<tr>
439	<th>[% t('Title') \| html %]</th>	439	<th>Title</th>
440	<th>[% t('Author') \| html %]</th>	440	<th>Author</th>
441	<th>[% t('Item type') \| html %]</th>	441	<th>Item type</th>
442	<th>[% t('Barcode') \| html %]</th>	442	<th>Barcode</th>
443	[% IF !item.onloan %]	443	[% IF !item.onloan %]
444	<th>[% t('Status') \| html %]</th>	444	<th>Status</th>
445	[% END %]	445	[% END %]
446	</tr>	446	</tr>
447	</thead>	447	</thead>
Lines 478-486 Link Here
478	<label for="verify-items-bundle-contents-barcodes">Barcodes <span id="verify-progress" class="pull-right" style="display: none"><span id="verified">0</span> of <span id="expected"></span> verified</span></label>	478	<label for="verify-items-bundle-contents-barcodes">Barcodes <span id="verify-progress" class="pull-right" style="display: none"><span id="verified">0</span> of <span id="expected"></span> verified</span></label>
479	<textarea autocomplete="off" id="verify-items-bundle-contents-barcodes" name="verify-items-bundle-contents-barcodes" class="form-control"></textarea>	479	<textarea autocomplete="off" id="verify-items-bundle-contents-barcodes" name="verify-items-bundle-contents-barcodes" class="form-control"></textarea>
480	[% IF item.onloan %]	480	[% IF item.onloan %]
481	<div class="help-block">[% t('Scan all barcodes of items found in the items bundle. If any items are missing, they will be marked as lost') \| html %]</div>	481	<div class="help-block">Scan all barcodes of items found in the items bundle. If any items are missing, they will be marked as lost</div>
482	[% ELSE %]	482	[% ELSE %]
483	<div class="help-block">[% t('Optionally scan all barcodes of items found in the items bundle to perform an inventory check. If any items are missing, they will be marked as lost') \| html %]</div>	483	<div class="help-block">Optionally scan all barcodes of items found in the items bundle to perform an inventory check. If any items are missing, they will be marked as lost</div>
484	[% END %]	484	[% END %]
485	</div>	485	</div>
486		486
Lines 496-506 Link Here
496	<input type="hidden" name="bn-[% inputloo.counter \| html %]" value="[% inputloo.borrowernumber \| html %]" />	496	<input type="hidden" name="bn-[% inputloo.counter \| html %]" value="[% inputloo.borrowernumber \| html %]" />
497	[% END %]	497	[% END %]
498	[% IF item.onloan %]	498	[% IF item.onloan %]
499	<button type="submit" class="btn btn-default"><i class="fa fa-check"></i> [% t('Confirm checkin and mark missing items as lost') \| html %]</button>	499	<button type="submit" class="btn btn-default"><i class="fa fa-check"></i> Confirm checkin and mark missing items as lost</button>
500	[% ELSE %]	500	[% ELSE %]
501	<button type="submit" class="btn btn-default"><i class="fa fa-check"></i> [% t('Confirm inventory check and mark items as lost') \| html %]</button>	501	<button type="submit" class="btn btn-default"><i class="fa fa-check"></i> Confirm inventory check and mark items as lost</button>
502	[% END %]	502	[% END %]
503	<button type="button" data-dismiss="modal" class="btn btn-default"><i class="fa fa-close"></i> [% t('Cancel') \| html %]</button>	503	<button type="button" data-dismiss="modal" class="btn btn-default"><i class="fa fa-close"></i> Cancel</button>
504	</div>	504	</div>
505	</form>	505	</form>
506	</div>	506	</div>
507	-