Changeset 1757

Timestamp:

04/26/16 14:30:48 (8 years ago)

Author:

nanardon

Message:

arrival/departure: take non working day into account

File:

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

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

@@ -241 +241 @@
                     my ($attr) = @_;
                     my $self = $attr->object;
-                    $self->_computeEndEmployment($self->base->config('employment_delay') || 0, 1);
+                    $self->_computeEndEmployment($self->base->config('employment_delay') || 0, 1, 1);
                 },
                 label => l('Start of employment'),
@@ -359 +359 @@
                     my ($attr) = @_;
                     my $self = $attr->object;
-                    $self->_computeStartEmployment($self->base->config('employment_delay') || 0, 1);
+                    $self->_computeStartEmployment($self->base->config('employment_delay') || 0, 1, 1);
                 },
                 label => l('Start of employment'),
@@ -1512 +1512 @@
 
 sub _computeStartEmployment {
-    my ($self, $delay, $any) = @_;
+    my ($self, $delay, $any, $workday) = @_;
 
     $delay ||= 0;
@@ -1552 +1552 @@
     $start ||= $nstart if ($any);
 
+    if ($start) {
+        if ($workday) {
+            my $day_of_week = $start->day_of_week;
+            $start->add(days =>
+                $day_of_week == 6 ? 2 :
+                $day_of_week == 7 ? 1 : 0
+            );
+        }
+    }
+
     return $start ? $start->iso8601 : undef
 }
 
 sub _computeEndEmployment {
-    my ($self, $delay, $any) = @_;
+    my ($self, $delay, $any, $workday) = @_;
 
     $delay ||= 0;
@@ -1602 +1612 @@
     $end ||= $pend if($any);
 
+    if ($end) {
+        if ($workday) {
+            my $day_of_week = $end->day_of_week;
+            $end->subtract(days =>
+                $day_of_week == 7 ? 2 :
+                $day_of_week == 6 ? 1 : 0
+            );
+        }
+    }
+
     return $end ? $end->iso8601 : undef
 }