Lines 17-22
Link Here
|
17 |
[% END %] |
17 |
[% END %] |
18 |
var osrlt = $("#osrlt").dataTable($.extend(true, {}, dataTablesDefaults, { |
18 |
var osrlt = $("#osrlt").dataTable($.extend(true, {}, dataTablesDefaults, { |
19 |
|
19 |
|
|
|
20 |
// FIXME sort function of additional_fields! |
20 |
"aoColumnDefs": [ |
21 |
"aoColumnDefs": [ |
21 |
{ "aTargets": [ -1, -2, -3 ], "bSortable": false, "bSearchable": false }, |
22 |
{ "aTargets": [ -1, -2, -3 ], "bSortable": false, "bSearchable": false }, |
22 |
], |
23 |
], |
Lines 24-29
Link Here
|
24 |
} ) ); |
25 |
} ) ); |
25 |
|
26 |
|
26 |
var csrlt = $("#csrlt").dataTable($.extend(true, {}, dataTablesDefaults, { |
27 |
var csrlt = $("#csrlt").dataTable($.extend(true, {}, dataTablesDefaults, { |
|
|
28 |
// FIXME sort function of additional_fields! |
27 |
"aoColumnDefs": [ |
29 |
"aoColumnDefs": [ |
28 |
{ "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false }, |
30 |
{ "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false }, |
29 |
], |
31 |
], |
Lines 118-123
Link Here
|
118 |
<label for="to">Expires before:</label> |
120 |
<label for="to">Expires before:</label> |
119 |
<input type="text" id="to" name="expiration_date_filter" value="[% expiration_date_filter | $KohaDates %]" size="10" maxlength="10" class="datepickerto" /> |
121 |
<input type="text" id="to" name="expiration_date_filter" value="[% expiration_date_filter | $KohaDates %]" size="10" maxlength="10" class="datepickerto" /> |
120 |
</li> |
122 |
</li> |
|
|
123 |
[% FOR field IN additional_fields_for_subscription %] |
124 |
<li> |
125 |
<label for="additional_field_[% field.id %]"> [% field.name %]: </label> |
126 |
[% IF field.authorised_value_choices %] |
127 |
<select id="additional_field_[% field.id %]" name="additional_field_[% field.id %]_filter"> |
128 |
<option value="">All</option> |
129 |
[% FOREACH av IN field.authorised_value_choices %] |
130 |
<option value="[% av.authorised_value %]">[% av.lib %]</option> |
131 |
[% END %] |
132 |
</select> |
133 |
[% ELSE %] |
134 |
<input id="additional_field_[% field.id %]" type="text" value="[% additional_fields.${field.name} %]" name="additional_field_[% field.id %]_filter" /> |
135 |
[% END %] |
136 |
</li> |
137 |
[% END %] |
121 |
</ol> |
138 |
</ol> |
122 |
<input type="hidden" name="searched" value="1" /> |
139 |
<input type="hidden" name="searched" value="1" /> |
123 |
<fieldset class="action"> |
140 |
<fieldset class="action"> |
Lines 146-151
Link Here
|
146 |
<th>Location</th> |
163 |
<th>Location</th> |
147 |
<th>Call number</th> |
164 |
<th>Call number</th> |
148 |
<th>Expiration date</th> |
165 |
<th>Expiration date</th> |
|
|
166 |
[% FOR field IN additional_fields_for_subscription %] |
167 |
<th>[% field.name %]</th> |
168 |
[% END %] |
149 |
[% IF ( routing && CAN_user_serials_routing ) %] |
169 |
[% IF ( routing && CAN_user_serials_routing ) %] |
150 |
<th>Routing list</th> |
170 |
<th>Routing list</th> |
151 |
[% END %] |
171 |
[% END %] |
Lines 162-167
Link Here
|
162 |
<td><input type="text" class="filter" data-column_num="4" placeholder="Search location" /></td> |
182 |
<td><input type="text" class="filter" data-column_num="4" placeholder="Search location" /></td> |
163 |
<td><input type="text" class="filter" data-column_num="5" placeholder="Search callnumber" /></td> |
183 |
<td><input type="text" class="filter" data-column_num="5" placeholder="Search callnumber" /></td> |
164 |
<td><input type="text" class="filter" data-column_num="6" placeholder="Search expiration date" /></td> |
184 |
<td><input type="text" class="filter" data-column_num="6" placeholder="Search expiration date" /></td> |
|
|
185 |
[% FOR field IN additional_fields_for_subscription %] |
186 |
<td><input type="text" class="filter" data-column_num="[% loop.count + 5 %]" placeholder="Search [% field.name %]" /></td> |
187 |
[% END %] |
165 |
[% IF ( routing && CAN_user_serials_routing ) %]<td></td>[% END %] |
188 |
[% IF ( routing && CAN_user_serials_routing ) %]<td></td>[% END %] |
166 |
<td></td> |
189 |
<td></td> |
167 |
<td></td> |
190 |
<td></td> |
Lines 192-197
Link Here
|
192 |
<td> |
215 |
<td> |
193 |
[% IF ( subscription.enddate ) %][% subscription.enddate | $KohaDates %][% END %] |
216 |
[% IF ( subscription.enddate ) %][% subscription.enddate | $KohaDates %][% END %] |
194 |
</td> |
217 |
</td> |
|
|
218 |
[% FOR field IN additional_fields_for_subscription %] |
219 |
[% IF field.authorised_value_category %] |
220 |
<td>[% AuthorisedValues.GetByCode( field.authorised_value_category, subscription.additional_fields.${field.name} ) %]</td> |
221 |
[% ELSE %] |
222 |
<td>[% subscription.additional_fields.${field.name} %]</td> |
223 |
[% END %] |
224 |
[% END %] |
225 |
<td><a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]">Issue history</a> |
226 |
</td> |
195 |
[% IF ( routing && CAN_user_serials_routing ) %] |
227 |
[% IF ( routing && CAN_user_serials_routing ) %] |
196 |
<td> |
228 |
<td> |
197 |
[% IF ( subscription.cannotedit ) %] |
229 |
[% IF ( subscription.cannotedit ) %] |
Lines 206-213
Link Here
|
206 |
[% END %] |
238 |
[% END %] |
207 |
</td> |
239 |
</td> |
208 |
[% END %] |
240 |
[% END %] |
209 |
<td><a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]">Issue history</a> |
|
|
210 |
</td> |
211 |
<td> |
241 |
<td> |
212 |
[% IF ( CAN_user_serials_receive_serials ) %] |
242 |
[% IF ( CAN_user_serials_receive_serials ) %] |
213 |
<a href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscription.subscriptionid %]&serstatus=1,3,7">Serial receive</a> |
243 |
<a href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscription.subscriptionid %]&serstatus=1,3,7">Serial receive</a> |
Lines 227-232
Link Here
|
227 |
<div id="closed"> |
257 |
<div id="closed"> |
228 |
[% IF closedsubscriptions %] |
258 |
[% IF closedsubscriptions %] |
229 |
<table id="csrlt"> |
259 |
<table id="csrlt"> |
|
|
260 |
<!-- FIXME add additional_fields for closed subs --> |
230 |
<thead> |
261 |
<thead> |
231 |
<tr> |
262 |
<tr> |
232 |
<th>ISSN</th> |
263 |
<th>ISSN</th> |
Lines 235-240
Link Here
|
235 |
<th>Library</th> |
266 |
<th>Library</th> |
236 |
<th>Location</th> |
267 |
<th>Location</th> |
237 |
<th>Call number</th> |
268 |
<th>Call number</th> |
|
|
269 |
[% FOR field IN additional_fields_for_subscription %] |
270 |
<th>[% field.name %]</th> |
271 |
[% END %] |
238 |
<th> </th> |
272 |
<th> </th> |
239 |
<th> </th> |
273 |
<th> </th> |
240 |
</tr> |
274 |
</tr> |
Lines 247-252
Link Here
|
247 |
<td><input type="text" class="filter" data-column_num="3" placeholder="Search library" /></td> |
281 |
<td><input type="text" class="filter" data-column_num="3" placeholder="Search library" /></td> |
248 |
<td><input type="text" class="filter" data-column_num="4" placeholder="Search location" /></td> |
282 |
<td><input type="text" class="filter" data-column_num="4" placeholder="Search location" /></td> |
249 |
<td><input type="text" class="filter" data-column_num="5" placeholder="Search callnumber" /></td> |
283 |
<td><input type="text" class="filter" data-column_num="5" placeholder="Search callnumber" /></td> |
|
|
284 |
[% FOR field IN additional_fields_for_subscription %] |
285 |
<td><input type="text" class="filter" data-column_num="[% loop.count + 5 %]" placeholder="Search [% field.name %]" /></td> |
286 |
[% END %] |
250 |
<td></td> |
287 |
<td></td> |
251 |
<td></td> |
288 |
<td></td> |
252 |
</tr> |
289 |
</tr> |
Lines 276-281
Link Here
|
276 |
<td> |
313 |
<td> |
277 |
[% IF ( subscription.callnumber ) %][% subscription.callnumber %][% END %] |
314 |
[% IF ( subscription.callnumber ) %][% subscription.callnumber %][% END %] |
278 |
</td> |
315 |
</td> |
|
|
316 |
[% FOR field IN additional_fields_for_subscription %] |
317 |
[% IF field.authorised_value_category %] |
318 |
<td>[% KohaAuthorisedValues.GetByCode( field.authorised_value_category, subscription.additional_fields.${field.name} ) %]</td> |
319 |
[% ELSE %] |
320 |
<td>[% subscription.additional_fields.${field.name} %]</td> |
321 |
[% END %] |
322 |
[% END %] |
279 |
<td> |
323 |
<td> |
280 |
[% UNLESS subscription.cannotedit %] |
324 |
[% UNLESS subscription.cannotedit %] |
281 |
<a href="/cgi-bin/koha/serials/serials-search.pl?subscriptionid=[% subscription.subscriptionid %]&op=reopen&routing=[% subscription.routing %]&searched=1&title_filter=[% title_filter %]&ISSN_filter=[% ISSN_filter %]&EAN_filter=[% EAN_filter %]&published_filter=[% publisher_filter %]&bookseller_filter=[% bookseller_filter %]&branch_filter=[% branch_filter %]" id="reopensub">Reopen</a> |
325 |
<a href="/cgi-bin/koha/serials/serials-search.pl?subscriptionid=[% subscription.subscriptionid %]&op=reopen&routing=[% subscription.routing %]&searched=1&title_filter=[% title_filter %]&ISSN_filter=[% ISSN_filter %]&EAN_filter=[% EAN_filter %]&published_filter=[% publisher_filter %]&bookseller_filter=[% bookseller_filter %]&branch_filter=[% branch_filter %]" id="reopensub">Reopen</a> |
Lines 374-379
Link Here
|
374 |
<input type="text" id="to" name="expiration_date_filter" value="[% expiration_date_filter | $KohaDates %]" size="10" maxlength="10" class="datepickerto" /> |
418 |
<input type="text" id="to" name="expiration_date_filter" value="[% expiration_date_filter | $KohaDates %]" size="10" maxlength="10" class="datepickerto" /> |
375 |
</li> |
419 |
</li> |
376 |
|
420 |
|
|
|
421 |
[% FOR field IN additional_fields_for_subscription %] |
422 |
<li> |
423 |
<label for="additional_field_[% field.id %]ID"> [% field.name %]: </label> |
424 |
[% IF field.authorised_value_choices %] |
425 |
<select id="additional_field_[% field.id %]" name="additional_field_[% field.id %]_filter"> |
426 |
<option value="">All</option> |
427 |
[% FOREACH av IN field.authorised_value_choices %] |
428 |
[% IF av.authorised_value == additional_field_filters.${field.name} %] |
429 |
<option value="[% av.authorised_value %]" selected="selected">[% av.lib %]</option> |
430 |
[% ELSE %] |
431 |
<option value="[% av.authorised_value %]">[% av.lib %]</option> |
432 |
[% END %] |
433 |
[% END %] |
434 |
</select> |
435 |
[% ELSE %] |
436 |
<input id="additional_field_[% field.id %]" type="text" value="[% additional_field_filters.${field.name} %]" name="additional_field_[% field.id %]_filter" /> |
437 |
[% END %] |
438 |
</li> |
439 |
[% END %] |
377 |
</ol> |
440 |
</ol> |
378 |
<input type="hidden" name="searched" value="1" /> |
441 |
<input type="hidden" name="searched" value="1" /> |
379 |
<fieldset class="action"> |
442 |
<fieldset class="action"> |