|
Lines 28-33
Link Here
|
| 28 |
} ) ); |
28 |
} ) ); |
| 29 |
|
29 |
|
| 30 |
var csrlt = $("#csrlt").dataTable($.extend(true, {}, dataTablesDefaults, { |
30 |
var csrlt = $("#csrlt").dataTable($.extend(true, {}, dataTablesDefaults, { |
|
|
31 |
// FIXME sort function of additional_fields! |
| 31 |
"aoColumnDefs": [ |
32 |
"aoColumnDefs": [ |
| 32 |
{ "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false }, |
33 |
{ "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false }, |
| 33 |
], |
34 |
], |
|
Lines 125-130
Link Here
|
| 125 |
<label for="to">Expires before:</label> |
126 |
<label for="to">Expires before:</label> |
| 126 |
<input type="text" id="to" name="expiration_date_filter" value="[% expiration_date_filter | $KohaDates %]" size="10" maxlength="10" class="datepickerto" /> |
127 |
<input type="text" id="to" name="expiration_date_filter" value="[% expiration_date_filter | $KohaDates %]" size="10" maxlength="10" class="datepickerto" /> |
| 127 |
</li> |
128 |
</li> |
|
|
129 |
[% FOR field IN additional_fields_for_subscription %] |
| 130 |
<li> |
| 131 |
<label for="additional_field_[% field.id %]"> [% field.name %]: </label> |
| 132 |
[% IF field.authorised_value_choices %] |
| 133 |
<select id="additional_field_[% field.id %]" name="additional_field_[% field.id %]_filter"> |
| 134 |
<option value="">All</option> |
| 135 |
[% FOREACH av IN field.authorised_value_choices %] |
| 136 |
<option value="[% av.authorised_value %]">[% av.lib %]</option> |
| 137 |
[% END %] |
| 138 |
</select> |
| 139 |
[% ELSE %] |
| 140 |
<input id="additional_field_[% field.id %]" type="text" value="[% additional_fields.${field.name} %]" name="additional_field_[% field.id %]_filter" /> |
| 141 |
[% END %] |
| 142 |
</li> |
| 143 |
[% END %] |
| 128 |
</ol> |
144 |
</ol> |
| 129 |
<input type="hidden" name="searched" value="1" /> |
145 |
<input type="hidden" name="searched" value="1" /> |
| 130 |
<fieldset class="action"> |
146 |
<fieldset class="action"> |
|
Lines 153-158
Link Here
|
| 153 |
<th>Location</th> |
169 |
<th>Location</th> |
| 154 |
<th>Call number</th> |
170 |
<th>Call number</th> |
| 155 |
<th>Expiration date</th> |
171 |
<th>Expiration date</th> |
|
|
172 |
[% FOR field IN additional_fields_for_subscription %] |
| 173 |
<th>[% field.name %]</th> |
| 174 |
[% END %] |
| 156 |
[% IF ( routing && CAN_user_serials_routing ) %] |
175 |
[% IF ( routing && CAN_user_serials_routing ) %] |
| 157 |
<th>Routing list</th> |
176 |
<th>Routing list</th> |
| 158 |
[% END %] |
177 |
[% END %] |
|
Lines 169-174
Link Here
|
| 169 |
<td><input type="text" class="filter" data-column_num="4" placeholder="Search location" /></td> |
188 |
<td><input type="text" class="filter" data-column_num="4" placeholder="Search location" /></td> |
| 170 |
<td><input type="text" class="filter" data-column_num="5" placeholder="Search callnumber" /></td> |
189 |
<td><input type="text" class="filter" data-column_num="5" placeholder="Search callnumber" /></td> |
| 171 |
<td><input type="text" class="filter" data-column_num="6" placeholder="Search expiration date" /></td> |
190 |
<td><input type="text" class="filter" data-column_num="6" placeholder="Search expiration date" /></td> |
|
|
191 |
[% FOR field IN additional_fields_for_subscription %] |
| 192 |
<td><input type="text" class="filter" data-column_num="[% loop.count + 5 %]" placeholder="Search [% field.name %]" /></td> |
| 193 |
[% END %] |
| 172 |
[% IF ( routing && CAN_user_serials_routing ) %]<td></td>[% END %] |
194 |
[% IF ( routing && CAN_user_serials_routing ) %]<td></td>[% END %] |
| 173 |
<td></td> |
195 |
<td></td> |
| 174 |
<td></td> |
196 |
<td></td> |
|
Lines 203-208
Link Here
|
| 203 |
<span title="0000-00-00"></span> |
225 |
<span title="0000-00-00"></span> |
| 204 |
[% END %] |
226 |
[% END %] |
| 205 |
</td> |
227 |
</td> |
|
|
228 |
[% FOR field IN additional_fields_for_subscription %] |
| 229 |
[% IF field.authorised_value_category %] |
| 230 |
<td>[% AuthorisedValues.GetByCode( field.authorised_value_category, subscription.additional_fields.${field.name} ) %]</td> |
| 231 |
[% ELSE %] |
| 232 |
<td>[% subscription.additional_fields.${field.name} %]</td> |
| 233 |
[% END %] |
| 234 |
[% END %] |
| 235 |
<td><a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]">Issue history</a> |
| 236 |
</td> |
| 206 |
[% IF ( routing && CAN_user_serials_routing ) %] |
237 |
[% IF ( routing && CAN_user_serials_routing ) %] |
| 207 |
<td> |
238 |
<td> |
| 208 |
[% IF ( subscription.cannotedit ) %] |
239 |
[% IF ( subscription.cannotedit ) %] |
|
Lines 217-224
Link Here
|
| 217 |
[% END %] |
248 |
[% END %] |
| 218 |
</td> |
249 |
</td> |
| 219 |
[% END %] |
250 |
[% END %] |
| 220 |
<td><a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]">Issue history</a> |
|
|
| 221 |
</td> |
| 222 |
<td> |
251 |
<td> |
| 223 |
[% IF ( CAN_user_serials_receive_serials ) %] |
252 |
[% IF ( CAN_user_serials_receive_serials ) %] |
| 224 |
<a href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscription.subscriptionid %]&serstatus=1,3,7">Serial receive</a> |
253 |
<a href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscription.subscriptionid %]&serstatus=1,3,7">Serial receive</a> |
|
Lines 238-243
Link Here
|
| 238 |
<div id="closed"> |
267 |
<div id="closed"> |
| 239 |
[% IF closedsubscriptions %] |
268 |
[% IF closedsubscriptions %] |
| 240 |
<table id="csrlt"> |
269 |
<table id="csrlt"> |
|
|
270 |
<!-- FIXME add additional_fields for closed subs --> |
| 241 |
<thead> |
271 |
<thead> |
| 242 |
<tr> |
272 |
<tr> |
| 243 |
<th>ISSN</th> |
273 |
<th>ISSN</th> |
|
Lines 246-251
Link Here
|
| 246 |
<th>Library</th> |
276 |
<th>Library</th> |
| 247 |
<th>Location</th> |
277 |
<th>Location</th> |
| 248 |
<th>Call number</th> |
278 |
<th>Call number</th> |
|
|
279 |
[% FOR field IN additional_fields_for_subscription %] |
| 280 |
<th>[% field.name %]</th> |
| 281 |
[% END %] |
| 249 |
<th> </th> |
282 |
<th> </th> |
| 250 |
<th> </th> |
283 |
<th> </th> |
| 251 |
</tr> |
284 |
</tr> |
|
Lines 258-263
Link Here
|
| 258 |
<td><input type="text" class="filter" data-column_num="3" placeholder="Search library" /></td> |
291 |
<td><input type="text" class="filter" data-column_num="3" placeholder="Search library" /></td> |
| 259 |
<td><input type="text" class="filter" data-column_num="4" placeholder="Search location" /></td> |
292 |
<td><input type="text" class="filter" data-column_num="4" placeholder="Search location" /></td> |
| 260 |
<td><input type="text" class="filter" data-column_num="5" placeholder="Search callnumber" /></td> |
293 |
<td><input type="text" class="filter" data-column_num="5" placeholder="Search callnumber" /></td> |
|
|
294 |
[% FOR field IN additional_fields_for_subscription %] |
| 295 |
<td><input type="text" class="filter" data-column_num="[% loop.count + 5 %]" placeholder="Search [% field.name %]" /></td> |
| 296 |
[% END %] |
| 261 |
<td></td> |
297 |
<td></td> |
| 262 |
<td></td> |
298 |
<td></td> |
| 263 |
</tr> |
299 |
</tr> |
|
Lines 287-292
Link Here
|
| 287 |
<td> |
323 |
<td> |
| 288 |
[% IF ( subscription.callnumber ) %][% subscription.callnumber %][% END %] |
324 |
[% IF ( subscription.callnumber ) %][% subscription.callnumber %][% END %] |
| 289 |
</td> |
325 |
</td> |
|
|
326 |
[% FOR field IN additional_fields_for_subscription %] |
| 327 |
[% IF field.authorised_value_category %] |
| 328 |
<td>[% KohaAuthorisedValues.GetByCode( field.authorised_value_category, subscription.additional_fields.${field.name} ) %]</td> |
| 329 |
[% ELSE %] |
| 330 |
<td>[% subscription.additional_fields.${field.name} %]</td> |
| 331 |
[% END %] |
| 332 |
[% END %] |
| 290 |
<td> |
333 |
<td> |
| 291 |
[% UNLESS subscription.cannotedit %] |
334 |
[% UNLESS subscription.cannotedit %] |
| 292 |
<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> |
335 |
<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 385-390
Link Here
|
| 385 |
<input type="text" id="to" name="expiration_date_filter" value="[% expiration_date_filter | $KohaDates %]" size="10" maxlength="10" class="datepickerto" /> |
428 |
<input type="text" id="to" name="expiration_date_filter" value="[% expiration_date_filter | $KohaDates %]" size="10" maxlength="10" class="datepickerto" /> |
| 386 |
</li> |
429 |
</li> |
| 387 |
|
430 |
|
|
|
431 |
[% FOR field IN additional_fields_for_subscription %] |
| 432 |
<li> |
| 433 |
<label for="additional_field_[% field.id %]ID"> [% field.name %]: </label> |
| 434 |
[% IF field.authorised_value_choices %] |
| 435 |
<select id="additional_field_[% field.id %]" name="additional_field_[% field.id %]_filter"> |
| 436 |
<option value="">All</option> |
| 437 |
[% FOREACH av IN field.authorised_value_choices %] |
| 438 |
[% IF av.authorised_value == additional_field_filters.${field.name} %] |
| 439 |
<option value="[% av.authorised_value %]" selected="selected">[% av.lib %]</option> |
| 440 |
[% ELSE %] |
| 441 |
<option value="[% av.authorised_value %]">[% av.lib %]</option> |
| 442 |
[% END %] |
| 443 |
[% END %] |
| 444 |
</select> |
| 445 |
[% ELSE %] |
| 446 |
<input id="additional_field_[% field.id %]" type="text" value="[% additional_field_filters.${field.name} %]" name="additional_field_[% field.id %]_filter" /> |
| 447 |
[% END %] |
| 448 |
</li> |
| 449 |
[% END %] |
| 388 |
</ol> |
450 |
</ol> |
| 389 |
<input type="hidden" name="searched" value="1" /> |
451 |
<input type="hidden" name="searched" value="1" /> |
| 390 |
<fieldset class="action"> |
452 |
<fieldset class="action"> |