Changeset 1623 for trunk/LATMOS-Accounts/lib/LATMOS/Accounts

Timestamp:

01/10/16 20:15:54 (8 years ago)

Author:

nanardon

Message:

Fix start / end Employment computation

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql

Files:

• Employment.pm (modified) (3 diffs)
• User.pm (modified) (8 diffs)

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

@@ -10 +10 @@
 use Date::Parse;
 use DateTime;
+use Date::Calc;
 
 our $VERSION = (q$Rev: 594 $ =~ /^Rev: (\d+) /)[0];
@@ -71 +72 @@
             monitored => 1,
             label => l('Contract end'),
+        },
+        length => {
+            ro => 1,
+            managed => 1,
+            get => sub {
+                my ($self) = @_;
+                my $lastday = $self->object->get_attributes('lastday') || DateTime->now->ymd('-');
+                my $firstday = $self->object->get_attributes('firstday');
+
+                my @fd = split('-', $firstday);
+                my @ld = split('-', $lastday);
+
+                return Date::Calc::Delta_Days(@fd, @ld) +1;
+            },
+            label => l('Length'),
+        },
+        lengthText => {
+            ro => 1,
+            managed => 1,
+            get => sub {
+                my ($self) = @_;
+                my $lastday = $self->object->get_attributes('lastday')|| DateTime->now->ymd('-');
+                {
+                    my $dtlast = DateTime->from_epoch(epoch => str2time($lastday));
+                    $dtlast->add(days => 1);
+                    $lastday = $dtlast->ymd('-');
+                }
+                my $firstday = $self->object->get_attributes('firstday');
+
+                my @fd = split('-', $firstday);
+                my @ld = split('-', $lastday);
+
+                my ($Dy,$Dm,$Dd) = Date::Calc::N_Delta_YMD(@fd, @ld);
+                return join(', ',
+                    ($Dy ? l('%d years', $Dy)  : ()),
+                    ($Dm ? l('%d months', $Dm) : ()),
+                    ($Dd ? l('%d days', $Dd)   : ()),
+                );
+            },
+            label => l('Length'),
         },
         'state' => {
@@ -315 +356 @@
         my $endemploy = $currentemployment
             ? $user->_get_attributes("_$expireOn")
-            : ($self->base->config('unemployed_expire') eq 'no'
+            : (($self->base->config('unemployed_expire') ||'') eq 'no'
                 ? undef
                 : $user->_get_attributes('create'));

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

@@ -14 +14 @@
 use base qw(LATMOS::Accounts::Bases::Sql::objects);
 use LATMOS::Accounts::I18N;
+use Date::Calc;
 
 our $VERSION = (q$Rev$ =~ /^Rev: (\d+) /)[0];
@@ -407 +408 @@
                 ro => 1,
                 label => l('Start of any employment'),
+            },
+            employmentLength => {
+                ro => 1,
+                managed => 1,
+                get => sub {
+                    my ($self) = @_;
+                    my $lastday = $self->object->get_attributes('endEmployment') || DateTime->now->ymd('-');
+                    my $firstday = $self->object->get_attributes('startEmployment') or return;
+
+                    my @fd = split('-', DateTime->from_epoch(epoch => str2time($firstday))->ymd('-'));
+                    my @ld = split('-', DateTime->from_epoch(epoch => str2time($lastday))->ymd('-'));
+
+                    return Date::Calc::Delta_Days(@fd, @ld) +1;
+                },
+                label => l('Work duration'),
+            },
+            employmentLengthText => {
+                ro => 1,
+                managed => 1,
+                get => sub {
+                    my ($self) = @_;
+                    my $firstday = $self->object->get_attributes('startEmployment') or return;
+                    my $lastday = $self->object->get_attributes('endEmployment')|| DateTime->now->ymd('-');
+                    {
+                        my $dtlast = DateTime->from_epoch(epoch => str2time($lastday));
+                        $dtlast->add(days => 1);
+                        $lastday = $dtlast->ymd('-');
+                    }
+
+                    my @fd = split('-', DateTime->from_epoch(epoch => str2time($firstday))->ymd('-'));
+                    my @ld = split('-', DateTime->from_epoch(epoch => str2time($lastday))->ymd('-'));
+
+                    my ($Dy,$Dm,$Dd) = Date::Calc::N_Delta_YMD(@fd, @ld);
+                    return join(', ',
+                        ($Dy ? l('%d years', $Dy)  : ()),
+                        ($Dm ? l('%d months', $Dm) : ()),
+                        ($Dd ? l('%d days', $Dd)   : ()),
+                    );
+                },
+                label => l('Work duration'),
             },
             cn        => {
@@ -1296 +1337 @@
     my ($self, $delay) = @_;
 
+    $delay ||= 0;
+
     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()
         order by firstday desc
         });
@@ -1305 +1349 @@
         if ($start) {
             my $prevend = DateTime->from_epoch(epoch => str2time($res->{lastday}));
+            $prevend->set_time_zone( DateTime::TimeZone->new( name => 'local' ) );
             my $tstart = $start->clone;
-            if ($delay) {
-                $tstart->subtract(days => $delay);
-            }
+            $tstart->subtract(days => $delay + 1);
             if ($tstart->ymd gt $prevend->ymd) {
                 last;
@@ -1322 +1365 @@
     $list_empl->finish;
 
-    if (!$start) {
-        my $listold = $self->base->db->prepare_cached(q{
-            SELECT min(firstday) as firstday FROM employment WHERE "user" = ? and
-            lastday IS NOT NULL and lastday <= now() - '1 days'::interval
-            });
-        $listold->execute($self->id);
-        my $res = $listold->fetchrow_hashref;
-        if ($res && $res->{firstday}) {
-            $start = DateTime->from_epoch(epoch => str2time($res->{firstday}));
-            $start->set_time_zone( DateTime::TimeZone->new( name => 'local' ) );
-        }
-        $listold->finish;
-    }
     return $start ? $start->iso8601 : undef
 }
@@ -1340 +1370 @@
 sub _computeEndEmployment {
     my ($self, $delay) = @_;
+
+    $delay ||= 0;
 
     my $list_empl = $self->base->db->prepare_cached(q{
@@ -1356 +1388 @@
         if ($end) {
             my $nextstart = DateTime->from_epoch(epoch => str2time($res->{firstday}));
+            $nextstart->set_time_zone( DateTime::TimeZone->new( name => 'local' ) );
             my $tend = $end->clone;
-            if ($delay) {
-                $tend->add(days => $delay);
-            }
+            $tend->add(days => $delay + 1);
             if ($tend->ymd lt $nextstart->ymd) {
                 last;
@@ -1374 +1405 @@
     $list_empl->finish;
 
-    if (!$end) {
-        my $listold = $self->base->db->prepare_cached(q{
-            SELECT max(lastday) as lastday FROM employment WHERE "user" = ? and
-            lastday IS NOT NULL and lastday <= now() - '1 days'::interval
-            });
-        $listold->execute($self->id);
-        my $res = $listold->fetchrow_hashref;
-        if ($res && $res->{lastday}) {
-            $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);
-        }
-        $listold->finish;
-    }
     return $end ? $end->iso8601 : undef
 }