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

Timestamp:

12/18/15 07:25:11 (9 years ago)

Author:

nanardon

Message:

• Add expiration list to expiration page and Employment things

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts

Files:

• Bases.pm (modified) (2 diffs)
• Bases/Objects.pm (modified) (3 diffs)
• Bases/Sql/Employment.pm (modified) (5 diffs)
• Bases/Sql/User.pm (modified) (5 diffs)
• Task/Employment.pm (added)

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

@@ -392 +392 @@
         return;
     };
+
+    if (!$pclass->checkValues($self, $id, %data)) {
+        la_log(LA_ERR,
+            'Cannot create %s (%s) in base %s (%s): wrong values',
+            $id, $otype, $self->label, $self->type
+        );
+        return;
+    }
+
     if ($pclass->_create($self, $id, %data)) {
         la_log(LA_INFO,
@@ -404 +413 @@
         return;
     };
+    warn $id;
     $self->get_object($otype, $id);
 }

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Objects.pm

@@ -320 +320 @@
 =cut
 
+=head2 checkValues ($base, $obj, %attributes)
+
+Allow to pre-check values when object are modified or created
+
+C<$obj> is either the new id at object creation or the object itself on modification.
+
+=cut
+
+sub checkValues {
+    my ($class, $base, $obj, %attributes) = @_;
+
+    return 1;
+}
+
 =head2 check_allowed_values ($attr, $values)
 
@@ -369 +383 @@
         };
     }
+
     $self->_set_c_fields(%cdata);
 }
@@ -399 +414 @@
             return;
         };
+    }
+
+    if (!$self->checkValues($self->base, $self, %cdata)) {
+        $self->base->log(LA_ERR,
+            "Cannot update %s (%s): wrong values",
+            $self->id, $self->type
+        );
+        return;
     }
 

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

@@ -6 +6 @@
 
 use base qw(LATMOS::Accounts::Bases::Sql::objects);
+use LATMOS::Accounts::Log;
+use Date::Parse;
+use DateTime;
 
 our $VERSION = (q$Rev: 594 $ =~ /^Rev: (\d+) /)[0];
@@ -30 +33 @@
         (
             $user,
-            $self->get_c_field('l'),
+            $self->get_c_field('firstday'),
         )
     );
@@ -52 +55 @@
             },
             description => { },
-            firstday => { inline => 1, formtype => 'DATE', monitored => 1, },
-            lastday => { inline => 1, formtype => 'DATE', monitored => 1, },
+            firstday => {
+                inline => 1,
+                formtype => 'DATE',
+                monitored => 1,
+            },
+            lastday => {
+                inline => 1,
+                formtype => 'DATE',
+                monitored => 1,
+            },
+            'state' => {
+                managed => 1,
+                ro => 1,
+                get => sub {
+                    my ($self) = @_;
+                    my $now = DateTime->now;
+                    if ($now->epoch < str2time($self->object->get_attributes('firstday'))) {
+                        return 1;
+                    } elsif ( my $end = $self->object->get_attributes('lastday') ) {
+                        my $eend = str2time($end) + 86400;
+                        if ($now->epoch > $eend) {
+                            return -1;
+                        }
+                    } else {
+                        return 0;
+                    }
+                },
+            },
             contratType => {
                 reference => 'group',
@@ -61 +90 @@
                 monitored => 1,
             },
+            managerContact => {
+                delayed => 1,
+                can_values => sub {
+                    my %uniq = map { $_ => 1 } grep { $_ }
+                    ($_[1] ? $_[1]->get_attributes('managerContact') : ()),
+                    $base->search_objects('user', 'active=*');
+                    sort keys %uniq;
+                },
+                reference => 'user',
+            },
+            department => {
+                reference => 'group',
+                can_values => sub {
+                    $base->search_objects('group', 'sutype=dpmt')
+                },
+                monitored => 1,
+            },
+            company => { },
+            endcircuit    => { formtype => 'DATE', monitored => 1, },
         }
     );
@@ -73 +121 @@
 }
 
