Attachment #17308 for bug #9903

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

Lines 33-44 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-7 / +13 lines)
33	"aoColumnDefs": [	33	"aoColumnDefs": [
34	{ "aTargets": [ -1,-2 ], "bSortable": false, "bSearchable": false }	34	{ "aTargets": [ -1,-2 ], "bSortable": false, "bSearchable": false }
35	],	35	],
		36	"aoColumns": [
		37	{ "sType": "title-string" },null,null,{ "sType": "title-string" },null,null,null,null,null,null
		38	],
36	"bPaginate": false	39	"bPaginate": false
37	}));	40	}));
38	$("#relissuest").dataTable($.extend(true, {}, dataTablesDefaults, {	41	$("#relissuest").dataTable($.extend(true, {}, dataTablesDefaults, {
39	"sDom": 't',	42	"sDom": 't',
40	"aoColumnDefs": [	43	"aoColumns": [
41	{ "aTargets": [ 0,8 ], "bSortable": false, "bSearchable": false }	44	{ "sType": "title-string" },null,null,{ "sType": "title-string" },null,null,null,null,null
42	],	45	],
43	"bPaginate": false	46	"bPaginate": false
44	}));	47	}));
Lines 47-52 $(document).ready(function() { Link Here
47	"aoColumnDefs": [	50	"aoColumnDefs": [
48	{ "aTargets": [ -1,-2 ], "bSortable": false, "bSearchable": false }	51	{ "aTargets": [ -1,-2 ], "bSortable": false, "bSearchable": false }
49	],	52	],
		53	"aoColumns": [
		54	{ "sType": "title-string" },null,null,null,null,null,null
		55	],
50	"bPaginate": false	56	"bPaginate": false
51	}));	57	}));
52	[% IF ( picture ) %]	58	[% IF ( picture ) %]
Lines 468-474 function validate1(date) { Link Here
468	[% ELSE %]	474	[% ELSE %]
469	<td>	475	<td>
470	[% END %]	476	[% END %]
471	[% issueloo.date_due %]	477	<span title="[% issueloo.date_due_sort %]">[% issueloo.date_due %]</span>
472	[% IF ( issueloo.itemlost ) %]	478	[% IF ( issueloo.itemlost ) %]
473	<span class="lost">[% issueloo.itemlost %]</span>	479	<span class="lost">[% issueloo.itemlost %]</span>
474	[% END %]	480	[% END %]
Lines 478-484 function validate1(date) { Link Here
478	</td>	484	</td>
479	<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% issueloo.biblionumber %]"><strong>[% issueloo.title \|html %]</strong></a>[% IF ( issueloo.author ) %], by [% issueloo.author %][% END %] [% IF ( issueloo.publishercode ) %]; [% issueloo.publishercode %] [% END %] [% IF ( issueloo.publicationyear ) %], [% issueloo.publicationyear %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% issueloo.biblionumber %]&itemnumber=[% issueloo.itemnumber %]#item[% issueloo.itemnumber %]">[% issueloo.barcode %]</a></td>	485	<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% issueloo.biblionumber %]"><strong>[% issueloo.title \|html %]</strong></a>[% IF ( issueloo.author ) %], by [% issueloo.author %][% END %] [% IF ( issueloo.publishercode ) %]; [% issueloo.publishercode %] [% END %] [% IF ( issueloo.publicationyear ) %], [% issueloo.publicationyear %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% issueloo.biblionumber %]&itemnumber=[% issueloo.itemnumber %]#item[% issueloo.itemnumber %]">[% issueloo.barcode %]</a></td>
480	<td>[% UNLESS ( noItemTypeImages ) %] [% IF ( issueloo.itemtype_image ) %]<img src="[% issueloo.itemtype_image %]" alt="" />[% END %][% END %][% issueloo.itemtype_description %]</td>	486	<td>[% UNLESS ( noItemTypeImages ) %] [% IF ( issueloo.itemtype_image ) %]<img src="[% issueloo.itemtype_image %]" alt="" />[% END %][% END %][% issueloo.itemtype_description %]</td>
481	<td>[% issueloo.issuedate %]</td>	487	<td><span title="[% issueloo.issuedate_sort %]">[% issueloo.issuedate %]</span></td>
482	<td>[% issueloo.issuingbranchname %]</td>	488	<td>[% issueloo.issuingbranchname %]</td>
483	<td>[% issueloo.itemcallnumber %]</td>	489	<td>[% issueloo.itemcallnumber %]</td>
484	<td>[% issueloo.charge %]</td>	490	<td>[% issueloo.charge %]</td>
Lines 576-582 function validate1(date) { Link Here
576	[% ELSE %]	582	[% ELSE %]
577	<td>	583	<td>
578	[% END %]	584	[% END %]
579	[% relissueloo.date_due %]	585	<span title="[% relissueloo.date_due_sort %]">[% relissueloo.date_due %]</span>
580	[% IF ( relissueloo.itemlost ) %]	586	[% IF ( relissueloo.itemlost ) %]
581	<span class="lost">[% relissueloo.itemlost %]</span>	587	<span class="lost">[% relissueloo.itemlost %]</span>
582	[% END %]	588	[% END %]
Lines 586-592 function validate1(date) { Link Here
586	</td>	592	</td>
587	<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relissueloo.biblionumber %]"><strong>[% relissueloo.title \|html %]</strong></a>[% IF relissueloo.author %], by [% relissueloo.author %][% END %] [% IF relissueloo.publishercode %]; [% relissueloo.publishercode %] [% END %] [% IF relissueloo.publicationyear %], [% relissueloo.publicationyear %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relissueloo.biblionumber %]&itemnumber=[% relissueloo.itemnumber %]#item[% relissueloo.itemnumber %]">[% relissueloo.barcode %]</a></td>	593	<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relissueloo.biblionumber %]"><strong>[% relissueloo.title \|html %]</strong></a>[% IF relissueloo.author %], by [% relissueloo.author %][% END %] [% IF relissueloo.publishercode %]; [% relissueloo.publishercode %] [% END %] [% IF relissueloo.publicationyear %], [% relissueloo.publicationyear %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relissueloo.biblionumber %]&itemnumber=[% relissueloo.itemnumber %]#item[% relissueloo.itemnumber %]">[% relissueloo.barcode %]</a></td>
588	<td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissueloo.itemtype_image ) %]<img src="[% relissueloo.itemtype_image %]" alt="" />[% END %][% END %][% relissueloo.itemtype_description %]</td>	594	<td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissueloo.itemtype_image ) %]<img src="[% relissueloo.itemtype_image %]" alt="" />[% END %][% END %][% relissueloo.itemtype_description %]</td>
589	<td>[% relissueloo.issuedate %]</td>	595	<td><span title="[% relissueloo.issuedate_sort %]">[% relissueloo.issuedate %]</span></td>
590	<td>[% relissueloo.issuingbranchname %]</td>	596	<td>[% relissueloo.issuingbranchname %]</td>
591	<td>[% relissueloo.itemcallnumber %]</td>	597	<td>[% relissueloo.itemcallnumber %]</td>
592	<td>[% relissueloo.charge %]</td>	598	<td>[% relissueloo.charge %]</td>
Lines 624-630 function validate1(date) { Link Here
624	</tr></thead>	630	</tr></thead>
625	<tbody>[% FOREACH reservloo IN reservloop %]	631	<tbody>[% FOREACH reservloo IN reservloop %]
626	<tr class="[% reservloo.color %]">	632	<tr class="[% reservloo.color %]">
627	<td>[% reservloo.reservedate %]</td>	633	<td><span title="[% reservloo.reservedate_sort %]">[% reservloo.reservedate %]</span></td>
628	<td>	634	<td>
629	<a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% reservloo.biblionumber %]">[% reservloo.title \|html %]</a>[% IF ( reservloo.author ) %], by [% reservloo.author %][% END %]	635	<a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% reservloo.biblionumber %]">[% reservloo.title \|html %]</a>[% IF ( reservloo.author ) %], by [% reservloo.author %][% END %]
630	</td>	636	</td>




        foreach (qw(waiting transfered nottransfered)) {
            $getreserv{$_} = 0;
        }
        $getreserv{reservedate_sort} = $num_res->{'reservedate'};
        $getreserv{reservedate}  = C4::Dates->new($num_res->{'reservedate'},'iso')->output('syspref');
        foreach (qw(biblionumber title author itemcallnumber )) {
            $getreserv{$_} = $getiteminfo->{$_};

           $issuedate = $issue->{issuedate}->clone();
        }

        $issue->{date_due_sort} = $issue->{date_due};
        $issue->{date_due}  = output_pref( $issue->{date_due} );
        $issue->{issuedate_sort} = $issue->{issuedate};
        $issue->{issuedate} = output_pref( $issue->{issuedate} ) if defined $issue->{issuedate};
        my $biblionumber = $issue->{biblionumber};
        $issue->{issuingbranchname} = GetBranchName($issue->{branchcode});
