Changeset 1950

Timestamp:

02/14/17 21:39:12 (7 years ago)

Author:

nanardon

Message:

Cleanup useless code

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts

Files:

• Bases/Sql/Employment.pm (modified) (2 diffs)
• Bases/Sql/User.pm (modified) (3 diffs)
• Task/Employment.pm (modified) (1 diff)

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

@@ -343 +343 @@
     my $res = $self->SUPER::set_fields(%data);
 
-    $self->applyToUser or return;
-    return $res;
-}
-
-=head2 applyToUser()
-
-Set user's attributes if need from this employement.
-
-=cut
-
-sub applyToUser {
-    my ($self) = @_;
-
     my $user = $self->base->get_object('user', $self->get_attributes('user')) or do {
         $self->base->log(LA_ERR, "Cannot fetch user %s to apply employment", $self->get_attributes('user'));
@@ -361 +348 @@
     };
 
-    $user->base->log(LA_DEBUG, "Applying Employement %s to user %s", $self->id, $user->id);
-
-    my $currentemployment = $user->get_attributes('currentEmployment') || '';
-
-    if (!$currentemployment) {
-        return $user->_resetEmployment
-    } elsif ($currentemployment eq $self->id) {
-        # No sync to do if this employment is not currently applied
-        return $user->applyCurrentEmployment;
-    } else {
-        return $user->computeEmploymentDate;
-    }
+    $user->applyCurrentEmployment;
+
+    return $res;
 }
 

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

@@ -1530 +1530 @@
     my ($self) = @_;
 
+    # Get current employment name
     my $currentempl = $self->get_attributes('currentEmployment') || '';
 
@@ -1540 +1541 @@
 
     if (my $currentemployment = $self->base->get_object('employment', $currentempl)) {
+
+        # If an employement apply we set the value to the user object
+
         $self->computeEmploymentDate;
 
@@ -1574 +1578 @@
         }
     } else {
+        # No current employment, resetting values:
+
         return $self->_resetEmployment;
     }
 
 }
+
+# Reset attribute value set by employment
+# except maangerContact and expire
 
 sub _resetEmployment {

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Employment.pm

@@ -60 +60 @@
             my $ouser = $self->{_base}->get_object('user', $user) or next;
 
-            my $job = $self->{_base}->get_object('employment', $employment);
-            $job->applyToUser;
+            $ouser->applyCurrentEmployment;
             $self->{_base}->commit;
         }