Attachment #71613 for bug #20194

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

Lines 336-341 modules: Link Here

(-)a/admin/columns_settings.yml (+2 lines)
336	columnname: title	336	columnname: title
337	-	337	-
338	columnname: item_type	338	columnname: item_type
		339	-
		340	columnname: ccode
339	-	341	-
340	columnname: location	342	columnname: location
341	-	343	-

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc (-1 / +1 lines)
1	<tfoot>	1	<tfoot>
2	<tr>	2	<tr>
3	<td colspan="11" style="text-align: right; font-weight:bold;">Totals:</td>	3	<td colspan="12" style="text-align: right; font-weight:bold;">Totals:</td>
4	<td id="totaldue" style="text-align: right;">[% totaldue %]</td>	4	<td id="totaldue" style="text-align: right;">[% totaldue %]</td>
5	<td id="totalfine" style="text-align: right;">[% finetotal %]</td>	5	<td id="totalfine" style="text-align: right;">[% finetotal %]</td>
6	<td id="totalprice" style="text-align: right;">[% totalprice %]</td>	6	<td id="totalprice" style="text-align: right;">[% totalprice %]</td>

Lines 16-21 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc (+1 lines)
16	<th scope="col">Due date</th>	16	<th scope="col">Due date</th>
17	<th scope="col">Title</th>	17	<th scope="col">Title</th>
18	<th scope="col">Item type</th>	18	<th scope="col">Item type</th>
		19	<th scope="col">Collection</th>
19	<th scope="col">Location</th>	20	<th scope="col">Location</th>
20	<th scope="col">Home library</th>	21	<th scope="col">Home library</th>
21	<th scope="col">Checked out on</th>	22	<th scope="col">Checked out on</th>

Lines 980-985 No patron matched <span class="ex">[% message \| html %]</span> Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (+1 lines)
980	<th scope="col">Due date</th>	980	<th scope="col">Due date</th>
981	<th scope="col">Title</th>	981	<th scope="col">Title</th>
982	<th scope="col">Item type</th>	982	<th scope="col">Item type</th>
		983	<th scope="col">Collection</th>
983	<th scope="col">Location</th>	984	<th scope="col">Location</th>
984	<th scope="col">Checked out on</th>	985	<th scope="col">Checked out on</th>
985	<th scope="col">Checked out from</th>	986	<th scope="col">Checked out from</th>




                    },
                    "sType": "anti-the"
                },
                {
                    "mDataProp": function ( oObj ) {
                        let itemtypes = [];

                        if ('itemtype' in oObj.itemtypes) {
                            itemtypes.push(oObj.itemtypes.itemtype.translated_description);
                        }

                        if ('itype' in oObj.itemtypes) {
                            itemtypes.push(oObj.itemtypes.itype.translated_description);
                        }

                        return itemtypes.join('<br>');
                    }
                },
                { "mDataProp": "ccode" },
                { "mDataProp": "location" },
                { "mDataProp": "homebranch" },
                { "mDataProp": "issuedate_formatted" },

                        },
                        "sType": "anti-the"
                    },
                    {
                        "mDataProp": function ( oObj ) {
                            let itemtypes = [];

                            if ('itemtype' in oObj.itemtypes) {
                                itemtypes.push(oObj.itemtypes.itemtype.translated_description);
                            }

                            if ('itype' in oObj.itemtypes) {
                                itemtypes.push(oObj.itemtypes.itype.translated_description);
                            }

                            return itemtypes.join('<br>');
                        }
                    },
                    { "mDataProp": "ccode" },
                    { "mDataProp": "location" },
                    { "mDataProp": "issuedate_formatted" },
                    { "mDataProp": "branchname" },

Lines 87-92 my $sql = ' Link Here

(-)a/svc/checkouts (-4 / +18 lines)
87	issues.branchcode,	87	issues.branchcode,
88	branches.branchname,	88	branches.branchname,
89		89
		90	items.ccode,
90	items.itype,	91	items.itype,
91	biblioitems.itemtype,	92	biblioitems.itemtype,
92		93
Lines 148-154 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
148	my ( $renewals_count, $renewals_allowed, $renewals_remaining ) =	149	my ( $renewals_count, $renewals_allowed, $renewals_remaining ) =
149	GetRenewCount( $c->{borrowernumber}, $c->{itemnumber} );	150	GetRenewCount( $c->{borrowernumber}, $c->{itemnumber} );
150		151
151	my $itemtype = Koha::ItemTypes->find( $item_level_itypes ? $c->{itype} : $c->{itemtype} );	152	my $itemtypes;
		153	foreach my $key (qw(itemtype itype)) {
		154	if ($c->{$key}) {
		155	my $itemtype = Koha::ItemTypes->find($c->{$key});
		156	if ($itemtype) {
		157	$itemtypes->{$key} = $itemtype->TO_JSON;
		158	$itemtypes->{$key}->{translated_description} = $itemtype->translated_description;
		159	}
		160	}
		161	}
