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

(-)a/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js (+16 lines)
Lines 382-384 $.fn.dataTableExt.oPagination.four_button = { Link Here
382
        }
382
        }
383
    }
383
    }
384
};
384
};
385
386
$.fn.dataTableExt.oSort['num-html-asc']  = function(a,b) {
387
    var x = a.replace( /<.*?>/g, "" );
388
    var y = b.replace( /<.*?>/g, "" );
389
    x = parseFloat( x );
390
    y = parseFloat( y );
391
    return ((x < y) ? -1 : ((x > y) ?  1 : 0));
392
};
393
394
$.fn.dataTableExt.oSort['num-html-desc'] = function(a,b) {
395
    var x = a.replace( /<.*?>/g, "" );
396
    var y = b.replace( /<.*?>/g, "" );
397
    x = parseFloat( x );
398
    y = parseFloat( y );
399
    return ((x < y) ?  1 : ((x > y) ? -1 : 0));
400
};
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-22 / +39 lines)
Lines 1-26 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( date ) %]
2
<title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( date ) %]
3
            Receipt summary for [% name %] [% IF ( invoice ) %]invoice [% invoice %][% END %] on [% formatteddatereceived %][% ELSE %]Receive orders from [% name %][% END %]</title>
3
            Receipt summary for [% name %] [% IF ( invoice ) %]invoice [% invoice %][% END %] on [% formatteddatereceived %][% ELSE %]Receive orders from [% name %][% END %]</title>
4
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
4
[% INCLUDE 'doc-head-close.inc' %]
5
[% INCLUDE 'doc-head-close.inc' %]
6
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
7
[% INCLUDE 'datatables-strings.inc' %]
8
<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
5
[% INCLUDE 'greybox.inc' %]
9
[% INCLUDE 'greybox.inc' %]
6
<script type="text/javascript" src="[% yuipath %]/json/json-min.js"></script>
10
<script type="text/javascript" src="[% yuipath %]/json/json-min.js"></script>
7
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
8
<script type="text/javascript">
11
<script type="text/javascript">
9
//<![CDATA[
12
//<![CDATA[
10
13
11
    var rowsToCollapse = 5;
14
    var rowsToCollapse = 5;
12
15
13
	$.tablesorter.addParser({
14
	    id: 'articles',
15
	    is: function(s) {return false;  },
16
	    format: function(s) { return s.toLowerCase().replace(/^(the|an|a) /,''); },
17
	    type: 'text'
18
	});
19
20
    $(document).ready(function(){
16
    $(document).ready(function(){
21
    $("#pendingt").tablesorter({
17
        var pendingt = $("#pendingt").dataTable($.extend(true, {}, dataTablesDefaults, {
22
		headers: { 2: { sorter: 'articles' },3: { sorter: false },7:{sorter:false}}
18
            "aoColumnDefs": [
23
    });
19
                { "aTargets": [ 3, 7, 8 ], "bSortable": false, "bSearchable": false },
20
            ],
21
            "aoColumns": [
22
                { "sType": "num-html" },
23
                { "sType": "num-html" },
24
                null,
25
                null,
26
                null,
27
                null,
28
                null,
29
                null,
30
                null,
31
            ],
32
            "sPaginationType": "four_button"
33
        } ) );
34
        var receivedt = $("#receivedt").dataTable($.extend(true, {}, dataTablesDefaults, {
35
            "aoColumnDefs": [
36
                { "aTargets": [ 3 ], "bSortable": false, "bSearchable": false },
37
            ],
38
            "aoColumns": [
39
                { "sType": "num-html" },
40
                { "sType": "num-html" },
41
                null,
42
                null,
43
                null,
44
                null,
45
                null,
46
                null,
47
            ],
48
            "sPaginationType": "four_button"
49
        } ) );
24
50
25
	rowCountPending  = $("#pendingt tbody.filterclass tr").length;
51
	rowCountPending  = $("#pendingt tbody.filterclass tr").length;
26
	rowCountReceived = $("#receivedt tbody.filterclass tr").length;
52
	rowCountReceived = $("#receivedt tbody.filterclass tr").length;
Lines 229-239 Link Here
229
		</tfoot>
255
		</tfoot>
230
    <tbody class="filterclass">
256
    <tbody class="filterclass">
231
        [% FOREACH loop_order IN loop_orders %]
257
        [% FOREACH loop_order IN loop_orders %]
232
	[% UNLESS ( loop.odd ) %]
233
            <tr class="highlight">
234
        [% ELSE %]
235
            <tr>
258
            <tr>
236
        [% END %]
237
                <td class="basketfilterclass"><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a></td>
259
                <td class="basketfilterclass"><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a></td>
238
                <td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber %]&amp;booksellerid=[% loop_order.booksellerid %]">[% loop_order.ordernumber %]</a></td>
260
                <td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber %]&amp;booksellerid=[% loop_order.booksellerid %]">[% loop_order.ordernumber %]</a></td>
239
                <td class="summaryfilterclass">
261
                <td class="summaryfilterclass">
Lines 323-330 Link Here
323
		<th>Actual cost</th>
345
		<th>Actual cost</th>
324
		<th>TOTAL</th>
346
		<th>TOTAL</th>
325
	    </tr>
347
	    </tr>
326
	</thead>
348
    </thead>
327
<tfoot>
349
    <tfoot>
328
	    <tr>
350
	    <tr>
329
		<td colspan="4" class="total">SUBTOTAL</td>
351
		<td colspan="4" class="total">SUBTOTAL</td>
330
		<td colspan="2">&nbsp;</td>
352
		<td colspan="2">&nbsp;</td>
Lines 361-371 Link Here
361
    </tfoot>
383
    </tfoot>
362
	<tbody class="filterclass">
384
	<tbody class="filterclass">
363
	    [% FOREACH loop_receive IN loop_received %]
385
	    [% FOREACH loop_receive IN loop_received %]
364
        [% UNLESS ( loop.odd ) %]
365
            <tr class="highlight">
366
        [% ELSE %]
367
            <tr>
386
            <tr>
368
        [% END %]
369
                <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a></td>
387
                <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a></td>
370
                <td><a href="neworderempty.pl?ordernumber=[% loop_receive.ordernumber %]&amp;booksellerid=[% booksellerid %]">[% loop_receive.ordernumber %]</a></td>
388
                <td><a href="neworderempty.pl?ordernumber=[% loop_receive.ordernumber %]&amp;booksellerid=[% booksellerid %]">[% loop_receive.ordernumber %]</a></td>
371
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_receive.biblionumber %]">[% loop_receive.title |html %]</a>
389
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_receive.biblionumber %]">[% loop_receive.title |html %]</a>
372
- 

Return to bug 8098