fix display of 12:00 hour in time intervals

diff --git a/FS/FS/rate_time_interval.pm b/FS/FS/rate_time_interval.pm
index 1a82edb..6a9986b 100644 (file)
--- a/FS/FS/rate_time_interval.pm
+++ b/FS/FS/rate_time_interval.pm
@@ -158,7 +158,7 @@ sub description {
   return map { 
             sprintf('%s %02d:%02d %s',
             $days[int($_/86400) % 7],
   return map { 
             sprintf('%s %02d:%02d %s',
             $days[int($_/86400) % 7],

-            int($_/3600) % 12,
+            (int($_/3600) % 12 || 12),

             int($_/60) % 60,
             (($_/3600) % 24 < 12) ? 'AM' : 'PM' )
        } ( $self->stime, $self->etime );
             int($_/60) % 60,
             (($_/3600) % 24 < 12) ? 'AM' : 'PM' )
        } ( $self->stime, $self->etime );

diff --git a/httemplate/edit/process/rate_time.cgi b/httemplate/edit/process/rate_time.cgi
index 4fa78ce..2b00be3 100644 (file)
--- a/httemplate/edit/process/rate_time.cgi
+++ b/httemplate/edit/process/rate_time.cgi
@@ -4,7 +4,6 @@
 % } else {
 <% $cgi->redirect(popurl(3). "browse/rate_time.html" ) %>
 % }
 % } else {
 <% $cgi->redirect(popurl(3). "browse/rate_time.html" ) %>
 % }

-%# dumper_html(\%vars, \%old_ints, {$rate_time->intervals}) %>

 <%init>
 my $error = '';
 die "access denied" 
 <%init>
 my $error = '';
 die "access denied" 


@@ -87,7 +86,7 @@ if(!$error) {
 
 sub l2wtime {
   my ($d, $h, $m, $a) = @_;
 
 sub l2wtime {
   my ($d, $h, $m, $a) = @_;

-  $h += 24*$d + 12*$a;
+  $h = ($h % 12) + 24*$d + 12*$a;

   $m += 60*$h;
   return 60*$m
 }
   $m += 60*$h;
   return 60*$m
 }

diff --git a/httemplate/edit/rate_time.cgi b/httemplate/edit/rate_time.cgi
index eca8fbb..7ee39ef 100644 (file)
--- a/httemplate/edit/rate_time.cgi
+++ b/httemplate/edit/rate_time.cgi
@@ -39,7 +39,7 @@ my $day = [ 0 => 'Sun',
             4 => 'Thu',
             5 => 'Fri',
             6 => 'Sat', ];
             4 => 'Thu',
             5 => 'Fri',
             6 => 'Sat', ];

-my $hour = [ map( {$_, sprintf('%02d',$_) } 0..11 )];
+my $hour = [ map( {$_, sprintf('%02d',$_) } 12, 1..11 )];

 my $min  = [ map( {$_, sprintf('%02d',$_) } 0,30  )];
 my $ampm = [ 0 => 'AM', 1 => 'PM' ];
 
 my $min  = [ map( {$_, sprintf('%02d',$_) } 0,30  )];
 my $ampm = [ 0 => 'AM', 1 => 'PM' ];
 


@@ -57,7 +57,7 @@ if($ratetimenum) {
   else {
     foreach my $interval ($rate_time->intervals) {
       push @data, [ map { int($_/86400) % 7,
   else {
     foreach my $interval ($rate_time->intervals) {
       push @data, [ map { int($_/86400) % 7,

-                          int($_/3600) % 12,
+                          (int($_/3600) % 12 || 12),

                           int($_/60) % 60,
                           int($_/43200) % 2, } 
                     ( $interval->stime, $interval->etime ) 
                           int($_/60) % 60,
                           int($_/43200) % 2, } 
                     ( $interval->stime, $interval->etime )