+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'));
+        return;
+    };
+
+    my $expire = str2time($user->get_attributes('expire') || '1970-01-01T00:00:00');
+    my $endemploy = $user->get_attributes('endEmployment');
+    my $nextexpire = str2time($endemploy || '1970-01-01T00:00:00');
+
+    if ($expire != $nextexpire) {
+        $user->_set_c_fields(expire => $endemploy);
+    }
+
+    if (($user->get_attributes('currentEmployment') || '') ne $self->id) {
+        return;
+    }
+
+    my %attrsets = (
+        appliedEmployement => $self->id,
+    );
+    foreach my $attr (qw(company contratType department managerContact endcircuit)) {
+        my $uval = $user->get_attributes($attr) || '';
+        my $cval = $self->get_attributes($attr) || '';
+
+        if ($uval ne $cval) {
+            $attrsets{$attr} = $cval;
+        }
+    }
+
+    if (keys %attrsets) {
+        return $user->_set_c_fields(%attrsets);
+    } else {
+        return 1;
+    }
+}
+
+sub checkValues {
+    my ($class, $base, $obj, %changes) = @_;
+
+    my $user = $changes{user} || $obj->get_attributes('user');
+    my $id = ref $obj ? $obj->id : $obj;
+
+    if ($changes{lastday}) {
+        my $sth = $base->db->prepare_cached(q{
+            select name from employment where "user" = ? and name != ? and
+                firstday <= ? and (lastday is null or lastday >= ?)
+        });
+        $sth->execute($user, $id, $changes{lastday}, $changes{lastday});
+        my $res = $sth->fetchrow_hashref;
+        $sth->finish;
+        if ($res) {
+            $base->log(LA_ERR, "New ending overlap contrat %s (%s)", $res->{name}, $changes{lastday});
+            return;
+        }
+    } elsif(exists($changes{lastday})) {
+        my $sth = $base->db->prepare_cached(q{
+            select * from employment where "user" = ? and lastday is null
+            limit 1
+        });
+        $sth->execute($user);
+        my $res = $sth->fetchrow_hashref;
+        if ($res && $res->{name}) {
+            if ($id ne $res->{name}) {
+                $base->log(LA_ERR, "Another contract has no ending (%s)", $res->{name} || '');
+                return;
+            }
+        }
+    }
+    if ($changes{firstday}) {
+        my $sth = $base->db->prepare_cached(q{
+            select name from employment where "user" = ? and name != ? and
+                firstday <= ? and (lastday is null or lastday >= ?)
+        });
+        $sth->execute($user, $id, $changes{firstday}, $changes{firstday});
+        my $res = $sth->fetchrow_hashref;
+        $sth->finish;
+        if ($res) {
+            $base->log(LA_ERR, "New starting overlap contrat %s (%s)", $res->{name}, $changes{firstday});
+            return;
+        }
+    }
+
+
+    return 1;
+}
+
+sub ReportChange {
+    my ($self, $changetype, $message, @args) = @_;
+
+    $self->applyToUser();
+
+    $self->SUPER::ReportChange($changetype, $message, @args);
+}
+
 1;
 

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

@@ -9 +9 @@
 use LATMOS::Accounts::Log;
 use POSIX qw(strftime);
+use Date::Parse qw(str2time);
+use DateTime;
+use DateTime::TimeZone;
 use base qw(LATMOS::Accounts::Bases::Sql::objects);
 
@@ -106 +109 @@
                         : ($value ? 1 : 0 );
 
-                    foreach my $al ($self->object->get_attributes('aliases'), $self->object->id) {
+                    foreach my $al (grep { $_ } $self->object->get_attributes('aliases'), $self->object->id) {
                         my $obj = $self->base->get_object('aliases', $al) or next;
                         $obj->_set_c_fields(
@@ -193 +196 @@
                 monitored => 1,
             },
-            expire        => { inline => 1, formtype => 'DATE', monitored => 1, },
-            endcircuit    => { inline => 1, formtype => 'DATE', monitored => 1, },
+            expire        => { inline => 1, formtype => 'DATETIME', monitored => 1, },
+            endcircuit    => { inline => 1, formtype => 'DATE',     monitored => 1, },
+            endEmployment => {
+                formtype => 'DATETIME',
+                managed => 1,
+                ro => 1,
+                get => sub {
+                    my ($attr) = @_;
+                    my $self = $attr->object;
+
+                    my $list_empl = $self->base->db->prepare_cached(q{
+                        SELECT * FROM employment WHERE "user" = ? and
+                            (lastday is null or lastday >= now() - '1 days'::interval) 
+                    });
+                    $list_empl->execute($self->id);
+                    my $end;
+                    while (my $res = $list_empl->fetchrow_hashref) {
+                        if (!$res->{lastday}) {
+                            # Ultimate employment.
+                            $end = undef;
+                            last
+                        }
+                        if ($end) {
+                            my $nextstart = DateTime->from_epoch(epoch => str2time($res->{firstday}));
+                            if ($end->ymd lt $nextstart->ymd) {
+                                last;
+                            }
+                        }
+                        $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);
+                    }
+                    $list_empl->finish;
+                    return $end ? $end->iso8601 : undef
+                },
+            },
             cn        => {
                 inline => 1, ro => 1,
@@ -874 +911 @@
                         q{
                         select name from employment where firstday <= now() and
-                        (lastday is null or lastday >= now()) and "user" = ?
+                        (lastday is null or lastday >= now() - '1 days'::interval) and "user" = ?
                         limit 1
                         }
@@ -887 +924 @@
                     }
                 }
+            },
+            appliedEmployement => {
+                hidden => 1,
+                reference => 'employment',
             },
         }