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

Timestamp:

01/21/16 02:15:45 (8 years ago)

Author:

nanardon

Message:

Fix start/end computation between two employment

File:

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

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

@@ -1219 +1219 @@
                     my $sth = $self->base->db->prepare_cached(
                         q{
-                        select name from employment where firstday > now() and
-                        (lastday is null or lastday >= now() - '1 days'::interval) and "user" = ?
+                        select name from employment where firstday > now() and "user" = ?
+                        order by firstday asc
+                        limit 1
+                        }
+                    );
+                    $sth->execute($self->id);
+                    my $res = $sth->fetchrow_hashref;
+                    $sth->finish;
+                    if ($res) {
+                        return $res->{name}
+                    } else {
+                        return;
+                    }
+                }
+            },
+            prevEmployment => {
+                managed => 1,
+                ro => 1,
+                reference => 'employment',
+                get => sub {
+                    my ($attr) = @_;
+                    my $self = $attr->object;
+
+                    my $sth = $self->base->db->prepare_cached(
+                        q{
+                        select name from employment where
+                        (lastday is not null and lastday <= now() - '1 days'::interval) and "user" = ?
+                        order by firstday desc
                         limit 1
                         }
@@ -1429 +1455 @@
 
     my $list_empl = $self->base->db->prepare_cached(q{
-        SELECT *, (lastday is null or lastday >= now()) as "current" FROM employment WHERE "user" = ?
-        and firstday < now()
+        SELECT *, (lastday is null or lastday >= now()) as "current" FROM employment
+        WHERE "user" = ? and firstday < now()
         order by firstday desc
         });
@@ -1446 +1472 @@
         } else {
             if (!$res->{current}) {
-                last;
+                if (my $next = $self->_get_attributes('nextEmployment')) {
+                    my $onext = $self->base->get_object('employment', $next);
+                    my $prevend = DateTime->from_epoch(epoch => str2time($res->{lastday}));
+                    $prevend->set_time_zone( DateTime::TimeZone->new( name => 'local' ) );
+                    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 ($tstart->ymd gt $prevend->ymd) {
+                        last;
+                    } else {
+                    }
+                } else {
+                    last;
+                }
             }
         }
@@ -1485 +1524 @@
         } else {
             if (!$res->{current}) {
-                last;
+                if (my $prev = $self->_get_attributes('prevEmployment')) {
+                    my $oprev = $self->base->get_object('employment', $prev);
+                    my $nextstart = DateTime->from_epoch(epoch => str2time($res->{firstday}));
+                    $nextstart->set_time_zone( DateTime::TimeZone->new( name => 'local' ) );
+                    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 ($tend->ymd lt $nextstart->ymd) {
+                        last;
+                    } else {
+                    }
+                } else {
+                    last;
+                }
             }
         }