From e45912470fb734a99d5bdd1ee0639e6f6bc89422 Mon Sep 17 00:00:00 2001 From: Henri-Damien LAURENT Date: Wed, 16 Jan 2008 12:32:21 -0600 Subject: [PATCH] BugFixing : 1299 /displaying lists for document types and borrower categories Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- .../en/modules/reports/bor_issues_top.tmpl | 21 ++++++++++++----- .../en/modules/reports/borrowers_out.tmpl | 6 ++++- .../en/modules/reports/cat_issues_top.tmpl | 23 ++++++++++++++++--- .../en/modules/reports/catalogue_out.tmpl | 15 ++++++++++-- .../reports/issues_by_borrower_category.tmpl | 6 ++++- reports/bor_issues_top.pl | 2 -- reports/borrowers_out.pl | 2 -- reports/issues_by_borrower_category.plugin | 11 +++++++++ 8 files changed, 69 insertions(+), 17 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl index 15f1bd83f9..90dd038c47 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl @@ -186,15 +186,24 @@ function Dopop(link) {
  • - -
  • +
  • - - +
  • - - +
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl index 7a2d569256..c80d9b2858 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl @@ -50,7 +50,11 @@
      -
    1. +
    2. /lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarTo" style="cursor: pointer;" border="0" /> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl index cb85f20a15..29b9aafa20 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl @@ -184,9 +184,26 @@ function Dopop(link) { } );
    3. -
    4. -
    5. -
    6. +
    7. +
    8. +
    9. + +
    10. +
    11. + +
    12. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl index 58ed8fccc5..4e56580b25 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl @@ -50,8 +50,19 @@
        -
      1. -
      2. +
      3. +
      4. +
      5. + +
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl index b635fcc13c..21215512bf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl @@ -55,7 +55,11 @@
      Checkouts by patron category -
      1. Leave empty for all categories
      2. +
      " /> diff --git a/reports/bor_issues_top.pl b/reports/bor_issues_top.pl index ce98071fdd..f27a0db3bf 100755 --- a/reports/bor_issues_top.pl +++ b/reports/bor_issues_top.pl @@ -160,9 +160,7 @@ if ($do_it) { my ($codes,$labels) = GetborCatFromCatType(undef,undef); my @borcatloop; foreach my $thisborcat (sort keys %$labels) { -# my $selected = 1 if $thisbranch eq $branch; my %row =(value => $thisborcat, -# selected => $selected, description => $labels->{$thisborcat}, ); push @borcatloop, \%row; diff --git a/reports/borrowers_out.pl b/reports/borrowers_out.pl index 504f64a2c6..c969cc8c61 100755 --- a/reports/borrowers_out.pl +++ b/reports/borrowers_out.pl @@ -133,9 +133,7 @@ if ($do_it) { my ($codes,$labels) = GetborCatFromCatType(undef,undef); my @borcatloop; foreach my $thisborcat (sort keys %$labels) { -# my $selected = 1 if $thisbranch eq $branch; my %row =(value => $thisborcat, -# selected => $selected, description => $labels->{$thisborcat}, ); push @borcatloop, \%row; diff --git a/reports/issues_by_borrower_category.plugin b/reports/issues_by_borrower_category.plugin index 3ed57e612c..8fea89c764 100644 --- a/reports/issues_by_borrower_category.plugin +++ b/reports/issues_by_borrower_category.plugin @@ -26,6 +26,8 @@ use HTML::Template::Pro; use C4::Search; use C4::Output; use C4::Koha; +use C4::Members; + use C4::Branch; # GetBranches =head1 NAME @@ -80,6 +82,15 @@ sub set_parameters { -size => 1, -multiple => 0 ); $template->param(CGIbranch => $CGIbranch); + + my ($codes,$labels)=GetborCatFromCatType(undef,undef); + my @borcatloop; + foreach my $thisborcat (sort keys %$labels) { + push @borcatloop, {value => $thisborcat, + description => $labels->{$thisborcat}, + }; + } + $template->param(loopcategories => \@borcatloop); return $template; } sub calculate { -- 2.39.5