- Timestamp:
- 05/16/16 14:03:49 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Json/Employment.pm
r1758 r1769 32 32 my %employments; 33 33 my $now = DateTime->now->ymd; 34 my $past = $c->req->param('past'); 34 35 35 36 my $key = $c->req->param('key') || 'department'; … … 53 54 my %keysentry; 54 55 foreach my $emp (keys %start) { 55 # We filter pasted employment 56 next if ($end{$emp}[0] && $end{$emp}[0] lt $now); 56 if (!$past) { 57 # We filter pasted employment 58 next if ($end{$emp}[0] && $end{$emp}[0] lt $now); 59 } 57 60 58 61 if ($filterobj eq 'user') { … … 80 83 foreach (map { $employments{$_}->{start} } 81 84 grep { $employments{$_}->{start} } (keys %employments)) { 82 $_ gt $now or next; 85 if (!$past) { 86 $_ gt $now or next; 87 } 83 88 my $dt = DateTime->from_epoch( epoch => str2time($_)); 84 89 $dt->set_time_zone( DateTime::TimeZone->new( name => 'local' ) ); … … 88 93 foreach (map { $employments{$_}->{end} } 89 94 grep { $employments{$_}->{end} } (keys %employments)) { 90 $_ gt $now or next; 95 if (!$past) { 96 $_ gt $now or next; 97 } 91 98 my $dt = DateTime->from_epoch( epoch => str2time($_)); 92 99 $dt->set_time_zone( DateTime::TimeZone->new( name => 'local' ) );
Note: See TracChangeset
for help on using the changeset viewer.