@@ -, +, @@ --- acqui/booksellers.pl | 11 + koha-tmpl/intranet-tmpl/prog/css/datatables.css | 17 + .../prog/en/modules/acqui/booksellers.tt | 369 +++++++++++++-------- 3 files changed, 259 insertions(+), 138 deletions(-) --- a/acqui/booksellers.pl +++ a/acqui/booksellers.pl @@ -156,11 +156,22 @@ for my $vendor (@suppliers) { }; } + +my $sessionID = $query->cookie('CGISESSID'); +my $session = C4::Auth::get_session($sessionID); +my $view = $query->param('view'); +if ( $view ) { + $session->param('bookseller_default_view', $view); +} else { + $view = $session->param('bookseller_default_view'); +} + $template->param( loop_suppliers => $loop_suppliers, supplier => ( $booksellerid || $supplier ), count => $supplier_count, has_budgets => $has_budgets, + view => $view, ); $template->{VARS}->{'allbaskets'} = $allbaskets; --- a/koha-tmpl/intranet-tmpl/prog/css/datatables.css +++ a/koha-tmpl/intranet-tmpl/prog/css/datatables.css @@ -263,6 +263,23 @@ table.group td.group { background-color: #D1CFD0; border-bottom: 2px solid #A19B9E; border-top: 2px solid #A19B9E; + font-weight: bold; +} + +table.group tr.odd td { + background-color : #F3F3F3; + border : 1px solid #BCBCBC; + border-right : 1px solid #BCBCBC; +} + +table.group tr.even td { + background-color: #FFF; + border-right : 1px solid #BCBCBC; +} + +table.group td.group .action { + float: right; + font-weight: normal; } table.group tr.odd td { --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -2,28 +2,79 @@ [% INCLUDE 'doc-head-open.inc' %]
Choose a vendor in the list to jump directly to the right place. - -
+ [% END %] - [% IF ( allbaskets ) %] - +[% END %] +[% IF ( loop_suppliers.size ) %] + [% IF view == "complete" %] + [% ELSE %] - + [% END %] -bookseller | +No. | +Name | +Item count | +Biblio count | +Items expected | +Created by | +Date | +Basket group | +Closed | ++ |
---|---|---|---|---|---|---|---|---|---|---|
+ [% supplier.name %] + ([% supplier.booksellerid %]) + [% PROCESS action supplier = supplier %] + | ++ [% IF allbaskets %] + No basket. + [% ELSE %] + No active basket. + [% END %] + | ++ | ||||||||
+ [% supplier.name %] + ([% supplier.booksellerid %]) + [% PROCESS action supplier = supplier %] + | +[% basket.basketno %] | +[% basket.basketname %] | ++ [% basket.total_items %] + [% IF basket.total_items_cancelled %] + ([% basket.total_items_cancelled %] cancelled) + [% END %] + | ++ [% basket.total_biblios %] + [% IF basket.total_biblios_cancelled %] + ([% basket.total_biblios_cancelled %] cancelled) + [% END %] + | +[% basket.expected_items %] | ++ [% basket.authorisedby_firstname %] [% basket.authorisedby_surname %] + | +[% basket.creationdate | $KohaDates %] | ++ [% IF basket.basketgroup %] + [% basketgroup = basket.basketgroup %] + [% IF basketgroup.closed %] + [% basketgroup.name %] (closed) + [% ELSE %] + [% basketgroup.name %] + [% END %] + [% END %] + | ++ [% IF ( basket.closedate ) %] + [% basket.closedate | $KohaDates %] + [% ELSE %] + + [% END %] + | ++ View + + [% IF not basket.closedate and supplier.active %] + Add to basket + + + [% END %] + | +
No. | -Name | -Item count | -Biblio count | -Items expected | -Created by | -Date | -Basket group | -Closed | -Actions | -
---|---|---|---|---|---|---|---|---|---|
[% basket.basketno %] | -[% basket.basketname %] | -- [% basket.total_items %] - [% IF basket.total_items_cancelled %] - ([% basket.total_items_cancelled %] cancelled) - [% END %] - - | -- [% basket.total_biblios %] - [% IF basket.total_biblios_cancelled %] - ([% basket.total_biblios_cancelled %] cancelled) - [% END %] - - | -[% basket.expected_items %] | -- [% basket.authorisedby_firstname %] - [% basket.authorisedby_surname %] - | -[% basket.creationdate | $KohaDates %] | -- [% IF basket.basketgroup %] - [% basketgroup = basket.basketgroup %] - [% IF basketgroup.closed %] - [% basketgroup.name %] (closed) - [% ELSE %] - [% basketgroup.name %] - [% END %] - [% END %] - | -- [% IF ( basket.closedate ) %] - [% basket.closedate | $KohaDates %] - [% ELSE %] - - [% END %] - | -- View - - [% IF not basket.closedate and supplier.active %] - Add to basket - - - [% END %] - | -
No pending baskets
- [% END %][%# IF ( supplier.loop_basket.size ) %] +No pending baskets
[% END %][%# IF ( loop_suppliers.size ) %]