From 6c969b16176c4bd70b5b4e47612457f844967c16 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 10 Mar 2015 11:26:39 +0100 Subject: [PATCH] Bug 13371: Add a simple view This patch adds the ability to switch to a simple view if the complete view to too complex. --- acqui/booksellers.pl | 11 + .../prog/en/modules/acqui/booksellers.tt | 237 ++++++++++++--------- 2 files changed, 145 insertions(+), 103 deletions(-) diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl index a5eb47d..71ba993 100755 --- a/acqui/booksellers.pl +++ b/acqui/booksellers.pl @@ -155,11 +155,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; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt index 1141923..334e111 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -126,124 +126,155 @@ $(document).ready(function() { [% END %]

You searched on vendor [% supplier %], [% count %] results found

+[% IF view == "complete" %] +

Switch to the simple view

+[% ELSE %] +

Switch to the complete view

+[% END %] [% END %] [% IF ( loop_suppliers.size ) %] - [% IF allbaskets %] - Show active baskets only - [% ELSE %] - Show active and inactive baskets - [% END %] - | Show opened baskets only -
- - - - - - - - - - - - - - - - - - [% FOREACH supplier IN loop_suppliers %] - [% IF supplier.loop_basket.size == 0 %] + [% IF view == "complete" %] + [% IF allbaskets %] + Show active baskets only + [% ELSE %] + Show active and inactive baskets + [% END %] + | Show opened baskets only +
+
booksellerNo.NameItem countBiblio countItems expectedCreated byDateBasket groupClosed 
+ - - - + + + + + + + + + + + - [% END %] - [% FOREACH basket IN supplier.loop_basket %] - [% IF ( basket.uncertainprices ) %] - - [% ELSE %] + + + [% FOREACH supplier IN loop_suppliers %] + [% IF supplier.loop_basket.size == 0 %] + + + + [% END %] - - - - - - - - - - - + [% ELSE %] + + [% END %] + + + + + + + + + + + + + [% END %][%# FOREACH basket IN supplier.loop_basket %] + [% END %] + +
- [% supplier.name %] - ([% supplier.booksellerid %]) - [% PROCESS action supplier = supplier %] - - [% IF allbaskets %] - No basket. - [% ELSE %] - No active basket. - [% END %] - booksellerNo.NameItem countBiblio countItems expectedCreated byDateBasket groupClosed 
+ [% 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 + [% FOREACH basket IN supplier.loop_basket %] + [% IF ( basket.uncertainprices ) %] +
+ [% 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 - [% UNLESS ( basket.closedate ) %] - | Add to basket - -
+
+ [% ELSE %] +
+ [% FOREACH supplier IN loop_suppliers %] +
+ + [% IF (supplier.name) %] + [% supplier.name %] + [% ELSE %] + NO NAME [% END %] - - - [% END %][%# FOREACH basket IN supplier.loop_basket %] + + + [% IF ( CAN_user_acquisition_order_manage ) %] + [% IF ( supplier.active ) %] + New basket + [% ELSE %] + (inactive) + [% END %] + [% END %] + Receive shipment + +
[% END %] - - +
+ [% END %] [% ELSE %]

No pending baskets

[% END %][%# IF ( loop_suppliers.size ) %] -
[% IF ( booksellerid ) %] [% INCLUDE 'vendor-menu.inc' %] -- 2.1.0