Attachment #31957 for bug #9528

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

Lines 6-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc (-2 / +3 lines)
6	var CIRCULATION_RENEW_FAILED = _("Renew failed:")	6	var CIRCULATION_RENEW_FAILED = _("Renew failed:")
7	var NOT_CHECKED_OUT = _("not checked out");	7	var NOT_CHECKED_OUT = _("not checked out");
8	var TOO_MANY_RENEWALS = _("too many renewals");	8	var TOO_MANY_RENEWALS = _("too many renewals");
9	var ON_RESERVE = _("on reserve");	9	var ON_RESERVE = _("on hold");
10	var REASON_UNKNOWN = _("reason unkown");	10	var REASON_UNKNOWN = _("reason unkown");
11	var TODAYS_CHECKOUTS = _("Today's checkouts");	11	var TODAYS_CHECKOUTS = _("Today's checkouts");
12	var PREVIOUS_CHECKOUTS = _("Previous checkouts");	12	var PREVIOUS_CHECKOUTS = _("Previous checkouts");
Lines 19-25 Link Here
19	var RENEWALS_REMAINING = _("%s of %s renewals remaining");	19	var RENEWALS_REMAINING = _("%s of %s renewals remaining");
20	var HOLD_IS_SUSPENDED = _("Hold is <strong>suspended</strong>");	20	var HOLD_IS_SUSPENDED = _("Hold is <strong>suspended</strong>");
21	var UNTIL = _("until %s");	21	var UNTIL = _("until %s");
22	var ITEM_IS_WAITING = _("Item is <strong>waiting</strong>"); //	22	var ITEM_IS_WAITING = _("Item is <strong>waiting</strong>");
		23	var ITEM_IS_WAITING_HERE = _("Item is <strong>waiting here</strong>");
23	var AT = _("at %s");	24	var AT = _("at %s");
24	var ITEM_IS_IN_TRANSIT = _("Item is <strong>in transit</strong> from %s");	25	var ITEM_IS_IN_TRANSIT = _("Item is <strong>in transit</strong> from %s");
25	var FROM = _("from");	26	var FROM = _("from");




        if ( ! holdsTable ) {
            holdsTable = $("#holds-table").dataTable({
                "bAutoWidth": false,
                "sDom": "rt",
                "aoColumns": [
                    {
                        "mDataProp": "reservedate_formatted"

                            if ( oObj.barcode ) {
                                data += "<em>";
                                if ( oObj.found == "W" ) {
                                    data += ITEM_IS_WAITING;

                                    if ( oObj.waiting_here ) {
                                        data += ITEM_IS_WAITING_HERE;
                                    } else {
                                        data += ITEM_IS_WAITING;
                                        data += " " + AT.format( oObj.waiting_at );
                                    }

                                } else if ( oObj.transferred ) {
                                    data += ITEM_IS_IN_TRANSIT.format( oObj.from_branch );
                                } else if ( oObj.not_transferred ) {

                            return data;
                        }
                    },
                    {
                        "mDataProp": function( oObj ) {
                            return oObj.branchcode || "";
                        }
                    },
                    { "mDataProp": "expirationdate_formatted" },
                    {
                        "mDataProp": function( oObj ) {

Lines 764-769 No patron matched <span class="ex">[% message %]</span> Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (+1 lines)
764	<th>Title</th>	764	<th>Title</th>
765	<th>Call number</th>	765	<th>Call number</th>
766	<th>Barcode</th>	766	<th>Barcode</th>
		767	<th>Pickup at</th>
767	<th>Expiration</th>	768	<th>Expiration</th>
768	<th>Priority</th>	769	<th>Priority</th>
769	<th>Delete?</th>	770	<th>Delete?</th>

Lines 80-85 while ( my $h = $holds_rs->next() ) { Link Here

(-)a/svc/holds (-1 / +1 lines)
80	title => $h->biblio()->title(),	80	title => $h->biblio()->title(),
81	author => $h->biblio()->author(),	81	author => $h->biblio()->author(),
82	reserve_id => $h->reserve_id(),	82	reserve_id => $h->reserve_id(),
		83	branchcode => $h->branchcode()->branchname(),
83	reservedate => $h->reservedate(),	84	reservedate => $h->reservedate(),
84	expirationdate => $h->expirationdate(),	85	expirationdate => $h->expirationdate(),
85	suspend => $h->suspend(),	86	suspend => $h->suspend(),
86	-

Return to bug 9528

Lines 5-11 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/js/holds.js (-3 / +11 lines)
5	if ( ! holdsTable ) {	5	if ( ! holdsTable ) {
6	holdsTable = $("#holds-table").dataTable({	6	holdsTable = $("#holds-table").dataTable({
7	"bAutoWidth": false,	7	"bAutoWidth": false,
8	"sDom": "<'row-fluid'<'span6'><'span6'>r>t<'row-fluid'>t",	8	"sDom": "rt",
9	"aoColumns": [	9	"aoColumns": [
10	{	10	{
11	"mDataProp": "reservedate_formatted"	11	"mDataProp": "reservedate_formatted"
Lines 58-68 $(document).ready(function() { Link Here
58	if ( oObj.barcode ) {	58	if ( oObj.barcode ) {
59	data += "<em>";	59	data += "<em>";
60	if ( oObj.found == "W" ) {	60	if ( oObj.found == "W" ) {
61	data += ITEM_IS_WAITING;
62		61
63	if ( ! oObj.waiting_here ) {	62	if ( oObj.waiting_here ) {
		63	data += ITEM_IS_WAITING_HERE;
		64	} else {
		65	data += ITEM_IS_WAITING;
64	data += " " + AT.format( oObj.waiting_at );	66	data += " " + AT.format( oObj.waiting_at );
65	}	67	}
		68
66	} else if ( oObj.transferred ) {	69	} else if ( oObj.transferred ) {
67	data += ITEM_IS_IN_TRANSIT.format( oObj.from_branch );	70	data += ITEM_IS_IN_TRANSIT.format( oObj.from_branch );
68	} else if ( oObj.not_transferred ) {	71	} else if ( oObj.not_transferred ) {
Lines 84-89 $(document).ready(function() { Link Here
84	return data;	87	return data;
85	}	88	}
86	},	89	},
		90	{
		91	"mDataProp": function( oObj ) {
		92	return oObj.branchcode \|\| "";
		93	}
		94	},
87	{ "mDataProp": "expirationdate_formatted" },	95	{ "mDataProp": "expirationdate_formatted" },
88	{	96	{
89	"mDataProp": function( oObj ) {	97	"mDataProp": function( oObj ) {