Changeset 1686 for trunk/LATMOS-Accounts-Web

Timestamp:

01/28/16 13:30:13 (8 years ago)

Author:

nanardon

Message:

Add next employment/last end date when no active employment are found to timeline

File:

• trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm (modified) (1 diff)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm

@@ -110 +110 @@
                 }
         });
+    } elsif (my $nextemp = $ouser->get_attributes('nextEmployment')) {
+        my $emp = $base->get_object('employment', $nextemp);
+        my $date = $emp->get_attributes('firstday') . ' 00:00:00';
+        push(@{$var->{employments}{events}}, {
+                name => $c->loc('Activity start'),
+                date => $date,
+                options => {
+                    type => 'employment',
+                    showdate => 1,
+                }
+        });
     }
+
+
     if (my $date = $ouser->get_attributes('endEmployment')) {
+        push(@{$var->{employments}{events}}, {
+                name => $c->loc('Activity end'),
+                date => $date,
+                options => {
+                    type => 'employment',
+                    showdate => 1,
+                }
+        });
+    } elsif (my $date = $ouser->get_attributes('endLastEmployment')) {
         push(@{$var->{employments}{events}}, {
                 name => $c->loc('Activity end'),