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

Timestamp:

01/25/16 11:02:03 (8 years ago)

Author:

nanardon

Message:

Ensure start/end of timeline include everything

File:

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

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

@@ -69 +69 @@
         }
 
-        $var->{end}   = $vemp->{end}   if ((!$var->{end}) || $vemp->{end} gt $var->{end});
-        $var->{start} = $vemp->{start} if ($vemp->{start} lt $var->{start});
-
         push(@{$var->{employments}{spans}}, $vemp);
     }
@@ -132 +129 @@
     }
 
+    foreach (@{ $var->{employments}{span} }) {
+        $var->{end}   = $_->{end}   if ((!$var->{end})   || $_->{end} gt $var->{end});
+        $var->{start} = $_->{start} if ((!$var->{start}) || $_->{start} lt $var->{start});
+    }
+    foreach (@{ $var->{employments}{events} }) {
+        $var->{end}   = $_->{date}   if ((!$var->{end})   || $_->{date} gt $var->{end});
+        $var->{start} = $_->{date}   if ((!$var->{start}) || $_->{date} lt $var->{start});
+    }
+
     $c->stash->{data} = $var;
 }