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

(-)a/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css (-1 / +3 lines)
Lines 235-241 tr.even.selected td { Link Here
235
}
235
}
236
236
237
/* ColumnFilter */
237
/* ColumnFilter */
238
span.filter_column > input.text_filter {
238
span.filter_column > input.text_filter,
239
span.filter_column > input.number_filter,
240
span.filter_column > input.date_range_filter {
239
    font-size: 80%;
241
    font-size: 80%;
240
    width: 100%;
242
    width: 100%;
241
    padding: 0;
243
    padding: 0;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt (-134 / +149 lines)
Lines 2-29 Link Here
2
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
3
<title>Koha &rsaquo; Search for vendor [% supplier %]</title>
3
<title>Koha &rsaquo; Search for vendor [% supplier %]</title>
4
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
5
<style type="text/css">
6
#vendors td{
7
	vertical-align: top;
8
}
9
</style>
10
<link rel="stylesheet" href="[% themelang %]/css/datatables.css" />
5
<link rel="stylesheet" href="[% themelang %]/css/datatables.css" />
11
[% INCLUDE 'datatables.inc' %]
6
[% INCLUDE 'datatables.inc' %]
7
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script>
8
12
<script type="text/javascript">
9
<script type="text/javascript">
13
//<![CDATA[
10
//<![CDATA[
14
$(document).ready(function() {
11
$(document).ready(function() {
15
    $("table.baskets").dataTable($.extend(true, {}, dataTablesDefaults, {
12
    var thead_row = $("#baskets").find('thead tr');
16
        'sDom': 't',
13
    var clone = thead_row.clone().addClass('filters_row');
17
        'bPaginate': false,
14
    thead_row.before(clone);
18
        'bFilter': false,
15
19
        'bInfo': false,
16
    var table = $("#baskets").dataTable($.extend(true, {}, dataTablesDefaults, {
20
        "aaSorting": [[ 1, "asc" ]],
17
        "fnDrawCallback": function ( oSettings ) {
18
            if ( oSettings.aiDisplay.length == 0 )
19
            {
20
                return;
21
            }
22
23
            var nTrs = $('#baskets tbody tr');
24
            var iColspan = nTrs[0].getElementsByTagName('td').length;
25
            var sLastGroup = "";
26
            for ( var i=0 ; i<nTrs.length ; i++ )
27
            {
28
                var iDisplayIndex = oSettings._iDisplayStart + i;
29
                var sGroup = oSettings.aoData[ oSettings.aiDisplay[iDisplayIndex] ]._aData[0];
30
                if ( sGroup != sLastGroup )
31
                {
32
                    var nGroup = document.createElement( 'tr' );
33
                    var nCell = document.createElement( 'td' );
34
                    nCell.colSpan = iColspan;
35
                    nCell.className = "group";
36
                    nCell.innerHTML = sGroup;
37
                    nGroup.appendChild( nCell );
38
                    nTrs[i].parentNode.insertBefore( nGroup, nTrs[i] );
39
                    sLastGroup = sGroup;
40
                }
41
            }
42
        },
21
        "aoColumnDefs": [
43
        "aoColumnDefs": [
22
            { "sType": "title-string", "aTargets" : [ "title-string" ] },
44
            { "bVisible": false, "aTargets": [ 'NoVisible' ] },
23
            { "sType": "title-numeric", "aTargets" : [ "title-numeric" ] },
45
            { "bSortable": false, "aTargets": ["_all"] }
24
            { 'aTargets': [-1], 'bSortable': false }
46
        ],
25
        ]
47
        'bSort': true,
26
    }));
48
        'aaSortingFixed': [[ 0, 'asc' ]],
49
        'bPaginate': false,
50
        'bAutoWidth': false
51
    })).columnFilter(
52
        {
53
            'sPlaceHolder': 'head:after',
54
            // The first column is hidden
55
            // Without bUseColVis, the filters don't work on the correct column.
56
            'bUseColVis': true,
57
            'aoColumns': [
58
                null,
59
                { type: 'number' },
60
                { type: 'text' },
61
                { type: 'number' },
62
                { type: 'number' },
63
                { type: 'number' },
64
                { type: 'text' },
65
                { type: 'date-range' },
66
                { type: 'text' },
67
                { type: 'date-range' },
68
                null
69
70
            ]
71
        }
72
    );
73
27
    $("#supplierlist").change(function() {
74
    $("#supplierlist").change(function() {
28
        var id = $(this).find("option:selected").val();
75
        var id = $(this).find("option:selected").val();
29
        window.location.href = "#" + id;
76
        window.location.href = "#" + id;
Lines 55-188 $(document).ready(function() { Link Here
55
<h1>You searched on <b>vendor [% supplier %],</b> [% count %] results found</h1>
102
<h1>You searched on <b>vendor [% supplier %],</b> [% count %] results found</h1>
56
[% END %]
103
[% END %]
57
[% IF ( loop_suppliers.size ) %]
104
[% IF ( loop_suppliers.size ) %]
58
    [% UNLESS (count == 1) %]
105
    [% IF allbaskets %]
59
        <p>Choose a vendor in the list to jump directly to the right place.
60
        <select id="supplierlist">
61
            [% FOREACH supplier1 IN loop_suppliers %]
62
                <option value="[% supplier1.booksellerid %]">[% supplier1.name %]</option>
63
            [% END %]
64
        </select>
65
        </p>
66
    [% END %]
67
    [% IF ( allbaskets ) %]
68
        <p><a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier %]&amp;booksellerid=[% booksellerid %]">Show active baskets only</a></p>
106
        <p><a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier %]&amp;booksellerid=[% booksellerid %]">Show active baskets only</a></p>
69
    [% ELSE %]
107
    [% ELSE %]
70
        <p><a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier %]&amp;booksellerid=[% booksellerid %]&amp;allbaskets=1">Show all baskets</a></p>
108
        <p><a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier %]&amp;booksellerid=[% booksellerid %]&amp;allbaskets=1">Show all baskets</a></p>
71
    [% END %]
109
    [% END %]
72
    <div id="acqui_order_supplierlist">
110
    <div id="acqui_order_basketlist">
111
    <table id="baskets" class="group">
112
        <thead>
113
            <tr>
114
                <th class='NoVisible'>bookseller</th>
115
                <th>No.</th>
116
                <th>Name</th>
117
                <th class="title-numeric">Item count</th>
118
                <th class="title-numeric">Biblio count</th>
119
                <th>Items expected</th>
120
                <th>Created by</th>
121
                <th class="title-string">Date</th>
122
                <th>Basket group</th>
123
                <th class="title-string">Closed</th>
124
                <th>&nbsp;</th>
125
            </tr>
126
        </thead>
127
        <tbody>
73
        [% FOREACH supplier IN loop_suppliers %]
128
        [% FOREACH supplier IN loop_suppliers %]
74
            <div class="supplier">
129
            [% FOREACH basket IN supplier.loop_basket %]
75
                <span class="suppliername">
130
                [% IF ( basket.uncertainprices ) %]
76
                    [% IF (supplier.name) %]
131
                    <tr class="problem">
77
                        <a name="[% supplier.booksellerid %]" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% supplier.booksellerid %]">[% supplier.name %]</a>
132
                [% ELSE %]
78
                    [% ELSE %]
133
                    <tr>
79
                        <a name="[% supplier.booksellerid %]" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% supplier.booksellerid %]">NO NAME</a>
134
                [% END %]
80
                    [% END %]
135
                    <td>[% supplier.name %] ([% supplier.booksellerid %])</td>
81
                </span>
136
                    <td>[% basket.basketno %]</td>
82
                <span class="action">
137
                    <td>[% basket.basketname %]</td>
83
                    [% IF ( CAN_user_acquisition_order_manage ) %]
138
                    <td>
84
                        [% IF ( supplier.active ) %]
139
                        <span title="[% basket.total_items %]">[% basket.total_items %]
85
                            <a class="btn btn-small" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% supplier.booksellerid %]&amp;op=add_form"><i class="icon-plus"></i> New basket</a>
140
                            [% IF basket.total_items_cancelled %]
141
                                ([% basket.total_items_cancelled %] cancelled)
142
                            [% END %]
143
                        </span>
144
                    </td>
145
                    <td>
146
                        <span title="[% basket.total_biblios %]">[% basket.total_biblios %]
147
                            [% IF basket.total_biblios_cancelled %]
148
                                ([% basket.total_biblios_cancelled %] cancelled)
149
                            [% END %]
150
                        </span>
151
                    </td>
152
                    <td>[% basket.expected_items %]</td>
153
                    <td>
154
                        [% basket.authorisedby_firstname %]
155
                        [% basket.authorisedby_surname %]
156
                    </td>
157
                    <td><span title="[% basket.creationdate %]">[% basket.creationdate | $KohaDates %]</span></td>
158
                    <td>
159
                      [% IF basket.basketgroup %]
160
                        [% basketgroup = basket.basketgroup %]
161
                        [% IF basketgroup.closed %]
162
                          [% basketgroup.name %] (closed)
86
                        [% ELSE %]
163
                        [% ELSE %]
87
                            (inactive)
164
                          <a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% basket.booksellerid %]&amp;basketgroupid=[% basketgroup.id %]">[% basketgroup.name %]</a>
88
                        [% END %]
165
                        [% END %]
89
                    [% END %]
166
                      [% END %]
90
                    <a class="btn btn-small" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% supplier.booksellerid %]"><i class="icon-inbox"></i> Receive shipment</a>
167
                    </td>
91
                </span>
168
                    <td>
92
                <div class="baskets">
169
                        [% IF ( basket.closedate ) %]
93
                    [% IF ( supplier.loop_basket.size ) %]
170
                            <span title="[% basket.closedate %]">[% basket.closedate | $KohaDates %]</span>
94
                        <table class="baskets">
171
                        [% ELSE %]
95
                            <thead>
172
                            <span title="9999-99-99"></span>
96
                                <tr>
173
                        [% END %]
97
                                    <th>No.</th>
174
                    </td>
98
                                    <th>Name</th>
175
                    <td>
99
                                    <th class="title-numeric">Item count</th>
176
                        <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno %]">View</a>
100
                                    <th class="title-numeric">Biblio count</th>
101
                                    <th>Items expected</th>
102
                                    <th>Created by</th>
103
                                    <th class="title-string">Date</th>
104
                                    <th>Basket group</th>
105
                                    <th class="title-string">Closed</th>
106
                                    <th>&nbsp;</th>
107
                                </tr>
108
                            </thead>
109
                            <tbody>
110
                                [% FOREACH basket IN supplier.loop_basket %]
111
                                    [% IF ( basket.uncertainprices ) %]
112
                                        <tr class="problem">
113
                                    [% ELSE %]
114
                                        <tr>
115
                                    [% END %]
116
                                        <td>[% basket.basketno %]</td>
117
                                        <td>[% basket.basketname %]</td>
118
                                        <td>
119
                                            <span title="[% basket.total_items %]">[% basket.total_items %]
120
                                                [% IF basket.total_items_cancelled %]
121
                                                    ([% basket.total_items_cancelled %] cancelled)
122
                                                [% END %]
123
                                            </span>
124
                                        </td>
125
                                        <td>
126
                                            <span title="[% basket.total_biblios %]">[% basket.total_biblios %]
127
                                                [% IF basket.total_biblios_cancelled %]
128
                                                    ([% basket.total_biblios_cancelled %] cancelled)
129
                                                [% END %]
130
                                            </span>
131
                                        </td>
132
                                        <td>[% basket.expected_items %]</td>
133
                                        <td>
134
                                            [% basket.authorisedby_firstname %]
135
                                            [% basket.authorisedby_surname %]
136
                                        </td>
137
                                        <td><span title="[% basket.creationdate %]">[% basket.creationdate | $KohaDates %]</span></td>
138
                                        <td>
139
                                          [% IF basket.basketgroup %]
140
                                            [% basketgroup = basket.basketgroup %]
141
                                            [% IF basketgroup.closed %]
142
                                              [% basketgroup.name %] (closed)
143
                                            [% ELSE %]
144
                                              <a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% basket.booksellerid %]&amp;basketgroupid=[% basketgroup.id %]">[% basketgroup.name %]</a>