152	my $location;	162	my $location;
153	if ( $c->{location} ) {	163	if ( $c->{location} ) {
154	my $av = Koha::AuthorisedValues->search({ category => 'LOC', authorised_value => $c->{location} });	164	my $av = Koha::AuthorisedValues->search({ category => 'LOC', authorised_value => $c->{location} });
Lines 164-176 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
164	my $av = Koha::AuthorisedValues->search({ category => 'DAMAGED', authorised_value => $c->{damaged} });	174	my $av = Koha::AuthorisedValues->search({ category => 'DAMAGED', authorised_value => $c->{damaged} });
165	$damaged = $av->count ? $av->next->lib : '';	175	$damaged = $av->count ? $av->next->lib : '';
166	}	176	}
		177	my $ccode;
		178	if ($c->{ccode}) {
		179	my $av = Koha::AuthorisedValues->search({ category => 'CCODE', authorised_value => $c->{ccode} });
		180	$ccode = $av->count ? $av->next->lib : $c->{ccode};
		181	}
167	my $checkout = {	182	my $checkout = {
168	DT_RowId => $c->{itemnumber} . '-' . $c->{borrowernumber},	183	DT_RowId => $c->{itemnumber} . '-' . $c->{borrowernumber},
169	title => $c->{title},	184	title => $c->{title},
170	author => $c->{author},	185	author => $c->{author},
171	barcode => $c->{barcode},	186	barcode => $c->{barcode},
172	itemtype => $item_level_itypes ? $c->{itype} : $c->{itemtype},	187	itemtypes => $itemtypes,
173	itemtype_description => $itemtype ? $itemtype->translated_description : q{},	188	ccode => $ccode,
174	location => $location,	189	location => $location,
175	homebranch => $c->{homebranch},	190	homebranch => $c->{homebranch},
176	itemnotes => $c->{itemnotes},	191	itemnotes => $c->{itemnotes},
177	-

Return to bug 20194

Lines 290-296 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js (-2 / +32 lines)
290	},	290	},
291	"sType": "anti-the"	291	"sType": "anti-the"
292	},	292	},
293	{ "mDataProp": "itemtype_description" },	293	{
		294	"mDataProp": function ( oObj ) {
		295	let itemtypes = [];
		296
		297	if ('itemtype' in oObj.itemtypes) {
		298	itemtypes.push(oObj.itemtypes.itemtype.translated_description);
		299	}
		300
		301	if ('itype' in oObj.itemtypes) {
		302	itemtypes.push(oObj.itemtypes.itype.translated_description);
		303	}
		304
		305	return itemtypes.join('<br>');
		306	}
		307	},
		308	{ "mDataProp": "ccode" },
294	{ "mDataProp": "location" },	309	{ "mDataProp": "location" },
295	{ "mDataProp": "homebranch" },	310	{ "mDataProp": "homebranch" },
296	{ "mDataProp": "issuedate_formatted" },	311	{ "mDataProp": "issuedate_formatted" },
Lines 588-594 $(document).ready(function() { Link Here
588	},	603	},
589	"sType": "anti-the"	604	"sType": "anti-the"
590	},	605	},
591	{ "mDataProp": "itemtype" },	606	{
		607	"mDataProp": function ( oObj ) {
		608	let itemtypes = [];
		609
		610	if ('itemtype' in oObj.itemtypes) {
		611	itemtypes.push(oObj.itemtypes.itemtype.translated_description);
		612	}
		613
		614	if ('itype' in oObj.itemtypes) {
		615	itemtypes.push(oObj.itemtypes.itype.translated_description);
		616	}
		617
		618	return itemtypes.join('<br>');
		619	}
		620	},
		621	{ "mDataProp": "ccode" },
592	{ "mDataProp": "location" },	622	{ "mDataProp": "location" },
593	{ "mDataProp": "issuedate_formatted" },	623	{ "mDataProp": "issuedate_formatted" },
594	{ "mDataProp": "branchname" },	624	{ "mDataProp": "branchname" },