koha-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Koha-cvs] koha koha-tmpl/intranet-tmpl/default/en/reports... [rel_2_2]


From: Henri-Damien LAURENT
Subject: [Koha-cvs] koha koha-tmpl/intranet-tmpl/default/en/reports... [rel_2_2]
Date: Mon, 19 Dec 2005 09:23:39 +0000

CVSROOT:        /cvsroot/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     Henri-Damien LAURENT <address@hidden>   05/12/19 09:23:39

Modified files:
        koha-tmpl/intranet-tmpl/default/en/reports: cat_issues_top.tmpl 
        reports        : cat_issues_top.pl 

Log message:
        Adding selection combos for branches, borcat, itemtypes, days and 
months.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/reports/cat_issues_top.tmpl.diff?only_with_tag=rel_2_2&tr1=1.4.2.1&tr2=1.4.2.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/reports/cat_issues_top.pl.diff?only_with_tag=rel_2_2&tr1=1.5.2.2&tr2=1.5.2.3&r1=text&r2=text

Patches:
Index: koha/koha-tmpl/intranet-tmpl/default/en/reports/cat_issues_top.tmpl
diff -u 
koha/koha-tmpl/intranet-tmpl/default/en/reports/cat_issues_top.tmpl:1.4.2.1 
koha/koha-tmpl/intranet-tmpl/default/en/reports/cat_issues_top.tmpl:1.4.2.2
--- koha/koha-tmpl/intranet-tmpl/default/en/reports/cat_issues_top.tmpl:1.4.2.1 
Thu Apr  7 10:17:45 2005
+++ koha/koha-tmpl/intranet-tmpl/default/en/reports/cat_issues_top.tmpl Mon Dec 
19 09:23:39 2005
@@ -220,31 +220,82 @@
                                <td>&nbsp;</td>
                                <td>&nbsp;</td>
                                <td>Branch</td>
-                               <td><input type="text" name="Filter" 
value=""></td>
+                               <td>
+                                       <select name="Filter">
+                                               <option value="">All 
branches</option>
+                                               <!-- TMPL_LOOP 
name="branchloop" -->
+                                                       <option value="<!-- 
TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- 
/TMPL_IF -->><!-- TMPL_VAR name
+       ="branchname" --></option>
+                                               <!-- /TMPL_LOOP -->
+                                       </select>
+                               </td>
                        </tr>
                        <tr>
                                <td>&nbsp;</td>
                                <td>&nbsp;</td>
                                <td>Document Type</td>
-                               <td><input type="text" name="Filter" 
value=""></td>
+                               <td>
+                                       <select name="Filter">
+                                               <option value="">All Item 
Types</option>
+                                               <!-- TMPL_LOOP 
name="itemtypeloop" -->
+                                                       <option value="<!-- 
TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- 
/TMPL_IF -->><!-- TMPL_VAR name
+       ="description" --></option>
+                                               <!-- /TMPL_LOOP -->
+                                       </select>
+                               </td>
                        </tr>
                        <tr class="hilighted">
                                <td>&nbsp;</td>
                                <td>&nbsp;</td>
                                <td>Borrower Category</td>
-                               <td><input type="text" name="Filter" 
value=""></td>
+                               <td>
+                                       <select name="Filter">
+                                               <option value="">All Borrower 
Categories</option>
+                                               <!-- TMPL_LOOP 
name="borcatloop" -->
+                                                       <option value="<!-- 
TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- 
/TMPL_IF -->><!-- TMPL_VAR name
+       ="description" --></option>
+                                               <!-- /TMPL_LOOP -->
+                                       </select>
+                               </td>
                        </tr>
                        <tr>
                                <td>&nbsp;</td>
                                <td>&nbsp;</td>
                                <td>Day</td>
-                               <td><input type="text" name="Filter" 
value=""></td>
+                               <td>
+                                       <select name="Filter">
+                                               <option value="">Any 
Day</option>
+                                               <option 
value="Monday">Monday</option>
+                                               <option 
value="Tuesday">Tuesday</option>
+                                               <option 
value="Wednesday">Wednesday</option>
+                                               <option 
value="Thursday">Thursday</option>
+                                               <option 
value="Friday">Friday</option>
+                                               <option 
value="Saturday">Saturday</option>
+                                               <option 
value="Sunday">Sunday</option>
+                                       </select>
+                               </td>
                        </tr>
                        <tr class="hilighted">
                                <td>&nbsp;</td>
                                <td>&nbsp;</td>
                                <td>Month</td>
-                               <td><input type="text" name="Filter" 
value=""></td>
+                               <td>
+                                       <select name="Filter">
+                                               <option value="">Any 
Month</option>
+                                               <option 
value="January">January</option>
+                                               <option 
value="February">February</option>
+                                               <option 
value="March">March</option>
+                                               <option 
value="April">April</option>
+                                               <option value="May">May</option>
+                                               <option 
value="June">June</option>
+                                               <option 
value="July">July</option>
+                                               <option 
value="August">August</option>
+                                               <option 
value="September">September</option>
+                                               <option 
value="October">October</option>
+                                               <option 
value="November">November</option>
+                                               <option 
value="December">December</option>
+                                       </select>
+                               </td>
                        </tr>
                        <tr>
                                <td>&nbsp;</td>
Index: koha/reports/cat_issues_top.pl
diff -u koha/reports/cat_issues_top.pl:1.5.2.2 
koha/reports/cat_issues_top.pl:1.5.2.3
--- koha/reports/cat_issues_top.pl:1.5.2.2      Mon Nov 28 10:40:32 2005
+++ koha/reports/cat_issues_top.pl      Mon Dec 19 09:23:39 2005
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: cat_issues_top.pl,v 1.5.2.2 2005/11/28 10:40:32 hdl Exp $
+# $Id: cat_issues_top.pl,v 1.5.2.3 2005/12/19 09:23:39 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -133,10 +133,50 @@
                                -values   => address@hidden,
                                -size     => 1,
                                -multiple => 0 );
+       #branch
+       my $branches = getallbranches;
+       my @branchloop;
+       foreach my $thisbranch (keys %$branches) {
+#                      my $selected = 1 if $thisbranch eq $branch;
+                       my %row =(value => $thisbranch,
+#                                                                      
selected => $selected,
+                                                                       
branchname => $branches->{$thisbranch}->{'branchname'},
+                                                       );
+                       push @branchloop, \%row;
+       }
+
+       #doctype
+       my $itemtypes = getitemtypes;
+       my @itemtypeloop;
+       foreach my $thisitemtype (keys %$itemtypes) {
+#                      my $selected = 1 if $thisbranch eq $branch;
+                       my %row =(value => $thisitemtype,
+#                                                                      
selected => $selected,
+                                                                       
description => $itemtypes->{$thisitemtype}->{'description'},
+                                                       );
+                       push @itemtypeloop, \%row;
+       }
+       
+       #borcat
+       my ($codes,$labels) = borrowercategories;
+       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;
+       }
        
+       #Day
+       #Month
        $template->param(
                                        CGIextChoice => $CGIextChoice,
-                                       CGIsepChoice => $CGIsepChoice
+                                       CGIsepChoice => $CGIsepChoice,
+                                       branchloop =>address@hidden,
+                                       itemtypeloop =>address@hidden,
+                                       borcatloop =>address@hidden,
                                        );
 output_html_with_http_headers $input, $cookie, $template->output;
 }




reply via email to

[Prev in Thread] Current Thread [Next in Thread]