Attachment #106271 for bug #24718

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




    <tbody>
        [% FOREACH reserveloo IN reserveloop %]
            <tr>
                <td><span title="[% reserveloo.waitingdate | html %]">
                    [% IF Koha.Preference('HourBasedHolds') %]
                        [% reserveloo.waitingdate | $KohaDates with_hours = 1 %]
                    [% ELSE %]
                        [% reserveloo.waitingdate | $KohaDates %]
                    [% END %]
                </span></td>
                <td><span title="[% reserveloo.reservedate | html %]">
                    [% IF Koha.Preference('HourBasedHolds') %]
                        [% reserveloo.reservedate | $KohaDates with_hours = 1 %]
                    [% ELSE %]
                        [% reserveloo.reservedate | $KohaDates %]
                    [% END %]
                </span></td>
                <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %]
                        [% INCLUDE 'biblio-title.inc' biblio=reserveloo.biblio %]
                    </a>

Lines 144-150 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt (-1 / +6 lines)
144	[% END %]	144	[% END %]
145	</td>	145	</td>
146	<td>	146	<td>
147	<span title="[% reserveloo.reservedate \| html %]">[% reserveloo.reservedate \| $KohaDates %] in [% Branches.GetName ( reserveloo.branch ) \| html %]</span>	147	<span title="[% reserveloo.reservedate \| html %]">
		148	[% IF Koha.Preference('HourBasedHolds') %]
		149	[% reserveloo.reservedate \| $KohaDates with_hours = 1 %]
		150	[% ELSE %]
		151	[% reserveloo.reservedate \| $KohaDates %]
		152	[% END %] in [% Branches.GetName ( reserveloo.branch ) \| html %]</span>
148	</td>	153	</td>
149	<td>	154	<td>
150	<form name="cancelReserve" action="/cgi-bin/koha/circ/pendingreserves.pl" method="post">	155	<form name="cancelReserve" action="/cgi-bin/koha/circ/pendingreserves.pl" method="post">

Lines 169-175 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt (-1 / +7 lines)
169	[% END %]	169	[% END %]
170	</td>	170	</td>
171	<td class="hq-sendto">[% Branches.GetName( itemsloo.pickbranch ) \| html %]</td>	171	<td class="hq-sendto">[% Branches.GetName( itemsloo.pickbranch ) \| html %]</td>
172	<td class="hq-date"><span title="[% itemsloo.reservedate \| html %]">[% itemsloo.reservedate \| $KohaDates %]</span></td>	172	<td class="hq-date"><span title="[% itemsloo.reservedate \| html %]">
		173	[% IF Koha.Preference('HourBasedHolds') %]
		174	[% itemsloo.reservedate \| $KohaDates with_hours = 1 %]
		175	[% ELSE %]
		176	[% itemsloo.reservedate \| $KohaDates %]
		177	[% END %]
		178	</span></td>
173	<td class="hq-notes">[% itemsloo.notes \| html %]</td>	179	<td class="hq-notes">[% itemsloo.notes \| html %]</td>
174	</tr>	180	</tr>
175	[% END %]</tbody>	181	[% END %]</tbody>

Lines 61-70 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt (-1 / +11 lines)
61	<td>[% hold.biblio.author \| html %]</td>	61	<td>[% hold.biblio.author \| html %]</td>
62	<td>[% hold.item.barcode \| html %]</td>	62	<td>[% hold.item.barcode \| html %]</td>
63	<td>[% Branches.GetName( hold.branchcode ) \| html %]</td>	63	<td>[% Branches.GetName( hold.branchcode ) \| html %]</td>
64	<td><span title="[% hold.reservedate \| html %]">[% hold.reservedate \| $KohaDates %]</span></td>	64	<td><span title="[% hold.reservedate \| html %]">
		65	[% IF Koha.Preference('HourBasedHolds') %]
		66	[% hold.reservedate \| $KohaDates with_hours = 1 %]
		67	[% ELSE %]
		68	[% hold.reservedate \| $KohaDates with_hours %]
		69	[% END %]
		70	</span></td>
65	<td>	71	<td>
66	[% IF hold.expirationdate %]	72	[% IF hold.expirationdate %]
		73	[% IF Koha.Preference('HourBasedHolds') %]
		74	<span title="[% hold.expirationdate \| html %]">[% hold.expirationdate \| $KohaDates with_hours = 1 %]</span>
		75	[% ELSE %]
67	<span title="[% hold.expirationdate \| html %]">[% hold.expirationdate \| $KohaDates %]</span>	76	<span title="[% hold.expirationdate \| html %]">[% hold.expirationdate \| $KohaDates %]</span>
		77	[% END %]
