Attachment #27504 for bug #12088

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

Lines 165-171 if ( $run_report ) { Link Here

(-)a/circ/pendingreserves.pl (-2 / +2 lines)
165	push(	165	push(
166	@reservedata,	166	@reservedata,
167	{	167	{
168	reservedate => format_date( $data->{l_reservedate} ),	168	reservedate => $data->{l_reservedate},
169	priority => $data->{priority},	169	priority => $data->{priority},
170	name => $data->{l_patron},	170	name => $data->{l_patron},
171	title => $data->{title},	171	title => $data->{title},
Lines 196-202 if ( $run_report ) { Link Here
196	}	196	}
197		197
198	$template->param(	198	$template->param(
199	todaysdate => format_date($todaysdate),	199	todaysdate => $todaysdate,
200	from => $startdate,	200	from => $startdate,
201	to => $enddate,	201	to => $enddate,
202	run_report => $run_report,	202	run_report => $run_report,




[% USE KohaDates %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Circulation &rsaquo; Holds to pull</title>
[% INCLUDE 'doc-head-close.inc' %]

<!-- Plugin datatables -->
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
[% INCLUDE 'datatables.inc' %]
<script type="text/JavaScript">
//<![CDATA[
$(document).ready(function() {
  [% IF (dateformat == 'metric') %]
      dt_add_type_uk_date();
  [% END %]
  var holdst = $("#holdst").dataTable($.extend(true, {}, dataTablesDefaults, {
    "aoColumnDefs": [
        { "sType": "anti-the", "aTargets" : [ "anti-the" ] },
        { "sType": "title-string", "aTargets" : [ "title-string" ] },
        { "sType": "string", "aTargets": [ "string-sort" ] } //Target columns that use <br> separators and pull-down menus.
    ]
  }));
  holdst.fnAddFilters("filter");
  [%# add separateData function to cleanse jQuery select lists by breaking apart strings glued with BR tags and then de-duplicating any repeated library codes %]


<h2>Holds to pull[% IF ( run_report ) %] placed between [% from %] and [% to %][% END %]</h2>
[% IF ( run_report ) %]
<h3>Reported on [% todaysdate | $KohaDates %]</h3>
<p>The following holds have not been filled. Please retrieve them and check them in.</p>
<div class="searchresults">
    [% IF ( reserveloop ) %]

        <th>Pull this many items</th>
        <th>Items available</th>
        <th>Patrons with holds</th>
        <th class="anti-the">Title</th>
        <th class="string-sort">Libraries</th>
        <th>Available call numbers</th>
        <th>Available copy numbers</th>
        <th>Available enumeration</th>
        <th class="string-sort">Available itypes</th>
        <th class="string-sort">Available locations</th>
        <th class="title-string">Earliest hold date</th>
        </tr>
    </thead>
    <tbody>

            <td>[% reserveloo.rcount %]</td>
            <td>
            <p>
                [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %]
                [% reserveloo.title |html %]</a></p>
                [% IF ( reserveloo.author ) %]<p> by [% reserveloo.author %]</p>[% END %]
            </p>
            </td>
        [% ELSE %]
            <td>"</td>

        <td><p>[% reserveloo.enumchron %]</p></td>
        <td>[% reserveloo.itype %]</td>
        <td>[% reserveloo.location %]</td>
        <td>
            <span title="[% reserveloo.reservedate %]">[% reserveloo.reservedate | $KohaDates %] in [% reserveloo.branch %]</span>
            <p>in [% reserveloo.branch %]</p>
            [% IF ( reserveloo.statusw ) %]<p>Waiting</p>[% END %][% IF ( reserveloo.statusf ) %]<p>Fullfilled</p>[% END %]
        </td>
        </tr>
- 

Return to bug 12088

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt (-21 / +18 lines)
		1	[% USE KohaDates %]
1	[% INCLUDE 'doc-head-open.inc' %]	2	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Koha &rsaquo; Circulation &rsaquo; Holds to pull</title>	3	<title>Koha &rsaquo; Circulation &rsaquo; Holds to pull</title>
3	[% INCLUDE 'doc-head-close.inc' %]	4	[% INCLUDE 'doc-head-close.inc' %]
Lines 5-20 Link Here
5	<!-- Plugin datatables -->	6	<!-- Plugin datatables -->
6	<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />	7	<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
7	[% INCLUDE 'datatables.inc' %]	8	[% INCLUDE 'datatables.inc' %]
8	<script type="text/JavaScript" language="JavaScript">	9	<script type="text/JavaScript">
9	//<![CDATA[	10	//<![CDATA[
10	$(document).ready(function() {	11	$(document).ready(function() {
11	[% IF (dateformat == 'metric') %]
12	dt_add_type_uk_date();
13	[% END %]
14	var holdst = $("#holdst").dataTable($.extend(true, {}, dataTablesDefaults, {	12	var holdst = $("#holdst").dataTable($.extend(true, {}, dataTablesDefaults, {
15	"aoColumnDefs": [	13	"aoColumnDefs": [
16	{ "sType": "string", "aTargets": [ 4, 8, 9 ] } //Target columns that use <br> separators and pull-down menus. FIXME: Use class names instead of indexes.	14	{ "sType": "anti-the", "aTargets" : [ "anti-the" ] },
17	]	15	{ "sType": "title-string", "aTargets" : [ "title-string" ] },
		16	{ "sType": "string", "aTargets": [ "string-sort" ] } //Target columns that use <br> separators and pull-down menus.
		17	]
18	}));	18	}));
19	holdst.fnAddFilters("filter");	19	holdst.fnAddFilters("filter");
20	[%# add separateData function to cleanse jQuery select lists by breaking apart strings glued with BR tags and then de-duplicating any repeated library codes %]	20	[%# add separateData function to cleanse jQuery select lists by breaking apart strings glued with BR tags and then de-duplicating any repeated library codes %]
Lines 83-89 $(document).ready(function() { Link Here
83		83
84	<h2>Holds to pull[% IF ( run_report ) %] placed between [% from %] and [% to %][% END %]</h2>	84	<h2>Holds to pull[% IF ( run_report ) %] placed between [% from %] and [% to %][% END %]</h2>
85	[% IF ( run_report ) %]	85	[% IF ( run_report ) %]
86	<h3>Reported on [% todaysdate %]</h3>	86	<h3>Reported on [% todaysdate \| $KohaDates %]</h3>
87	<p>The following holds have not been filled. Please retrieve them and check them in.</p>	87	<p>The following holds have not been filled. Please retrieve them and check them in.</p>
88	<div class="searchresults">	88	<div class="searchresults">
89	[% IF ( reserveloop ) %]	89	[% IF ( reserveloop ) %]
Lines 93-106 $(document).ready(function() { Link Here
93	<th>Pull this many items</th>	93	<th>Pull this many items</th>
94	<th>Items available</th>	94	<th>Items available</th>
95	<th>Patrons with holds</th>	95	<th>Patrons with holds</th>
96	<th>Title</th>	96	<th class="anti-the">Title</th>
97	<th>Libraries</th>	97	<th class="string-sort">Libraries</th>
98	<th>Available call numbers</th>	98	<th>Available call numbers</th>
99	<th>Available copy numbers</th>	99	<th>Available copy numbers</th>
100	<th>Available enumeration</th>	100	<th>Available enumeration</th>
101	<th>Available itypes</th>	101	<th class="string-sort">Available itypes</th>
102	<th>Available locations</th>	102	<th class="string-sort">Available locations</th>
103	<th>Earliest hold date</th>	103	<th class="title-string">Earliest hold date</th>
104	</tr>	104	</tr>
105	</thead>	105	</thead>
106	<tbody>	106	<tbody>
Lines 112-121 $(document).ready(function() { Link Here
112	<td>[% reserveloo.rcount %]</td>	112	<td>[% reserveloo.rcount %]</td>
113	<td>	113	<td>
114	<p>	114	<p>
115	[% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %]	115	[% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %]
116	[% reserveloo.title \|html %]	116	[% reserveloo.title \|html %]</a></p>
117	</a> [% IF ( reserveloo.author ) %]<p> by [% reserveloo.author %]</p>[% END %]	117	[% IF ( reserveloo.author ) %]<p> by [% reserveloo.author %]</p>[% END %]
118	</p>
119	</td>	118	</td>
120	[% ELSE %]	119	[% ELSE %]
121	<td>"</td>	120	<td>"</td>
Lines 129-137 $(document).ready(function() { Link Here
129	<td><p>[% reserveloo.enumchron %]</p></td>	128	<td><p>[% reserveloo.enumchron %]</p></td>
130	<td>[% reserveloo.itype %]</td>	129	<td>[% reserveloo.itype %]</td>
131	<td>[% reserveloo.location %]</td>	130	<td>[% reserveloo.location %]</td>
132	<td width="15%">	131	<td>
133	<p>[% reserveloo.reservedate %]</p>	132	<span title="[% reserveloo.reservedate %]">[% reserveloo.reservedate \| $KohaDates %] in [% reserveloo.branch %]</span>
134	<p>in [% reserveloo.branch %]</p>
135	[% IF ( reserveloo.statusw ) %]<p>Waiting</p>[% END %][% IF ( reserveloo.statusf ) %]<p>Fullfilled</p>[% END %]	133	[% IF ( reserveloo.statusw ) %]<p>Waiting</p>[% END %][% IF ( reserveloo.statusf ) %]<p>Fullfilled</p>[% END %]
136	</td>	134	</td>
137	</tr>	135	</tr>
138	-