[Koha-cvs] CVS: koha/circ circulation.pl,1.65,1.66

[Owen Leonard]

Update of /cvsroot/koha/koha/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1295/circ

Modified Files:
        circulation.pl 
Log Message:
Added variables available to template: streetaddress, city, phone, cardnumber.  
Added FIXME comments to sections where HTML should be moved to template

Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -r1.65 -r1.66
*** circulation.pl      21 Jan 2004 20:49:54 -0000      1.65
--- circulation.pl      26 Jan 2004 19:32:36 -0000      1.66
***************
*** 172,175 ****
--- 172,179 ----
  
  # Barcode entry box, with hidden inputs attached....
+ 
+ # FIXME - How can we move this HTML into the template?  Can we create
+ # arrays of the months, dates, etc and use <TMPL_LOOP> in the template to 
+ # output the data that's getting built here?
  my $counter = 1;
  my $dayoptions = '';
***************
*** 231,234 ****
--- 235,241 ----
                $dd=format_date($dd);
                $datedue=~s/-//g;
+ # FIXME - Instead of declaring the font color here, can we set a variable 
+ # that says 'overdue'?  Then the template can check for it: <TMPL_IF
+ # NAME="overdue"><font color="red"></TMPL_IF>
                if ($datedue < $todaysdate) {
                        $dd="<font color=red>$dd</font>\n";
***************
*** 259,262 ****
--- 266,270 ----
        $datedue=~s/-//g;
        if ($datedue < $todaysdate) {
+ # FIXME - See line 233 above regarding overdues
            $dd="<font color=red>$dd</font>\n";
        }
***************
*** 307,310 ****
--- 315,322 ----
                surname => $borrower->{'surname'},
                categorycode => $borrower->{'categorycode'},
+               streetaddress => $borrower->{'streetaddress'},
+               city => $borrower->{'city'},
+               phone => $borrower->{'phone'},
+               cardnumber => $borrower->{'cardnumber'},
                question => $question,
                barcode => $barcode,
***************
*** 355,358 ****
--- 367,377 ----
        $env{'datedue'}='';
      } else {
+       
+ # FIXME - Can we set two flags here, one that says 'invalidduedate', so that 
+ # the template can check for it, and then one for a particular message?
+ # Ex: <TMPL_IF NAME="invalidduedate">  <TMPL_IF NAME="daysinFeb">
+ # Invalid Due Date Specified. Book was not issued.  Never that many days
+ # in February! </TMPL_IF> </TMPL_IF>
+ 
        if (($year eq 0) || ($month eq 0) || ($year eq 0)) {
            $invalidduedate="Invalid Due Date Specified. Book was not 
issued.<p>\n";