68	[% ELSE %]	78	[% ELSE %]
69	<span title="0000-00-00"></span>	79	<span title="0000-00-00"></span>
70	[% END %]	80	[% END %]




        waiting_here   => $h->branch()->branchcode() eq $branch,
        priority       => $h->priority(),
        itemtype_limit => $itemtype_limit,
        subtitle       => GetRecordValue(
            'subtitle',
            GetMarcBiblio({ biblionumber => $biblionumber }),
            GetFrameworkCode($biblionumber)
        ),
        suspend_until_formatted => $h->suspend_until() ? output_pref(
            { dt => dt_from_string( $h->suspend_until() ), dateonly => 1 }
          )
        : q{},
    };

    if ( C4::Context->preference('HourBasedHolds') ){
        $hold->{reservedate_formatted} = $h->reservedate() ? output_pref(
            { dt => dt_from_string( $h->reservedate() ) }
          )
        : q{},
        $hold->{expirationdate_formatted} = $h->expirationdate() ? output_pref(
            { dt => dt_from_string( $h->expirationdate() ) }
          )
        : q{},
    } else {
        $hold->{reservedate_formatted} = $h->reservedate() ? output_pref(
            { dt => dt_from_string( $h->reservedate() ), dateonly => 1 }
          )
        : q{},
        $hold->{expirationdate_formatted} = $h->expirationdate() ? output_pref(
            { dt => dt_from_string( $h->expirationdate() ), dateonly => 1 }
          )
        : q{},
    }

    $hold->{transfered}     = 0;
    $hold->{not_transfered} = 0;
- 

Return to bug 24718

Lines 108-126 while ( my $h = $holds_rs->next() ) { Link Here

(-)a/svc/holds (-7 / +23 lines)
108	waiting_here => $h->branch()->branchcode() eq $branch,	108	waiting_here => $h->branch()->branchcode() eq $branch,
109	priority => $h->priority(),	109	priority => $h->priority(),
110	itemtype_limit => $itemtype_limit,	110	itemtype_limit => $itemtype_limit,
111	reservedate_formatted => $h->reservedate() ? output_pref(	111	subtitle => GetRecordValue(
112	{ dt => dt_from_string( $h->reservedate() ), dateonly => 1 }	112	'subtitle',
113	)	113	GetMarcBiblio({ biblionumber => $biblionumber }),
114	: q{},	114	GetFrameworkCode($biblionumber)
		115	),
115	suspend_until_formatted => $h->suspend_until() ? output_pref(	116	suspend_until_formatted => $h->suspend_until() ? output_pref(
116	{ dt => dt_from_string( $h->suspend_until() ), dateonly => 1 }	117	{ dt => dt_from_string( $h->suspend_until() ), dateonly => 1 }
117	)	118	)
118	: q{},	119	: q{},
119	expirationdate_formatted => $h->expirationdate() ? output_pref(	120	};
		121
		122	if ( C4::Context->preference('HourBasedHolds') ){
		123	$hold->{reservedate_formatted} = $h->reservedate() ? output_pref(
		124	{ dt => dt_from_string( $h->reservedate() ) }
		125	)
		126	: q{},
		127	$hold->{expirationdate_formatted} = $h->expirationdate() ? output_pref(
		128	{ dt => dt_from_string( $h->expirationdate() ) }
		129	)
		130	: q{},
		131	} else {
		132	$hold->{reservedate_formatted} = $h->reservedate() ? output_pref(
		133	{ dt => dt_from_string( $h->reservedate() ), dateonly => 1 }
		134	)
		135	: q{},
		136	$hold->{expirationdate_formatted} = $h->expirationdate() ? output_pref(
120	{ dt => dt_from_string( $h->expirationdate() ), dateonly => 1 }	137	{ dt => dt_from_string( $h->expirationdate() ), dateonly => 1 }
121	)	138	)
122	: q{},	139	: q{},
123	};	140	}
124		141
125	$hold->{transfered} = 0;	142	$hold->{transfered} = 0;
126	$hold->{not_transfered} = 0;	143	$hold->{not_transfered} = 0;
127	-

Lines 19-26 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc (-2 / +14 lines)
19	<tbody>	19	<tbody>
20	[% FOREACH reserveloo IN reserveloop %]	20	[% FOREACH reserveloo IN reserveloop %]
21	<tr>	21	<tr>
22	<td><span title="[% reserveloo.waitingdate \| html %]">[% reserveloo.waitingdate \| $KohaDates %]</span></td>	22	<td><span title="[% reserveloo.waitingdate \| html %]">
23	<td><span title="[% reserveloo.reservedate \| html %]">[% reserveloo.reservedate \| $KohaDates %]</span></td>	23	[% IF Koha.Preference('HourBasedHolds') %]
		24	[% reserveloo.waitingdate \| $KohaDates with_hours = 1 %]
		25	[% ELSE %]
		26	[% reserveloo.waitingdate \| $KohaDates %]
		27	[% END %]
		28	</span></td>
		29	<td><span title="[% reserveloo.reservedate \| html %]">
		30	[% IF Koha.Preference('HourBasedHolds') %]
		31	[% reserveloo.reservedate \| $KohaDates with_hours = 1 %]
		32	[% ELSE %]
		33	[% reserveloo.reservedate \| $KohaDates %]
		34	[% END %]
		35	</span></td>
24	<td>[% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %]	36	<td>[% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %]
25	[% INCLUDE 'biblio-title.inc' biblio=reserveloo.biblio %]	37	[% INCLUDE 'biblio-title.inc' biblio=reserveloo.biblio %]
26	</a>	38	</a>