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

(-)a/acqui/addorderiso2709.pl (-3 / +2 lines)
Lines 333-345 sub import_batches_list { Link Here
333
            # check if there is at least 1 line still staged
333
            # check if there is at least 1 line still staged
334
            my $stagedList=GetImportRecordsRange($batch->{'import_batch_id'}, undef, undef, 'staged');
334
            my $stagedList=GetImportRecordsRange($batch->{'import_batch_id'}, undef, undef, 'staged');
335
            if (scalar @$stagedList) {
335
            if (scalar @$stagedList) {
336
                my ($staged_date, $staged_hour) = split (/ /, $batch->{'upload_timestamp'});
337
                push @list, {
336
                push @list, {
338
                        import_batch_id => $batch->{'import_batch_id'},
337
                        import_batch_id => $batch->{'import_batch_id'},
339
                        num_biblios => $batch->{'num_biblios'},
338
                        num_biblios => $batch->{'num_biblios'},
340
                        num_items => $batch->{'num_items'},
339
                        num_items => $batch->{'num_items'},
341
                        staged_date => $staged_date,
340
                        staged_date => $batch->{'upload_timestamp'},
342
                        staged_hour => $staged_hour,
343
                        import_status => $batch->{'import_status'},
341
                        import_status => $batch->{'import_status'},
344
                        file_name => $batch->{'file_name'},
342
                        file_name => $batch->{'file_name'},
345
                        comments => $batch->{'comments'},
343
                        comments => $batch->{'comments'},
Lines 351-356 sub import_batches_list { Link Here
351
        }
349
        }
352
    }
350
    }
353
    $template->param(batch_list => \@list); 
351
    $template->param(batch_list => \@list); 
352
    $template->param(dateformat => C4::Context->preference('dateformat'));
354
    my $num_batches = GetNumberOfNonZ3950ImportBatches();
353
    my $num_batches = GetNumberOfNonZ3950ImportBatches();
355
    $template->param(num_results => $num_batches);
354
    $template->param(num_results => $num_batches);
356
}
355
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt (-3 / +11 lines)
Lines 16-28 Link Here
16
<script type="text/JavaScript">
16
<script type="text/JavaScript">
17
//<![CDATA[
17
//<![CDATA[
18
    $(document).ready(function() {
18
    $(document).ready(function() {
19
        [% IF (dateformat == 'metric') %]
20
            dt_add_type_uk_date();
21
        [% END %]
19
        var srlt = $("#files").dataTable($.extend(true, {}, dataTablesDefaults, {
22
        var srlt = $("#files").dataTable($.extend(true, {}, dataTablesDefaults, {
20
            "aoColumnDefs": [
23
            "aoColumnDefs": [
24
             [% IF (dateformat == 'metric') %]
25
                { "aTargets": [ 3 ], "sType": "uk_date" },
26
             [% END %]
21
                { "aTargets": [ 5 ], "bSortable": false, "bSearchable": false },
27
                { "aTargets": [ 5 ], "bSortable": false, "bSearchable": false },
22
            ],
28
            ],
23
            "sPaginationType": "four_button"
29
            "sPaginationType": "four_button",
30
            "aaSorting": []
31
24
        } ) );
32
        } ) );
25
    });
33
    });
34
26
//]]>
35
//]]>
27
</script>
36
</script>
28
</head>
37
</head>
Lines 95-101 Link Here
95
                        <td>[% batch_lis.file_name %]</td>
104
                        <td>[% batch_lis.file_name %]</td>
96
                       <td>[% batch_lis.comments %]</td>
105
                       <td>[% batch_lis.comments %]</td>
97
                       <td>[% batch_lis.import_status %]</td>
106
                       <td>[% batch_lis.import_status %]</td>
98
                       <td>[% batch_lis.staged_date | $KohaDates %] [% batch_lis.staged_hour %]</td>
107
                       <td>[% batch_lis.staged_date | $KohaDates %]</td>
99
                       <td>[% batch_lis.num_biblios %]</td>
108
                       <td>[% batch_lis.num_biblios %]</td>
100
                       <td><a href="[% batch_lis.scriptname %]?import_batch_id=[% batch_lis.import_batch_id %]&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]">Add orders</a></td>
109
                       <td><a href="[% batch_lis.scriptname %]?import_batch_id=[% batch_lis.import_batch_id %]&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]">Add orders</a></td>
101
                     </tr>
110
                     </tr>
102
- 

Return to bug 11059