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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc (-2 / +14 lines)
Lines 19-26 Link Here
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>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt (-1 / +6 lines)
Lines 145-151 Link Here
145
        [% END %]
145
        [% END %]
146
        </td>
146
        </td>
147
        <td>
147
        <td>
148
            <span title="[% reserveloo.reservedate | html %]">[% reserveloo.reservedate | $KohaDates %] in [% Branches.GetName ( reserveloo.branch ) | html %]</span>
148
            <span title="[% reserveloo.reservedate | html %]">
149
                [% IF Koha.Preference('HourBasedHolds') %]
150
                    [% reserveloo.reservedate | $KohaDates with_hours = 1 %]
151
                [% ELSE %]
152
                    [% reserveloo.reservedate | $KohaDates %]
153
                [% END %] in [% Branches.GetName ( reserveloo.branch ) | html %]</span>
149
        </td>
154
        </td>
150
        <td>
155
        <td>
151
            <form name="cancelReserve" action="/cgi-bin/koha/circ/pendingreserves.pl" method="post">
156
            <form name="cancelReserve" action="/cgi-bin/koha/circ/pendingreserves.pl" method="post">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt (-1 / +7 lines)
Lines 170-176 Link Here
170
              [% END %]
170
              [% END %]
171
            </td>
171
            </td>
172
            <td class="hq-sendto">[% Branches.GetName( itemsloo.pickbranch ) | html %]</td>
172
            <td class="hq-sendto">[% Branches.GetName( itemsloo.pickbranch ) | html %]</td>
173
            <td class="hq-date"><span title="[% itemsloo.reservedate | html %]">[% itemsloo.reservedate | $KohaDates %]</span></td>
173
            <td class="hq-date"><span title="[% itemsloo.reservedate | html %]">
174
                [% IF Koha.Preference('HourBasedHolds') %]
175
                    [% itemsloo.reservedate | $KohaDates with_hours = 1 %]
176
                [% ELSE %]
177
                    [% itemsloo.reservedate | $KohaDates %]
178
                [% END %]
179
            </span></td>
174
            <td class="hq-notes">[% itemsloo.notes | html %]</td>
180
            <td class="hq-notes">[% itemsloo.notes | html %]</td>
175
        </tr>
181
        </tr>
176
    [% END %]</tbody>
182
    [% END %]</tbody>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt (-1 / +11 lines)
Lines 61-70 Link Here
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 %]
(-)a/svc/holds (-7 / +23 lines)
Lines 107-125 while ( my $h = $holds_rs->next() ) { Link Here
107
        waiting_here   => $h->branch()->branchcode() eq $branch,
107
        waiting_here   => $h->branch()->branchcode() eq $branch,
108
        priority       => $h->priority(),
108
        priority       => $h->priority(),
109
        itemtype_limit => $itemtype_limit,
109
        itemtype_limit => $itemtype_limit,
110
        reservedate_formatted => $h->reservedate() ? output_pref(
110
        subtitle       => GetRecordValue(
111
            { dt => dt_from_string( $h->reservedate() ), dateonly => 1 }
111
            'subtitle',
112
          )
112
            GetMarcBiblio({ biblionumber => $biblionumber }),
113
        : q{},
113
            GetFrameworkCode($biblionumber)
114
        ),
114
        suspend_until_formatted => $h->suspend_until() ? output_pref(
115
        suspend_until_formatted => $h->suspend_until() ? output_pref(
115
            { dt => dt_from_string( $h->suspend_until() ), dateonly => 1 }
116
            { dt => dt_from_string( $h->suspend_until() ), dateonly => 1 }
116
          )
117
          )
117
        : q{},
118
        : q{},
118
        expirationdate_formatted => $h->expirationdate() ? output_pref(
119
    };
120
121
    if ( C4::Context->preference('HourBasedHolds') ){
122
        $hold->{reservedate_formatted} = $h->reservedate() ? output_pref(
123
            { dt => dt_from_string( $h->reservedate() ) }
124
          )
125
        : q{},
126
        $hold->{expirationdate_formatted} = $h->expirationdate() ? output_pref(
127
            { dt => dt_from_string( $h->expirationdate() ) }
128
          )
129
        : q{},
130
    } else {
131
        $hold->{reservedate_formatted} = $h->reservedate() ? output_pref(
132
            { dt => dt_from_string( $h->reservedate() ), dateonly => 1 }
133
          )
134
        : q{},
135
        $hold->{expirationdate_formatted} = $h->expirationdate() ? output_pref(
119
            { dt => dt_from_string( $h->expirationdate() ), dateonly => 1 }
136
            { dt => dt_from_string( $h->expirationdate() ), dateonly => 1 }
120
          )
137
          )
121
        : q{},
138
        : q{},
122
    };
139
    }
123
140
124
    $hold->{transfered}     = 0;
141
    $hold->{transfered}     = 0;
125
    $hold->{not_transfered} = 0;
142
    $hold->{not_transfered} = 0;
126
- 

Return to bug 24718