Changeset 1751

Timestamp:

04/14/16 11:21:43 (8 years ago)

Author:

nanardon

Message:

Fix date computation, always return next departure if any

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm (modified) (5 diffs)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm

@@ -1516 +1516 @@
         $nstart = DateTime->from_epoch(epoch => str2time($onext->_get_attributes('firstday')));
         $nstart->set_time_zone( DateTime::TimeZone->new( name => 'local' ) );
-        $nstart->subtract(days => $delay + 1);
     }
 
@@ -1536 +1535 @@
                 last;
             }
-        } elsif (!$res->{current}) {
+        } elsif ((!$res->{current}) && (!$any)) {
             last;
         }
@@ -1561 +1560 @@
         $pend = DateTime->from_epoch(epoch => str2time($oprev->_get_attributes('lastday')));
         $pend->set_time_zone( DateTime::TimeZone->new( name => 'local' ) );
-        $pend->add(days => $delay + 1);
+        $pend->add(hours => 23, minutes => 59, seconds => 59);
     }
 
@@ -1578 +1577 @@
         }
         if ($res->{current}) {
-        } elsif ($pend) {
+        } elsif ($end) {
             my $nextstart = DateTime->from_epoch(epoch => str2time($res->{firstday}));
             $nextstart->set_time_zone( DateTime::TimeZone->new( name => 'local' ) );
-            my $tend = $pend->clone;
+            my $tend = $end->clone;
             $tend->add(days => $delay + 1);
             if ($tend->ymd lt $nextstart->ymd) {
@@ -1589 +1588 @@
             last;
         }
-        $pend = DateTime->from_epoch(epoch => str2time($res->{lastday}));
-        $pend->set_time_zone( DateTime::TimeZone->new( name => 'local' ) );
-        $pend->add(hours => 23, minutes => 59, seconds => 59);
-        $end = $pend->clone;
+        $end = DateTime->from_epoch(epoch => str2time($res->{lastday}));
+        $end->set_time_zone( DateTime::TimeZone->new( name => 'local' ) );
+        $end->add(hours => 23, minutes => 59, seconds => 59);
     }
     $list_empl->finish;