145
                                            [% END %]
146
                                          [% END %]
147
                                        </td>
148
                                        <td>
149
                                            [% IF ( basket.closedate ) %]
150
                                                <span title="[% basket.closedate %]">[% basket.closedate | $KohaDates %]</span>
151
                                            [% ELSE %]
152
                                                <span title="9999-99-99"></span>
153
                                            [% END %]
154
                                        </td>
155
                                        <td>
156
                                            <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno %]">View</a>
157
158
                                            [% UNLESS ( basket.closedate ) %]
159
                                               | <a id="addtoBasketLabel[% basket.basketno %]" href="#addtoBasket[% basket.basketno %]" role="button" data-toggle="modal">Add to basket</a>
160
                                                <!-- Modal -->
161
                                                <div id="addtoBasket[% basket.basketno %]" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="addtoBasketLabel[% basket.basketno %]" aria-hidden="true" data-basketno="[% basket.basketname %]">
162
                                                    <div class="modal-body">
163
                                                        [% INCLUDE 'acquisitions-add-to-basket.inc' booksellerid=supplier.booksellerid basketno=basket.basketno %]
164
                                                    </div>
165
                                                    <div class="modal-footer">
166
                                                        <a href="#" class="cancel" data-dismiss="modal" aria-hidden="true">Cancel</a>
