Changeset 1827 for trunk/LATMOS-Accounts/lib

Timestamp:

08/01/16 09:20:51 (8 years ago)

Author:

nanardon

Message:

Fix endEmployement detection during autorized employment break

File:

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

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

@@ -1589 +1589 @@
         });
     $list_empl->execute($self->id);
-    my $res;
-    while ($res = $list_empl->fetchrow_hashref) {
+    while (my $res = $list_empl->fetchrow_hashref) {
         if (!$res->{lastday}) {
             # Ultimate employment.
@@ -1605 +1604 @@
                 last;
             }
+        } elsif ($pend) {
+            my $nextstart = DateTime->from_epoch(epoch => str2time($res->{firstday}));
+            $nextstart->set_time_zone( DateTime::TimeZone->new( name => 'local' ) );
+            my $tend = $pend->clone;
+            $tend->add(days => $delay + 1);
+            if ($tend->ymd lt $nextstart->ymd) {
+                last;
+            }
+            $end = $tend
         } elsif ((!$res->{current}) && (!$any)) {
             last;