Changeset 1750 for trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases

Timestamp:

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

Author:

nanardon

Message:

Fix arrival/departure computation again

File:

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

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

@@ -1509 +1509 @@
 
     $delay ||= 0;
+    my $start;
+    my $nstart;
+
+    if (my $next = $self->_get_attributes('nextEmployment')) {
+        my $onext = $self->base->get_object('employment', $next);
+        $nstart = DateTime->from_epoch(epoch => str2time($onext->_get_attributes('firstday')));
+        $nstart->set_time_zone( DateTime::TimeZone->new( name => 'local' ) );
+        $nstart->subtract(days => $delay + 1);
+    }
 
     my $list_empl = $self->base->db->prepare_cached(q{
@@ -1516 +1525 @@
         });
     $list_empl->execute($self->id);
-    my $start;
-    my $res;
-    while ($res = $list_empl->fetchrow_hashref) {
-        if ($start) {
+
+    while (my $res = $list_empl->fetchrow_hashref) {
+        if ($res->{current}) {
+        } elsif ($nstart) {
             my $prevend = DateTime->from_epoch(epoch => str2time($res->{lastday}));
             $prevend->set_time_zone( DateTime::TimeZone->new( name => 'local' ) );
-            my $tstart = $start->clone;
+            my $tstart = $nstart->clone;
             $tstart->subtract(days => $delay + 1);
             if ($tstart->ymd gt $prevend->ymd) {
                 last;
             }
-        } elsif(!$res->{current}) {
+        } elsif (!$res->{current}) {
             last;
         }
-        $start = DateTime->from_epoch(epoch => str2time($res->{firstday}));
-        $start->set_time_zone( DateTime::TimeZone->new( name => 'local' ) );
+        $nstart = DateTime->from_epoch(epoch => str2time($res->{firstday}));
+        $nstart->set_time_zone( DateTime::TimeZone->new( name => 'local' ) );
+        $start = $nstart->clone;
     }
     $list_empl->finish;
 
-    if ($any && !$start) {
-        if (my $next = $self->_get_attributes('nextEmployment')) {
-            my $onext = $self->base->get_object('employment', $next);
-            my $tstart = DateTime->from_epoch(epoch => str2time($onext->_get_attributes('firstday')));
-            $tstart->set_time_zone( DateTime::TimeZone->new( name => 'local' ) );
-            $tstart->subtract(days => $delay + 1);
-            if ($res) {
-                my $prevend = DateTime->from_epoch(epoch => str2time($res->{lastday}));
-                $prevend->set_time_zone( DateTime::TimeZone->new( name => 'local' ) );
-                if ($tstart->ymd gt $prevend->ymd) {
-                } else {
-                    $start = $tstart;
-                }
-            } else {
-                $start = $tstart;
-            }
-        }
-    }
+    $start ||= $nstart if ($any);
 
     return $start ? $start->iso8601 : undef
@@ -1561 +1554 @@
 
     $delay ||= 0;
+    my $end;
+    my $pend;
+
+    if (my $prev = $self->_get_attributes('prevEmployment')) {
+        my $oprev = $self->base->get_object('employment', $prev);
+        $pend = DateTime->from_epoch(epoch => str2time($oprev->_get_attributes('lastday')));
+        $pend->set_time_zone( DateTime::TimeZone->new( name => 'local' ) );
+        $pend->add(days => $delay + 1);
+    }
 
     my $list_empl = $self->base->db->prepare_cached(q{
@@ -1568 +1570 @@
         });
     $list_empl->execute($self->id);
-    my $end;
     my $res;
     while ($res = $list_empl->fetchrow_hashref) {
@@ -1576 +1577 @@
             return undef;
         }
-        if ($end) {
+        if ($res->{current}) {
+        } elsif ($pend) {
             my $nextstart = DateTime->from_epoch(epoch => str2time($res->{firstday}));
             $nextstart->set_time_zone( DateTime::TimeZone->new( name => 'local' ) );
-            my $tend = $end->clone;
+            my $tend = $pend->clone;
             $tend->add(days => $delay + 1);
             if ($tend->ymd lt $nextstart->ymd) {
@@ -1587 +1589 @@
             last;
         }
-        $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);
+        $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;
     }
     $list_empl->finish;
 
-    if ($any && !$end) {
-        if (my $prev = $self->_get_attributes('prevEmployment')) {
-            my $oprev = $self->base->get_object('employment', $prev);
-            my $tend = DateTime->from_epoch(epoch => str2time($oprev->_get_attributes('lastday')));
-            $tend->set_time_zone( DateTime::TimeZone->new( name => 'local' ) );
-            $tend->add(days => $delay + 1);
-
-            if ($res) {
-                my $nextstart = DateTime->from_epoch(epoch => str2time($res->{firstday}));
-                $nextstart->set_time_zone( DateTime::TimeZone->new( name => 'local' ) );
-
-                if ($tend->ymd lt $nextstart->ymd) {
-                } else {
-                    $end = $tend;
-                }
-            } else {
-                $end = $tend;
-            }
-        }
-    }
+    $end ||= $pend if($any);
 
     return $end ? $end->iso8601 : undef