Changeset 1622 for trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller

Timestamp:

01/09/16 18:42:54 (9 years ago)

Author:

nanardon

Message:

Fix HTML on employment page, always display 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

@@ -73 +73 @@
 
         push(@{$var->{employments}{spans}}, $vemp);
+    }
 
+    if (!$var->{end}) {
+        if (my $expire = $ouser->get_attributes('expire')) {
+            $var->{end} = $expire;
+        } else {
+            my $dt = DateTime->now;
+            $dt->add(days => 120);
+            $var->{end} = $dt->ymd('-');
+        }
+    }
+
+    push(@{$var->{employments}{events}}, {
+            name => $c->loc('Today'),
+            date => DateTime->now->ymd('-'),
+    });
+    push(@{$var->{employments}{events}}, {
+            name => $c->loc('Created'),
+            date => $ouser->get_attributes('create'),
+    });
+    if (my $expire = $ouser->get_attributes('expire')) {
         push(@{$var->{employments}{events}}, {
-                name => $c->loc('Today'),
-                date => DateTime->now->ymd('-'),
+                name => $c->loc('Expire'),
+                date => $expire,
         });
-        push(@{$var->{employments}{events}}, {
-                name => $c->loc('Created'),
-                date => $ouser->get_attributes('create'),
-        });
-        if (my $expire = $ouser->get_attributes('expire')) {
-            push(@{$var->{employments}{events}}, {
-                    name => $c->loc('Expire'),
-                    date => $expire,
-            });
-        }
     }