167
                                                    </div>
168
                                                </div>
169
                                            [% END %]
170
                                        </td>
171
                                    </tr>
172
                                [% END %][%# FOREACH basket IN supplier.loop_basket %]
173
                            </tbody>
174
                        </table>
175
177
176
                    [% ELSE %]
178
                        [% UNLESS ( basket.closedate ) %]
177
                        <p>No pending baskets</p>
179
                           | <a id="addtoBasketLabel[% basket.basketno %]" href="#addtoBasket[% basket.basketno %]" role="button" data-toggle="modal">Add to basket</a>
178
                    [% END %][%# IF ( supplier.loop_basket.size ) %]
180
                            <!-- Modal -->
179
                </div>
181
                            <div id="addtoBasket[% basket.basketno %]" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="addtoBasketLabel[% basket.basketno %]" aria-hidden="true" data-basketno="[% basket.basketname %]">
180
            </div>
182
                                <div class="modal-body">
181
        [% END %][%# FOREACH supplier IN loop_suppliers %]
183
                                    [% INCLUDE 'acquisitions-add-to-basket.inc' booksellerid=supplier.booksellerid basketno=basket.basketno %]
182
    </div>
184
                                </div>
185
                                <div class="modal-footer">
186
                                    <a href="#" class="cancel" data-dismiss="modal" aria-hidden="true">Cancel</a>
187
                                </div>
188
                            </div>
189
                        [% END %]
190
                    </td>
191
                </tr>
192
            [% END %][%# FOREACH basket IN supplier.loop_basket %]
193
            [% END %]
194
        </tbody>
195
    </table>
196
[% ELSE %]
197
    <p>No pending baskets</p>
183
[% END %][%# IF ( loop_suppliers.size ) %]
198
[% END %][%# IF ( loop_suppliers.size ) %]
184
</div>
199
</div>
185
</div>
200
</div>
201
</div>
186
<div class="yui-b">
202
<div class="yui-b">
187
[% IF ( booksellerid ) %]
203
[% IF ( booksellerid ) %]
188
[% INCLUDE 'vendor-menu.inc' %]
204
[% INCLUDE 'vendor-menu.inc' %]
189
- 

Return to bug 13371