- 

Return to bug 9903

Lines 274-279 if ($borrowernumber) { Link Here

(-)a/members/moremember.pl (-1 / +3 lines)
274	foreach (qw(waiting transfered nottransfered)) {	274	foreach (qw(waiting transfered nottransfered)) {
275	$getreserv{$_} = 0;	275	$getreserv{$_} = 0;
276	}	276	}
		277	$getreserv{reservedate_sort} = $num_res->{'reservedate'};
277	$getreserv{reservedate} = C4::Dates->new($num_res->{'reservedate'},'iso')->output('syspref');	278	$getreserv{reservedate} = C4::Dates->new($num_res->{'reservedate'},'iso')->output('syspref');
278	foreach (qw(biblionumber title author itemcallnumber )) {	279	foreach (qw(biblionumber title author itemcallnumber )) {
279	$getreserv{$_} = $getiteminfo->{$_};	280	$getreserv{$_} = $getiteminfo->{$_};
Lines 447-453 sub build_issue_data { Link Here
447	$issuedate = $issue->{issuedate}->clone();	448	$issuedate = $issue->{issuedate}->clone();
448	}	449	}
449		450
		451	$issue->{date_due_sort} = $issue->{date_due};
450	$issue->{date_due} = output_pref( $issue->{date_due} );	452	$issue->{date_due} = output_pref( $issue->{date_due} );
		453	$issue->{issuedate_sort} = $issue->{issuedate};
451	$issue->{issuedate} = output_pref( $issue->{issuedate} ) if defined $issue->{issuedate};	454	$issue->{issuedate} = output_pref( $issue->{issuedate} ) if defined $issue->{issuedate};
452	my $biblionumber = $issue->{biblionumber};	455	my $biblionumber = $issue->{biblionumber};
453	$issue->{issuingbranchname} = GetBranchName($issue->{branchcode});	456	$issue->{issuingbranchname} = GetBranchName($issue->{branchcode});
454	-