- Timestamp:
- 01/03/16 22:57:20 (9 years ago)
- Location:
- trunk/LATMOS-Accounts-Web
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm
r1583 r1584 4 4 5 5 use DateTime; 6 use Date::Parse; 6 7 7 8 BEGIN { extends 'Catalyst::Controller'; } … … 31 32 or return; 32 33 34 my @colors = qw(black silver green blue red); 35 my %colorset; 36 33 37 34 38 my $var = { … … 48 52 name => ($employment->get_attributes('contratType') || ''), 49 53 start => $employment->get_attributes('firstday'), 50 end => $employment->get_attributes('lastday') ,54 end => $employment->get_attributes('lastday') || undef, 51 55 }; 52 56 53 $vemp->{end} ||= DateTime->now->ymd('-'); 57 if (!$colorset{$vemp->{name}}) { 58 $colorset{$vemp->{name}} = $colors[0]; 59 push(@colors, shift(@colors)); 60 } 61 $vemp->{color} = $colorset{$vemp->{name}}; 62 63 if (!$vemp->{end}) { 64 my $time = str2time($vemp->{start}); 65 my $dt = DateTime->from_epoch(epoch => $time); 66 $dt->add(days => 3 * 365); 67 $vemp->{end} = $dt->ymd('-'); 68 } 54 69 55 70 $var->{end} = $vemp->{end} if ($vemp->{end} gt $var->{end}); -
trunk/LATMOS-Accounts-Web/root/static/js/timeline/timeframe.js
r1583 r1584 121 121 var span = { 122 122 name: spanData.name, 123 color: spanData.color, 123 124 start: parseDateString(spanData.start), 124 125 end: parseDateString(spanData.end) … … 259 260 } 260 261 ) 261 .attr("fill", "black")262 .attr("fill", span.color) 262 263 .appendTo(group); 263 264
Note: See TracChangeset
for help on using the changeset viewer.