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

Timestamp:

12/18/15 18:35:40 (9 years ago)

Author:

nanardon

Message:

Compute last employment into endEmployment

If the user does not have employment we find last employement to return the date

Location:

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

Files:

• Employment.pm (modified) (2 diffs)
• User.pm (modified) (2 diffs)

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

@@ -135 +135 @@
     };
 
+    my $currentemployment = $user->get_attributes('currentEmployment') || '';
+
     my $expire = str2time($user->get_attributes('expire') || '1970-01-01T00:00:00');
     my $endemploy = $user->get_attributes('endEmployment');
@@ -143 +145 @@
     }
 
-    if (($user->get_attributes('currentEmployment') || '') ne $self->id) {
+    if ($currentemployment ne $self->id) {
+        # No sync to do if this employment is not currently applied
         return;
     }

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

@@ -215 +215 @@
                         if (!$res->{lastday}) {
                             # Ultimate employment.
-                            $end = undef;
-                            last
+                            $list_empl->finish;
+                            return undef;
                         }
                         if ($end) {
@@ -229 +229 @@
                     }
                     $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;
+                        $listold->finish;
+                        if ($res) {
+                            $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);
+                        }
+                    }
                     return $end ? $end->iso8601 : undef
                 },