Changeset 2123 for trunk/LATMOS-Accounts-Web

Timestamp:

11/08/17 22:19:09 (7 years ago)

Author:

nanardon

Message:

Add option to merge consecutive employment

Location:

trunk/LATMOS-Accounts-Web

Files:

• lib/LATMOS/Accounts/Web/Controller/Summary/ListEmployments.pm (modified) (1 diff)
• root/html/summary/listemployments/index.tt (modified) (1 diff)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Summary/ListEmployments.pm

@@ -102 +102 @@
     }
 
+    my @array = ();
+
+    if ($c->req->param('merge')) {
+        my $employmentDelay = ( $base->config('employment_delay') || 0 ) + 1;
+
+        foreach (sort { $a->{user} cmp $b->{user} || $a->{firstday} cmp $b->{firstday} } values %objects) {
+            if (my $prev = $array[-1]) {
+                if ($prev->{user} eq $_->{user}
+                    && $prev->{contratType} eq $_->{contratType}) {
+
+                    my $pEnd = DateTime->from_epoch(epoch => str2time($prev->{lastday}));
+
+                    $pEnd->add(days => $employmentDelay);
+                    if ($pEnd->ymd('-') ge $_->{firstday}) {
+                        $prev->{lastday} = $_->{lastday};
+                        next;
+                    }
+                }
+            }
+
+            push(@array, $_);
+        }
+    } else {
+        @array = values %objects;
+    }
+
     foreach (keys %objects) {
         $objects{$_}{username} = $c->stash->{users}{ $objects{$_}{user} };
-        $objects{$_}{username} = $objects{$_}{user};
     }
 
-    $c->stash->{employments} = [ sort { $a->{user} cmp $b->{user} } values %objects ];
+    $c->stash->{employments} = [ sort { $a->{user} cmp $b->{user} || $b->{firstday} cmp $a->{firstday} } @array ];
 }
 

trunk/LATMOS-Accounts-Web/root/html/summary/listemployments/index.tt

@@ -12 +12 @@
     type=checkbox [% "checked" IF c.req.param('atend') %]>
 <label for=atend>Uniquement les statuts finissant pendant</label>
+<br>
+<input name=merge id=merge value=yes
+    type=checkbox [% "checked" IF c.req.param('merge') %]>
+<label for=merge>Fusionner les statuts successifs</label>
 <br>